From f0e02b1b3b9c6694bbcb9676dc399dbfae27329b Mon Sep 17 00:00:00 2001
From: Matthias Herold <m.herold@netz98.de>
Date: Mon, 15 Jan 2018 16:46:51 +0100
Subject: [PATCH 0001/1055] [FEATURE] \Magento\Framework\Config\Dom -> added
 ability to create default/fixed value nodes during XSD Schema Validation with
 flag 'LIBXML_SCHEMA_CREATE'

---
 lib/internal/Magento/Framework/Config/Dom.php |  2 +-
 .../Framework/Config/Test/Unit/DomTest.php    | 42 +++++++++++++++++++
 .../Config/Test/Unit/_files/sample.xsd        |  1 +
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
index 35d9626c90a94..f0805ae4a1694 100644
--- a/lib/internal/Magento/Framework/Config/Dom.php
+++ b/lib/internal/Magento/Framework/Config/Dom.php
@@ -313,7 +313,7 @@ public static function validateDomDocument(
         libxml_set_external_entity_loader([self::$urnResolver, 'registerEntityLoader']);
         $errors = [];
         try {
-            $result = $dom->schemaValidate($schema);
+            $result = $dom->schemaValidate($schema, LIBXML_SCHEMA_CREATE);
             if (!$result) {
                 $errors = self::getXmlErrors($errorFormat);
             }
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
index 5c8f66683877c..0508b5e4fb359 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
@@ -135,6 +135,48 @@ public function validateDataProvider()
         ];
     }
 
+    /**
+     * @param string $xml
+     * @param string $expectedValue
+     * @dataProvider validateWithDefaultValueDataProvider
+     */
+    public function testValidateWithDefaultValue($xml, $expectedValue)
+    {
+        if (!function_exists('libxml_set_external_entity_loader')) {
+            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
+        }
+
+        $actualErrors = [];
+
+        $dom = new \Magento\Framework\Config\Dom($xml, $this->validationStateMock);
+        $dom->validate(__DIR__ . '/_files/sample.xsd', $actualErrors);
+
+        $actualValue = $dom->getDom()
+            ->getElementsByTagName('root')->item(0)
+            ->getElementsByTagName('node')->item(0)
+            ->getAttribute('attribute_with_default_value');
+
+        $this->assertEmpty($actualErrors);
+        $this->assertEquals($expectedValue, $actualValue);
+    }
+
+    /**
+     * @return array
+     */
+    public function validateWithDefaultValueDataProvider()
+    {
+        return [
+            'default_value' => [
+                '<root><node id="id1"/></root>',
+                'default_value'
+            ],
+            'custom_value' => [
+                '<root><node id="id1" attribute_with_default_value="non_default_value"/></root>',
+                'non_default_value'
+            ],
+        ];
+    }
+
     public function testValidateCustomErrorFormat()
     {
         $xml = '<root><unknown_node/></root>';
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd b/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
index 1f635b7081e05..701a2eb18c2a1 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/_files/sample.xsd
@@ -21,6 +21,7 @@
         <xs:simpleContent>
             <xs:extension base="xs:string">
                 <xs:attribute name="id" type="xs:string" use="required"/>
+                <xs:attribute name="attribute_with_default_value" type="xs:string" default="default_value"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>

From bcd4322f9074570d7e912e0a714b1ffb32053266 Mon Sep 17 00:00:00 2001
From: Matthias Herold <m.herold@netz98.de>
Date: Mon, 15 Jan 2018 16:48:13 +0100
Subject: [PATCH 0002/1055] Fixed expectation
 dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
 for \Magento\Framework\Search\Request\Config\FileSystemReaderTest::testRead

---
 .../Framework/Search/_files/search_request_merged.php      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
index 8586f47a0f7fa..0aaa3f4e15bda 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
@@ -35,6 +35,7 @@
             'match_query' => [
                 'value' => '$match_term_override$',
                 'name' => 'match_query',
+                'boost' => '1',
                 'match' => [
                     0 => [
                         'field' => 'match_field',
@@ -50,6 +51,7 @@
             ],
             'must_query' => [
                 'name' => 'must_query',
+                'boost' => '1',
                 'filterReference' =>  [
                     0 => [
                         'clause' => 'must',
@@ -60,6 +62,7 @@
             ],
             'should_query' => [
                 'name' => 'should_query',
+                'boost' => '1',
                 'filterReference' => [
                     0 => [
                         'clause' => 'should',
@@ -70,6 +73,7 @@
             ],
             'not_query' => [
                 'name' => 'not_query',
+                'boost' => '1',
                 'filterReference' => [
                     0 => [
                         'clause' => 'not',
@@ -80,6 +84,7 @@
             ],
             'match_query_2' => [
                 'value' => '$match_term_override$',
+                'boost' => '1',
                 'name' => 'match_query_2',
                 'match' => [
                     0 => [
@@ -163,6 +168,7 @@
         'queries' => [
             'filter_query' => [
                 'name' => 'filter_query',
+                'boost' => '1',
                 'filterReference' => [
                     0 =>
                         [
@@ -230,6 +236,7 @@
             'new_match_query' => [
                 'value' => '$match_term$',
                 'name' => 'new_match_query',
+                'boost' => '1',
                 'match' => [
                     0 =>
                         [

From 8611444a95386d2440505be18a2687c905f0ca06 Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Tue, 7 Aug 2018 15:15:27 +0300
Subject: [PATCH 0003/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../Product/View/Options/Type/Select.php      | 207 +++++-------------
 .../Product/View/Options/View/Checkable.php   |  61 ++++++
 .../Product/View/Options/View/Multiple.php    | 103 +++++++++
 .../fieldset/options/view/checkable.phtml     |  99 +++++++++
 4 files changed, 317 insertions(+), 153 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
 create mode 100644 app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
 create mode 100644 app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index 7df9b972e1501..209cc52cdaa28 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -3,8 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Block\Product\View\Options\Type;
 
+use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Block\Product\View\Options\View\CheckableFactory;
+use Magento\Catalog\Block\Product\View\Options\View\MultipleFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Pricing\Helper\Data;
+use Magento\Catalog\Helper\Data as CatalogHelper;
+
 /**
  * Product options text type block
  *
@@ -13,169 +22,61 @@
  */
 class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
 {
+    /**
+     * @var CheckableFactory
+     */
+    protected $checkableFactory;
+    /**
+     * @var MultipleFactory
+     */
+    protected $multipleFactory;
+
+    /**
+     * Select constructor.
+     * @param Context $context
+     * @param Data $pricingHelper
+     * @param CatalogHelper $catalogData
+     * @param array $data
+     * @param CheckableFactory|null $checkableFactory
+     * @param MultipleFactory|null $multipleFactory
+     */
+    public function __construct(
+        Context $context,
+        Data $pricingHelper,
+        CatalogHelper $catalogData,
+        array $data = [],
+        CheckableFactory $checkableFactory = null,
+        MultipleFactory $multipleFactory = null
+    )
+    {
+        parent::__construct($context, $pricingHelper, $catalogData, $data);
+        $this->checkableFactory = $checkableFactory ?: ObjectManager::getInstance()->get(CheckableFactory::class);
+        $this->multipleFactory = $multipleFactory ?: ObjectManager::getInstance()->get(MultipleFactory::class);
+    }
+
     /**
      * Return html for control element
      *
      * @return string
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getValuesHtml()
     {
-        $_option = $this->getOption();
-        $configValue = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $_option->getId());
-        $store = $this->getProduct()->getStore();
-
-        $this->setSkipJsReloadPrice(1);
-        // Remove inline prototype onclick and onchange events
-
-        if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN ||
-            $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE
+        $option = $this->getOption();
+        $optionType = $option->getType();
+        if ($optionType === Option::OPTION_TYPE_DROP_DOWN ||
+            $optionType === Option::OPTION_TYPE_MULTIPLE
         ) {
-            $require = $_option->getIsRequire() ? ' required' : '';
-            $extraParams = '';
-            $select = $this->getLayout()->createBlock(
-                \Magento\Framework\View\Element\Html\Select::class
-            )->setData(
-                [
-                    'id' => 'select_' . $_option->getId(),
-                    'class' => $require . ' product-custom-option admin__control-select'
-                ]
-            );
-            if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {
-                $select->setName('options[' . $_option->getId() . ']')->addOption('', __('-- Please Select --'));
-            } else {
-                $select->setName('options[' . $_option->getId() . '][]');
-                $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
-            }
-            foreach ($_option->getValues() as $_value) {
-                $priceStr = $this->_formatPrice(
-                    [
-                        'is_percent' => $_value->getPriceType() == 'percent',
-                        'pricing_value' => $_value->getPrice($_value->getPriceType() == 'percent'),
-                    ],
-                    false
-                );
-                $select->addOption(
-                    $_value->getOptionTypeId(),
-                    $_value->getTitle() . ' ' . strip_tags($priceStr) . '',
-                    ['price' => $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false)]
-                );
-            }
-            if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE) {
-                $extraParams = ' multiple="multiple"';
-            }
-            if (!$this->getSkipJsReloadPrice()) {
-                $extraParams .= ' onchange="opConfig.reloadPrice()"';
-            }
-            $extraParams .= ' data-selector="' . $select->getName() . '"';
-            $select->setExtraParams($extraParams);
-
-            if ($configValue) {
-                $select->setValue($configValue);
-            }
-
-            return $select->getHtml();
+            $optionBlock = $this->multipleFactory->create();
         }
-
-        if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO ||
-            $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX
+        if ($optionType === Option::OPTION_TYPE_RADIO ||
+            $optionType === Option::OPTION_TYPE_CHECKBOX
         ) {
-            $selectHtml = '<div class="options-list nested" id="options-' . $_option->getId() . '-list">';
-            $require = $_option->getIsRequire() ? ' required' : '';
-            $arraySign = '';
-            switch ($_option->getType()) {
-                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO:
-                    $type = 'radio';
-                    $class = 'radio admin__control-radio';
-                    if (!$_option->getIsRequire()) {
-                        $selectHtml .= '<div class="field choice admin__field admin__field-option">' .
-                            '<input type="radio" id="options_' .
-                            $_option->getId() .
-                            '" class="' .
-                            $class .
-                            ' product-custom-option" name="options[' .
-                            $_option->getId() .
-                            ']"' .
-                            ' data-selector="options[' . $_option->getId() . ']"' .
-                            ($this->getSkipJsReloadPrice() ? '' : ' onclick="opConfig.reloadPrice()"') .
-                            ' value="" checked="checked" /><label class="label admin__field-label" for="options_' .
-                            $_option->getId() .
-                            '"><span>' .
-                            __('None') . '</span></label></div>';
-                    }
-                    break;
-                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX:
-                    $type = 'checkbox';
-                    $class = 'checkbox admin__control-checkbox';
-                    $arraySign = '[]';
-                    break;
-            }
-            $count = 1;
-            foreach ($_option->getValues() as $_value) {
-                $count++;
-
-                $priceStr = $this->_formatPrice(
-                    [
-                        'is_percent' => $_value->getPriceType() == 'percent',
-                        'pricing_value' => $_value->getPrice($_value->getPriceType() == 'percent'),
-                    ]
-                );
-
-                $htmlValue = $_value->getOptionTypeId();
-                if ($arraySign) {
-                    $checked = is_array($configValue) && in_array($htmlValue, $configValue) ? 'checked' : '';
-                } else {
-                    $checked = $configValue == $htmlValue ? 'checked' : '';
-                }
-
-                $dataSelector = 'options[' . $_option->getId() . ']';
-                if ($arraySign) {
-                    $dataSelector .= '[' . $htmlValue . ']';
-                }
-
-                $selectHtml .= '<div class="field choice admin__field admin__field-option' .
-                    $require .
-                    '">' .
-                    '<input type="' .
-                    $type .
-                    '" class="' .
-                    $class .
-                    ' ' .
-                    $require .
-                    ' product-custom-option"' .
-                    ($this->getSkipJsReloadPrice() ? '' : ' onclick="opConfig.reloadPrice()"') .
-                    ' name="options[' .
-                    $_option->getId() .
-                    ']' .
-                    $arraySign .
-                    '" id="options_' .
-                    $_option->getId() .
-                    '_' .
-                    $count .
-                    '" value="' .
-                    $htmlValue .
-                    '" ' .
-                    $checked .
-                    ' data-selector="' . $dataSelector . '"' .
-                    ' price="' .
-                    $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false) .
-                    '" />' .
-                    '<label class="label admin__field-label" for="options_' .
-                    $_option->getId() .
-                    '_' .
-                    $count .
-                    '"><span>' .
-                    $_value->getTitle() .
-                    '</span> ' .
-                    $priceStr .
-                    '</label>';
-                $selectHtml .= '</div>';
-            }
-            $selectHtml .= '</div>';
-
-            return $selectHtml;
+            $optionBlock = $this->checkableFactory->create();
         }
+        return $optionBlock
+            ->setOption($option)
+            ->setProduct($this->getProduct())
+            ->setSkipJsReloadPrice(1)
+            ->_toHtml();
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php b/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
new file mode 100644
index 0000000000000..c4b73044f718c
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Block\Product\View\Options\View;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface;
+use Magento\Catalog\Block\Product\View\Options\AbstractOptions;
+
+/**
+ * Class Checkable
+ * @package Magento\Catalog\Block\Product\View\Options\View
+ */
+class Checkable extends AbstractOptions
+{
+    /** @noinspection ClassOverridesFieldOfSuperClassInspection */
+    /**
+     * @var string
+     */
+    protected $_template = 'Magento_Catalog::product/composite/fieldset/options/view/checkable.phtml';
+
+    /**
+     * @param ProductCustomOptionValuesInterface $value
+     * @return string
+     */
+    public function formatPrice(ProductCustomOptionValuesInterface $value): string
+    {
+        /** @noinspection PhpMethodParametersCountMismatchInspection */
+        return parent::_formatPrice(
+            [
+                'is_percent' => $value->getPriceType() === 'percent',
+                'pricing_value' => $value->getPrice($value->getPriceType() === 'percent')
+            ]
+        );
+    }
+
+    /**
+     * @param ProductCustomOptionValuesInterface $value
+     * @return float|string
+     */
+    public function getCurrencyByStore(ProductCustomOptionValuesInterface $value)
+    {
+        /** @noinspection PhpMethodParametersCountMismatchInspection */
+        return $this->pricingHelper->currencyByStore(
+            $value->getPrice(true),
+            $this->getProduct()->getStore(),
+            false
+        );
+    }
+
+    /**
+     * @param mixed $option
+     * @return string|array|null
+     */
+    public function getPreconfiguredValue($option)
+    {
+        return $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
+    }
+}
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php b/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
new file mode 100644
index 0000000000000..067fc64ca870c
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Block\Product\View\Options\View;
+
+use Magento\Catalog\Block\Product\View\Options\AbstractOptions;
+use Magento\Catalog\Model\Product\Option;
+use Magento\Framework\View\Element\Html\Select;
+
+/**
+ * Class Multiple
+ * @package Magento\Catalog\Block\Product\View\Options\View
+ */
+class Multiple extends AbstractOptions
+{
+    /**
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function _toHtml()
+    {
+        $option = $this->getOption();
+        $optionType = $option->getType();
+        $configValue = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
+        $require = $option->getIsRequire() ? ' required' : '';
+        $extraParams = '';
+        /** @var Select $select */
+        $select = $this->getLayout()->createBlock(
+            Select::class
+        )->setData(
+            [
+                'id' => 'select_' . $option->getId(),
+                'class' => $require . ' product-custom-option admin__control-select'
+            ]
+        );
+        $select = $this->insertSelectOption($select, $option);
+        $select = $this->processSelectOption($select, $option);
+        if ($optionType === Option::OPTION_TYPE_MULTIPLE) {
+            $extraParams = ' multiple="multiple"';
+        }
+        if (!$this->getSkipJsReloadPrice()) {
+            $extraParams .= ' onchange="opConfig.reloadPrice()"';
+        }
+        $extraParams .= ' data-selector="' . $select->getName() . '"';
+        $select->setExtraParams($extraParams);
+        if ($configValue) {
+            $select->setValue($configValue);
+        }
+        return $select->getHtml();
+    }
+
+    /**
+     * @param Select $select
+     * @param Option $option
+     * @return Select
+     */
+    private function insertSelectOption(Select $select, Option $option)
+    {
+        $require = $option->getIsRequire() ? ' required' : '';
+        if ($option->getType() === Option::OPTION_TYPE_DROP_DOWN) {
+            $select->setName('options[' . $option->getId() . ']')->addOption('', __('-- Please Select --'));
+        } else {
+            $select->setName('options[' . $option->getId() . '][]');
+            $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
+        }
+        return $select;
+    }
+
+    /**
+     * @param Select $select
+     * @param Option $option
+     * @return Select
+     */
+    private function processSelectOption(Select $select, Option $option)
+    {
+        $store = $this->getProduct()->getStore();
+        foreach ($option->getValues() as $_value) {
+            $isPercentPriceType = $_value->getPriceType() === 'percent';
+            $priceStr = $this->_formatPrice(
+                [
+                    'is_percent' => $isPercentPriceType,
+                    'pricing_value' => $_value->getPrice($isPercentPriceType)
+                ],
+                false
+            );
+            $select->addOption(
+                $_value->getOptionTypeId(),
+                $_value->getTitle() . ' ' . strip_tags($priceStr) . '',
+                [
+                    'price' => $this->pricingHelper->currencyByStore(
+                        $_value->getPrice(true),
+                        $store,
+                        false
+                    )
+                ]
+            );
+        }
+        return $select;
+    }
+}
diff --git a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
new file mode 100644
index 0000000000000..e81bec7603b90
--- /dev/null
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+use Magento\Catalog\Model\Product\Option;
+
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options\View\Checkable $block
+ */
+$option = $block->getOption();
+if ($option) : ?>
+    <?php
+    $configValue = $block->getPreconfiguredValue($option);
+    $optionType = $option->getType();
+    $arraySign = $optionType === Option::OPTION_TYPE_CHECKBOX ? '[]' : '';
+    $count = 1;
+    ?>
+
+<div class="options-list nested" id="options-<?php echo /* @noEscape */
+$option->getId() ?>-list">
+    <?php if ($optionType === Option::OPTION_TYPE_RADIO) : ?>
+    <div class="field choice admin__field admin__field-option">
+    <input type="radio"
+           id="options_<?php echo /* @noEscape */
+           $option->getId() ?>"
+           class="radio admin__control-radio product-custom-option"
+           name="options[<?php echo /* @noEscape */
+           $option->getId() ?>]"
+           data-selector="options[<?php echo /* @noEscape */
+           $option->getId() ?>]"
+           onclick="<?php echo $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
+           value=""
+           checked="checked"
+    />
+    <label class="label admin__field-label" for="options_<?php echo /* @noEscape */
+    $option->getId() ?>">
+                    <span>
+                        <?php echo /* @noEscape */
+                        __('None') ?>
+                    </span>
+    </label>
+<?php endif; ?>
+
+    <?php foreach ($option->getValues() as $value) : ?>
+        <?php
+        $checked = '';
+        $count++;
+        if ($arraySign) {
+            $checked = is_array($configValue) && in_array($value->getOptionTypeId(), $configValue) ? 'checked' : '';
+        } else {
+            $checked = $configValue == $value->getOptionTypeId() ? 'checked' : '';
+        }
+        $dataSelector = 'options[' . $option->getId() . ']';
+        if ($arraySign) {
+            $dataSelector .= '[' . $value->getOptionTypeId() . ']';
+        }
+        ?>
+
+        <div class="field choice admin__field admin__field-option'<?php echo /* @noEscape */
+        $option->getIsRequire() ?>'">
+            <input type="<?php echo /* @noEscape */
+            $optionType ?>"
+                   class="<?php /** @noinspection DisconnectedForeachInstructionInspection */
+                   echo /* @noEscape */
+                   $optionType === Option::OPTION_TYPE_RADIO ?
+                       'radio admin__control-radio' :
+                       'checkbox admin__control-checkbox' ?> <?php echo /* @noEscape */
+                   $option->getIsRequire() ?>
+                       product-custom-option
+                        <?php echo $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
+                   name="options[<?php echo $option->getId() ?>]<?php echo /* @noEscape */
+                   $arraySign ?>"
+                   id="options_<?php echo /* @noEscape */
+                       $option->getId() . '_' . $count ?>"
+                   value="<?php echo /* @noEscape */
+                   $value->getOptionTypeId() ?>"
+                <?php echo /* @noEscape */
+                $checked ?>
+                   data-selector="<?php echo /* @noEscape */
+                   $dataSelector ?>"
+                   price="<?php echo /* @noEscape */
+                   $block->getCurrencyByStore($value) ?>"
+            />
+            <label class="label admin__field-label"
+                   for="options_<?php echo /* @noEscape */
+                       $option->getId() . '_' . $count ?>">
+                <span>
+                    <?php echo $block->escapeHtml($value->getTitle()) ?>
+                </span>
+                <?php echo /* @noEscape */
+                $block->formatPrice($value) ?>
+            </label>
+        </div>
+    <?php endforeach; ?>
+    </div>
+<?php endif; ?>
\ No newline at end of file

From c333cc1cb676eb257097cd9397a437097097386a Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Tue, 7 Aug 2018 17:14:21 +0300
Subject: [PATCH 0004/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../Catalog/Block/Product/View/Options/View/Checkable.php    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php b/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
index c4b73044f718c..bd14493ccf222 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
@@ -8,6 +8,7 @@
 
 use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface;
 use Magento\Catalog\Block\Product\View\Options\AbstractOptions;
+use Magento\Catalog\Model\Product\Option;
 
 /**
  * Class Checkable
@@ -51,10 +52,10 @@ public function getCurrencyByStore(ProductCustomOptionValuesInterface $value)
     }
 
     /**
-     * @param mixed $option
+     * @param Option $option
      * @return string|array|null
      */
-    public function getPreconfiguredValue($option)
+    public function getPreconfiguredValue(Option $option)
     {
         return $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
     }

From f9b730019ef70d0852060c4833f5c1fb378599ac Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Wed, 8 Aug 2018 16:55:38 +0300
Subject: [PATCH 0005/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../Magento/Catalog/Block/Product/View/Options/Type/Select.php | 3 +--
 .../Catalog/Block/Product/View/Options/View/Checkable.php      | 2 ++
 .../Catalog/Block/Product/View/Options/View/Multiple.php       | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index 209cc52cdaa28..1fa2c18f4ca47 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -47,8 +47,7 @@ public function __construct(
         array $data = [],
         CheckableFactory $checkableFactory = null,
         MultipleFactory $multipleFactory = null
-    )
-    {
+    ) {
         parent::__construct($context, $pricingHelper, $catalogData, $data);
         $this->checkableFactory = $checkableFactory ?: ObjectManager::getInstance()->get(CheckableFactory::class);
         $this->multipleFactory = $multipleFactory ?: ObjectManager::getInstance()->get(MultipleFactory::class);
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php b/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
index bd14493ccf222..26517be4d93e5 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Product\View\Options\View;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface;
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php b/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
index 067fc64ca870c..6d1bac8c8c133 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Product\View\Options\View;
 
 use Magento\Catalog\Block\Product\View\Options\AbstractOptions;

From 1ccae207e582192c1c2b566b574c99fd6c8fc5dc Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Thu, 9 Aug 2018 12:39:48 +0300
Subject: [PATCH 0006/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../Catalog/Block/Product/View/Options/Type/Select.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index 1fa2c18f4ca47..84d9ce95cfb7c 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -25,11 +25,11 @@ class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
     /**
      * @var CheckableFactory
      */
-    protected $checkableFactory;
+    private $checkableFactory;
     /**
      * @var MultipleFactory
      */
-    protected $multipleFactory;
+    private $multipleFactory;
 
     /**
      * Select constructor.

From 1bf405239cb25bcb25a1f3e209420bcd070951f7 Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Thu, 16 Aug 2018 10:53:59 +0300
Subject: [PATCH 0007/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../Sales/view/adminhtml/templates/items/column/name.phtml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
index 30037a918a10c..74604e75a28c1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
@@ -26,7 +26,7 @@
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
             <?php foreach ($block->getOrderOptions() as $_option): ?>
-                <dt><?= /* @escapeNotVerified */ $_option['label'] ?>:</dt>
+                <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
                 <dd>
                     <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                         <?= /* @escapeNotVerified */ $block->getCustomizedOptionValue($_option) ?>

From 66f702cafb3543eb0180e59c3dbd71eccf081a75 Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Wed, 22 Aug 2018 12:44:27 +0300
Subject: [PATCH 0008/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../Block/Product/View/Options/View/Checkable.php        | 5 ++---
 .../Catalog/Block/Product/View/Options/View/Multiple.php | 9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php b/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
index 26517be4d93e5..c405f4da7b703 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
@@ -13,12 +13,11 @@
 use Magento\Catalog\Model\Product\Option;
 
 /**
- * Class Checkable
- * @package Magento\Catalog\Block\Product\View\Options\View
+ * Represent needed logic for checkbox and radio button
+ * option types
  */
 class Checkable extends AbstractOptions
 {
-    /** @noinspection ClassOverridesFieldOfSuperClassInspection */
     /**
      * @var string
      */
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php b/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
index 6d1bac8c8c133..14d67b5a2d914 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
@@ -13,8 +13,7 @@
 use Magento\Framework\View\Element\Html\Select;
 
 /**
- * Class Multiple
- * @package Magento\Catalog\Block\Product\View\Options\View
+ * Represent needed logic for dropdown and multi-select
  */
 class Multiple extends AbstractOptions
 {
@@ -59,7 +58,7 @@ protected function _toHtml()
      * @param Option $option
      * @return Select
      */
-    private function insertSelectOption(Select $select, Option $option)
+    private function insertSelectOption(Select $select, Option $option): Select
     {
         $require = $option->getIsRequire() ? ' required' : '';
         if ($option->getType() === Option::OPTION_TYPE_DROP_DOWN) {
@@ -68,6 +67,7 @@ private function insertSelectOption(Select $select, Option $option)
             $select->setName('options[' . $option->getId() . '][]');
             $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
         }
+
         return $select;
     }
 
@@ -76,7 +76,7 @@ private function insertSelectOption(Select $select, Option $option)
      * @param Option $option
      * @return Select
      */
-    private function processSelectOption(Select $select, Option $option)
+    private function processSelectOption(Select $select, Option $option): Select
     {
         $store = $this->getProduct()->getStore();
         foreach ($option->getValues() as $_value) {
@@ -100,6 +100,7 @@ private function processSelectOption(Select $select, Option $option)
                 ]
             );
         }
+
         return $select;
     }
 }

From 1639b94867410462db0a2f4f1b46a41e29680196 Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Tue, 28 Aug 2018 10:55:23 +0300
Subject: [PATCH 0009/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../fieldset/options/view/checkable.phtml     | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
index e81bec7603b90..6dbee42dbc88c 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -23,25 +23,26 @@ if ($option) : ?>
 $option->getId() ?>-list">
     <?php if ($optionType === Option::OPTION_TYPE_RADIO) : ?>
     <div class="field choice admin__field admin__field-option">
-    <input type="radio"
-           id="options_<?php echo /* @noEscape */
-           $option->getId() ?>"
-           class="radio admin__control-radio product-custom-option"
-           name="options[<?php echo /* @noEscape */
-           $option->getId() ?>]"
-           data-selector="options[<?php echo /* @noEscape */
-           $option->getId() ?>]"
-           onclick="<?php echo $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
-           value=""
-           checked="checked"
-    />
-    <label class="label admin__field-label" for="options_<?php echo /* @noEscape */
-    $option->getId() ?>">
-                    <span>
-                        <?php echo /* @noEscape */
-                        __('None') ?>
-                    </span>
-    </label>
+        <input type="radio"
+               id="options_<?php echo /* @noEscape */
+               $option->getId() ?>"
+               class="radio admin__control-radio product-custom-option"
+               name="options[<?php echo /* @noEscape */
+               $option->getId() ?>]"
+               data-selector="options[<?php echo /* @noEscape */
+               $option->getId() ?>]"
+               onclick="<?php echo $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
+               value=""
+               checked="checked"
+        />
+        <label class="label admin__field-label" for="options_<?php echo /* @noEscape */
+        $option->getId() ?>">
+                        <span>
+                            <?php echo /* @noEscape */
+                            __('None') ?>
+                        </span>
+        </label>
+    </div>
 <?php endif; ?>
 
     <?php foreach ($option->getValues() as $value) : ?>

From 69bd35d0573360fdbdae0d7ee8ae96988900d1d5 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 3 Sep 2018 12:34:59 +0300
Subject: [PATCH 0010/1055] MAGETWO-70972: Servers Configurations Needs Update

---
 .htaccess         |  9 +++++++++
 .htaccess.sample  |  9 +++++++++
 nginx.conf.sample |  6 ++++++
 pub/.htaccess     | 10 ++++++++++
 4 files changed, 34 insertions(+)

diff --git a/.htaccess b/.htaccess
index d22b5a1395cae..8070910cdccbf 100644
--- a/.htaccess
+++ b/.htaccess
@@ -364,6 +364,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files .user.ini>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 # For 404s and 403s that aren't handled by the application, show plain 404 response
 ErrorDocument 404 /pub/errors/404.php
diff --git a/.htaccess.sample b/.htaccess.sample
index c9ddff2cca4cf..7db221343c4bc 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -341,6 +341,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files .user.ini>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 # For 404s and 403s that aren't handled by the application, show plain 404 response
 ErrorDocument 404 /pub/errors/404.php
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 6f87a9a076666..41f16bea857ad 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -33,6 +33,12 @@ charset UTF-8;
 error_page 404 403 = /errors/404.php;
 #add_header "X-UA-Compatible" "IE=Edge";
 
+
+# Deny access to sensitive files
+location /.user.ini {
+    deny all;
+}
+
 # PHP entry point for setup application
 location ~* ^/setup($|/) {
     root $MAGE_ROOT;
diff --git a/pub/.htaccess b/pub/.htaccess
index 8ba04ff4415f3..85a204c85e8a8 100644
--- a/pub/.htaccess
+++ b/pub/.htaccess
@@ -220,6 +220,16 @@ ErrorDocument 403 /errors/404.php
             Require all denied
         </IfVersion>
     </Files>
+## Deny access  to .user.ini
+    <Files .user.ini>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 <IfModule mod_headers.c>
     ############################################

From f2f0e47869026f911e790fa2732e286a4984fb5c Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Mon, 3 Sep 2018 14:43:25 +0300
Subject: [PATCH 0011/1055] MAGETWO-88607: Wrong behavior of static content
 deploy

---
 .../Magento/Deploy/Console/InputValidator.php |  42 +++-
 .../Deploy/Service/DeployStaticContent.php    |   2 +
 .../Test/Unit/Console/InputValidatorTest.php  | 208 ++++++++++++++++++
 3 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php

diff --git a/app/code/Magento/Deploy/Console/InputValidator.php b/app/code/Magento/Deploy/Console/InputValidator.php
index b3301f60fec26..2ce9712a78729 100644
--- a/app/code/Magento/Deploy/Console/InputValidator.php
+++ b/app/code/Magento/Deploy/Console/InputValidator.php
@@ -9,6 +9,8 @@
 use Magento\Deploy\Console\DeployStaticOptions as Options;
 use Magento\Framework\Validator\Locale;
 use Symfony\Component\Console\Input\InputInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Validator\RegexFactory;
 
 /**
  * Command input arguments validator class
@@ -55,14 +57,24 @@ class InputValidator
      */
     private $localeValidator;
 
+    /**
+     * @var RegexFactory
+     */
+    private $versionValidatorFactory;
+
     /**
      * InputValidator constructor
      *
      * @param Locale $localeValidator
+     * @param RegexFactory $versionValidatorFactory
      */
-    public function __construct(Locale $localeValidator)
-    {
+    public function __construct(
+        Locale $localeValidator,
+        ?RegexFactory $versionValidatorFactory = null
+    ) {
         $this->localeValidator = $localeValidator;
+        $this->versionValidatorFactory = $versionValidatorFactory ?:
+            ObjectManager::getInstance()->get(RegexFactory::class);
     }
 
     /**
@@ -85,6 +97,9 @@ public function validate(InputInterface $input)
             $input->getArgument(Options::LANGUAGES_ARGUMENT) ?: ['all'],
             $input->getOption(Options::EXCLUDE_LANGUAGE)
         );
+        $this->checkVersionInput(
+            $input->getOption(Options::CONTENT_VERSION) ?: ''
+        );
     }
 
     /**
@@ -147,4 +162,27 @@ private function checkLanguagesInput(array $languagesInclude, array $languagesEx
             }
         }
     }
+
+    /**
+     * @param string $contentVersion
+     * @throws \InvalidArgumentException
+     */
+    private function checkVersionInput(string $contentVersion): void
+    {
+        if ($contentVersion) {
+            $versionValidator = $this->versionValidatorFactory->create(
+                [
+                    'pattern' => '/^[A-Za-z0-9_.]+$/'
+                ]
+            );
+
+            if (!$versionValidator->isValid($contentVersion)) {
+                throw new \InvalidArgumentException(
+                    'Argument "' .
+                    Options::CONTENT_VERSION
+                    . '" has invalid value, content version should contain only characters, digits and dots'
+                );
+            }
+        }
+    }
 }
diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
index 66ec6e7418afd..ed36a01edebd4 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
@@ -9,6 +9,7 @@
 use Magento\Deploy\Process\QueueFactory;
 use Magento\Deploy\Console\DeployStaticOptions as Options;
 use Magento\Framework\App\View\Deployment\Version\StorageInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -71,6 +72,7 @@ public function __construct(
      * Run deploy procedure
      *
      * @param array $options
+     * @throws LocalizedException
      * @return void
      */
     public function deploy(array $options)
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
new file mode 100644
index 0000000000000..ab540d11f6318
--- /dev/null
+++ b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Deploy\Test\Unit\Console;
+
+use Magento\Framework\Validator\Regex;
+use Magento\Framework\Validator\RegexFactory;
+use PHPUnit\Framework\TestCase;
+use Magento\Deploy\Console\InputValidator;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Deploy\Console\DeployStaticOptions as Options;
+use Magento\Framework\Validator\Locale;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\ArrayInput;
+use InvalidArgumentException;
+use Symfony\Component\Console\Input\InputArgument;
+
+/**
+ * Class InputValidatorTest
+ * @package Magento\Deploy\Test\Unit\Console
+ *  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class InputValidatorTest extends TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * @var InputValidator
+     */
+    protected $inputValidator;
+
+    /**
+     * @var Locale
+     */
+    protected $localeValidator;
+
+    /**
+     * @throws \Zend_Validate_Exception
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $regexFactoryMock = $this->getMockBuilder(RegexFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $regexObject = new Regex('/^[A-Za-z0-9_.]+$/');
+
+        $regexFactoryMock->expects($this->any())->method('create')
+            ->willReturn($regexObject);
+
+        $localeObjectMock = $this->getMockBuilder(Locale::class)->setMethods(['isValid'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $localeObjectMock->expects($this->any())->method('isValid')
+            ->with('en_US')
+            ->will($this->returnValue(true));
+
+        $this->inputValidator = $this->objectManagerHelper->getObject(
+            InputValidator::class,
+            [
+                'localeValidator' => $localeObjectMock,
+                'versionValidatorFactory' => $regexFactoryMock
+            ]
+        );
+    }
+
+    /**
+     * @throws \Zend_Validate_Exception
+     */
+    public function testValidate()
+    {
+        $input = $this->getMockBuilder(ArrayInput::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOption', 'getArgument'])
+            ->getMock();
+
+        $input->expects($this->atLeastOnce())->method('getArgument')->willReturn(['all']);
+
+        $input->expects($this->atLeastOnce())->method('getOption')
+            ->willReturnMap(
+                [
+                    [Options::AREA, ['all']],
+                    [Options::EXCLUDE_AREA, ['none']],
+                    [Options::THEME, ['all']],
+                    [Options::EXCLUDE_THEME, ['none']],
+                    [Options::EXCLUDE_LANGUAGE, ['none']],
+                    [Options::CONTENT_VERSION, '12345']
+                ]
+            );
+
+        /** @noinspection PhpParamsInspection */
+        $this->inputValidator->validate($input);
+    }
+
+    /**
+     * @covers \Magento\Deploy\Console\InputValidator::checkAreasInput()
+     */
+    public function testCheckAreasInputException()
+    {
+        $options = [
+            new InputOption(Options::AREA, null, 4, '', ['test']),
+            new InputOption(Options::EXCLUDE_AREA, null, 4, '', ['test'])
+        ];
+
+        $inputDefinition = new InputDefinition($options);
+
+        try {
+            $this->inputValidator->validate(
+                new ArrayInput([], $inputDefinition)
+            );
+        } catch (\Exception $e) {
+            $this->assertContains('--area (-a) and --exclude-area cannot be used at the same time', $e->getMessage());
+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
+        }
+    }
+
+    /**
+     * @covers \Magento\Deploy\Console\InputValidator::checkThemesInput()
+     */
+    public function testCheckThemesInputException()
+    {
+        $options = [
+            new InputOption(Options::AREA, null, 4, '', ['all']),
+            new InputOption(Options::EXCLUDE_AREA, null, 4, '', ['none']),
+            new InputOption(Options::THEME, null, 4, '', ['blank']),
+            new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['luma'])
+        ];
+
+        $inputDefinition = new InputDefinition($options);
+
+        try {
+            $this->inputValidator->validate(
+                new ArrayInput([], $inputDefinition)
+            );
+        } catch (\Exception $e) {
+            $this->assertContains('--theme (-t) and --exclude-theme cannot be used at the same time', $e->getMessage());
+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
+        }
+    }
+
+    public function testCheckLanguagesInputException()
+    {
+        $options = [
+            new InputOption(Options::AREA, null, 4, '', ['all']),
+            new InputOption(Options::EXCLUDE_AREA, '', 4, '', ['none']),
+            new InputOption(Options::THEME, null, 4, '', ['all']),
+            new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['none']),
+            new InputArgument(Options::LANGUAGES_ARGUMENT, null, 4, ['en_US']),
+            new InputOption(Options::EXCLUDE_LANGUAGE, null, 4, '', ['all'])
+        ];
+
+        $inputDefinition = new InputDefinition($options);
+
+        try {
+            $this->inputValidator->validate(
+                new ArrayInput([], $inputDefinition)
+            );
+        } catch (\Exception $e) {
+            $this->assertContains(
+                '--language (-l) and --exclude-language cannot be used at the same time',
+                $e->getMessage()
+            );
+
+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
+        }
+    }
+
+    public function testCheckVersionInputException()
+    {
+        $options = [
+            new InputOption(Options::AREA, null, 4, '', ['all']),
+            new InputOption(Options::EXCLUDE_AREA, null, 4, '', ['none']),
+            new InputOption(Options::THEME, null, 4, '', ['all']),
+            new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['none']),
+            new InputArgument(Options::LANGUAGES_ARGUMENT, null, 4, ['en_US']),
+            new InputOption(Options::EXCLUDE_LANGUAGE, null, 4, '', ['none']),
+            new InputOption(Options::CONTENT_VERSION, null, 4, '', '/*!#')
+        ];
+
+        $inputDefinition = new InputDefinition($options);
+
+        try {
+            $this->inputValidator->validate(
+                new ArrayInput([], $inputDefinition)
+            );
+        } catch (\Exception $e) {
+            $this->assertContains(
+                'Argument "' .
+                Options::CONTENT_VERSION
+                . '" has invalid value, content version should contain only characters, digits and dots',
+                $e->getMessage()
+            );
+
+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
+        }
+    }
+}

From 411b4820c9d3a0e860bb6670ba4ae07c33058a72 Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Mon, 3 Sep 2018 14:48:49 +0300
Subject: [PATCH 0012/1055] MAGETWO-88607: Wrong behavior of static content
 deploy

---
 app/code/Magento/Deploy/Service/DeployStaticContent.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
index ed36a01edebd4..c8885caf25422 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
@@ -17,6 +17,7 @@
  * Main service for static content deployment
  *
  * Aggregates services to deploy static files, static files bundles, translations and minified templates
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DeployStaticContent
 {

From 52c08f1dc5716922208cbfeaf9ccaf30f6563dca Mon Sep 17 00:00:00 2001
From: Roman Leshchenko <rleshchenko@magento.com>
Date: Mon, 3 Sep 2018 14:51:21 +0300
Subject: [PATCH 0013/1055] MAGETWO-88607: Wrong behavior of static content
 deploy

---
 .../Magento/Deploy/Test/Unit/Console/InputValidatorTest.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
index ab540d11f6318..3ed2e48710c1d 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Deploy\Test\Unit\Console;
 
 use Magento\Framework\Validator\Regex;

From 00178e76e384c29269ac7cec7ee626a8ccce5b8a Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 3 Sep 2018 17:11:43 +0300
Subject: [PATCH 0014/1055] MAGETWO-71993: CMS Image Upload Response Contains
 Redundant Info

---
 .../Adminhtml/Wysiwyg/Images/Upload.php       | 16 ++++++++++---
 .../Cms/Model/Wysiwyg/Images/Storage.php      | 11 +++------
 .../Adminhtml/Wysiwyg/Images/UploadTest.php   | 23 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 12 deletions(-)

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..81a7af7e76599 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
@@ -4,6 +4,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -57,13 +60,20 @@ public function execute()
                     __('Directory %1 is not under storage root path.', $path)
                 );
             }
-            $result = $this->getStorage()->uploadFile($path, $this->getRequest()->getParam('type'));
+            $uploaded = $this->getStorage()->uploadFile($path, $this->getRequest()->getParam('type'));
+            $response = [
+                'name' => $uploaded['name'],
+                'type' => $uploaded['type'],
+                'error' => $uploaded['error'],
+                'size' => $uploaded['size'],
+                'file' => $uploaded['file']
+            ];
         } catch (\Exception $e) {
-            $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
+            $response = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
         
-        return $resultJson->setData($result);
+        return $resultJson->setData($response);
     }
 }
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index dfd55f5346e59..c1dfe993141a5 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Cms\Model\Wysiwyg\Images;
 
 use Magento\Cms\Helper\Wysiwyg\Images;
@@ -501,14 +504,6 @@ public function uploadFile($targetPath, $type = null)
         // create thumbnail
         $this->resizeFile($targetPath . '/' . $uploader->getUploadedFileName(), true);
 
-        $result['cookie'] = [
-            'name' => $this->getSession()->getName(),
-            'value' => $this->getSession()->getSessionId(),
-            'lifetime' => $this->getSession()->getCookieLifetime(),
-            'path' => $this->getSession()->getCookiePath(),
-            'domain' => $this->getSession()->getCookieDomain(),
-        ];
-
         return $result;
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
index bab14a8663eae..b0647efbd8204 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
@@ -4,9 +4,14 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Controller\Result\Json as JsonResponse;
+use Magento\Framework\App\Response\HttpFactory as ResponseFactory;
+use Magento\Framework\App\Response\Http as Response;
 
 /**
  * Test for \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Upload class.
@@ -43,6 +48,11 @@ class UploadTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var HttpFactory
+     */
+    private $responseFactory;
+
     /**
      * @inheritdoc
      */
@@ -56,6 +66,7 @@ protected function setUp()
         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->fullDirectoryPath = $imagesHelper->getStorageRoot() . DIRECTORY_SEPARATOR . $directoryName;
         $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($this->fullDirectoryPath));
+        $this->responseFactory = $this->objectManager->get(ResponseFactory::class);
         $this->model = $this->objectManager->get(\Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\Upload::class);
         $fixtureDir = realpath(__DIR__ . '/../../../../../Catalog/_files');
         $tmpFile = $this->filesystem->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath() . $this->fileName;
@@ -82,7 +93,11 @@ public function testExecute()
     {
         $this->model->getRequest()->setParams(['type' => 'image/png']);
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
-        $this->model->execute();
+        /** @var JsonResponse $jsonResponse */
+        $jsonResponse = $this->model->execute();
+        /** @var Response $response */
+        $jsonResponse->renderResult($response = $this->responseFactory->create());
+        $data = json_decode($response->getBody(), true);
 
         $this->assertTrue(
             $this->mediaDirectory->isExist(
@@ -91,6 +106,12 @@ public function testExecute()
                 )
             )
         );
+        //Asserting that response contains only data needed by clients.
+        $keys = ['name', 'type', 'error', 'size', 'file'];
+        sort($keys);
+        $dataKeys = array_keys($data);
+        sort($dataKeys);
+        $this->assertEquals($keys, $dataKeys);
     }
 
     /**

From 68206982c01623806e45fe7e5b376316601b6db8 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 4 Sep 2018 11:57:02 +0300
Subject: [PATCH 0015/1055] MAGETWO-71993: CMS Image Upload Response Contains
 Redundant Info

---
 .../Unit/Model/Wysiwyg/Images/StorageTest.php  | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index 2dc98bcefb961..33758bd44d141 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -441,13 +441,6 @@ public function testUploadFile()
         $type = 'image';
         $result = [
             'result',
-            'cookie' => [
-                'name' => 'session_name',
-                'value' => '1',
-                'lifetime' => '50',
-                'path' => 'cookie/path',
-                'domain' => 'cookie_domain',
-            ],
         ];
         $uploader = $this->getMockBuilder(\Magento\MediaStorage\Model\File\Uploader::class)
             ->disableOriginalConstructor()
@@ -507,17 +500,6 @@ public function testUploadFile()
 
         $this->adapterFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($image);
 
-        $this->sessionMock->expects($this->atLeastOnce())->method('getName')
-            ->willReturn($result['cookie']['name']);
-        $this->sessionMock->expects($this->atLeastOnce())->method('getSessionId')
-            ->willReturn($result['cookie']['value']);
-        $this->sessionMock->expects($this->atLeastOnce())->method('getCookieLifetime')
-            ->willReturn($result['cookie']['lifetime']);
-        $this->sessionMock->expects($this->atLeastOnce())->method('getCookiePath')
-            ->willReturn($result['cookie']['path']);
-        $this->sessionMock->expects($this->atLeastOnce())->method('getCookieDomain')
-            ->willReturn($result['cookie']['domain']);
-
         $this->assertEquals($result, $this->imagesStorage->uploadFile($targetPath, $type));
     }
 }

From 963d3a1b3061dbc751ef577c8d7ff06776c0e2f0 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 6 Sep 2018 17:19:18 +0300
Subject: [PATCH 0016/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../Catalog/Block/Product/View/Options/Type/Select.php        | 4 ++--
 .../Product/View/Options/{View => Type/Select}/Checkable.php  | 2 +-
 .../Product/View/Options/{View => Type/Select}/Multiple.php   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename app/code/Magento/Catalog/Block/Product/View/Options/{View => Type/Select}/Checkable.php (96%)
 rename app/code/Magento/Catalog/Block/Product/View/Options/{View => Type/Select}/Multiple.php (98%)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index 84d9ce95cfb7c..d9d663b32f4de 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Block\Product\View\Options\Type;
 
 use Magento\Catalog\Model\Product\Option;
-use Magento\Catalog\Block\Product\View\Options\View\CheckableFactory;
-use Magento\Catalog\Block\Product\View\Options\View\MultipleFactory;
+use Magento\Catalog\Block\Product\View\Options\Type\Select\CheckableFactory;
+use Magento\Catalog\Block\Product\View\Options\Type\Select\MultipleFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Framework\Pricing\Helper\Data;
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
similarity index 96%
rename from app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
rename to app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
index c405f4da7b703..f516072c1c83f 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/View/Checkable.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\Catalog\Block\Product\View\Options\View;
+namespace Magento\Catalog\Block\Product\View\Options\Type\Select;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface;
 use Magento\Catalog\Block\Product\View\Options\AbstractOptions;
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
similarity index 98%
rename from app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
rename to app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
index 14d67b5a2d914..84da8a018800f 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/View/Multiple.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\Catalog\Block\Product\View\Options\View;
+namespace Magento\Catalog\Block\Product\View\Options\Type\Select;
 
 use Magento\Catalog\Block\Product\View\Options\AbstractOptions;
 use Magento\Catalog\Model\Product\Option;

From d8eacadc25cd6a98fbaf646ca39c9bb9ebb9f5de Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 7 Sep 2018 14:22:03 +0300
Subject: [PATCH 0017/1055] MAGETWO-90467: Added posibility to use captcha on
 share wishlist page

---
 .../Wishlist/Block/Customer/Sharing.php       |  16 +
 .../Wishlist/Controller/Index/Send.php        |  83 ++-
 .../Test/Unit/Controller/Index/SendTest.php   | 568 ++----------------
 app/code/Magento/Wishlist/composer.json       |   3 +-
 app/code/Magento/Wishlist/etc/config.xml      |  16 +
 app/code/Magento/Wishlist/etc/module.xml      |   1 +
 .../view/frontend/templates/sharing.phtml     |   1 +
 .../AssertCaptchaFieldOnContactUsForm.php     |   2 +-
 .../Captcha/Test/Page/ContactIndex.xml        |   2 +-
 .../Test/TestCase/CaptchaOnContactUsTest.php  |   2 +-
 .../Magento/Customer/Controller/SendTest.php  |  62 ++
 11 files changed, 241 insertions(+), 515 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php

diff --git a/app/code/Magento/Wishlist/Block/Customer/Sharing.php b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
index 6fbf5a23dca22..992946363186c 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sharing.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
@@ -11,6 +11,8 @@
  */
 namespace Magento\Wishlist\Block\Customer;
 
+use Magento\Captcha\Block\Captcha;
+
 /**
  * @api
  * @since 100.0.2
@@ -60,6 +62,20 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
+        if (!$this->getChildBlock('captcha')) {
+            $this->addChild(
+                'captcha',
+                Captcha::class,
+                [
+                    'cacheable' => false,
+                    'after' => '-',
+                    'form_id' => 'share_wishlist_form',
+                    'image_width' => 230,
+                    'image_height' => 230
+                ]
+            );
+        }
+
         $this->pageConfig->getTitle()->set(__('Wish List Sharing'));
     }
 
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index c2389af6a2282..4c53aaac40916 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -8,11 +8,20 @@
 
 use Magento\Framework\App\Action;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Session\Generic as WishlistSession;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\View\Result\Layout as ResultLayout;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Captcha\Model\DefaultModel as CaptchaModel;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Customer\Model\Customer;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -69,6 +78,16 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
      */
     protected $storeManager;
 
+    /**
+     * @var CaptchaHelper
+     */
+    private $captchaHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
@@ -81,6 +100,8 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
      * @param WishlistSession $wishlistSession
      * @param ScopeConfigInterface $scopeConfig
      * @param StoreManagerInterface $storeManager
+     * @param CaptchaHelper|null $captchaHelper
+     * @param CaptchaStringResolver|null $captchaStringResolver
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -94,7 +115,9 @@ public function __construct(
         \Magento\Customer\Helper\View $customerHelperView,
         WishlistSession $wishlistSession,
         ScopeConfigInterface $scopeConfig,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        ?CaptchaHelper $captchaHelper = null,
+        ?CaptchaStringResolver $captchaStringResolver = null
     ) {
         $this->_formKeyValidator = $formKeyValidator;
         $this->_customerSession = $customerSession;
@@ -106,6 +129,10 @@ public function __construct(
         $this->wishlistSession = $wishlistSession;
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
+        $this->captchaHelper = $captchaHelper ?: ObjectManager::getInstance()->get(CaptchaHelper::class);
+        $this->captchaStringResolver = $captchaStringResolver ?
+            : ObjectManager::getInstance()->get(CaptchaStringResolver::class);
+
         parent::__construct($context);
     }
 
@@ -114,6 +141,7 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\Result\Redirect
      * @throws NotFoundException
+     * @throws \Zend_Validate_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -122,11 +150,25 @@ public function execute()
     {
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $captchaForName = 'share_wishlist_form';
+        /** @var CaptchaModel $captchaModel */
+        $captchaModel = $this->captchaHelper->getCaptcha($captchaForName);
+
         if (!$this->_formKeyValidator->validate($this->getRequest())) {
             $resultRedirect->setPath('*/*/');
             return $resultRedirect;
         }
 
+        $isCorrectCaptcha = $this->validateCaptcha($captchaModel, $captchaForName);
+
+        $this->logCaptchaAttempt($captchaModel);
+
+        if (!$isCorrectCaptcha) {
+            $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
+            $resultRedirect->setPath('*/*/share');
+            return $resultRedirect;
+        }
+
         $wishlist = $this->wishlistProvider->getWishlist();
         if (!$wishlist) {
             throw new NotFoundException(__('Page not found.'));
@@ -288,4 +330,43 @@ protected function getWishlistItems(ResultLayout $resultLayout)
             ->getBlock('wishlist.email.items')
             ->toHtml();
     }
+
+    /**
+     * Log customer action attempts
+     * @param CaptchaModel $captchaModel
+     * @return void
+     */
+    private function logCaptchaAttempt(CaptchaModel $captchaModel)
+    {
+        /** @var  Customer $customer */
+        $customer = $this->_customerSession->getCustomer();
+        $email = '';
+
+        if ($customer->getId()) {
+            $email = $customer->getEmail();
+        }
+
+        $captchaModel->logAttempt($email);
+    }
+
+    /**
+     * @param CaptchaModel $captchaModel
+     * @param string $captchaFormName
+     * @return bool
+     */
+    private function validateCaptcha(CaptchaModel $captchaModel, string $captchaFormName) : bool
+    {
+        if ($captchaModel->isRequired()) {
+            $word = $this->captchaStringResolver->resolve(
+                $this->getRequest(),
+                $captchaFormName
+            );
+
+            if (!$captchaModel->isCorrect($word)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
index a8c0fbb951cce..47148f7878134 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
@@ -5,32 +5,24 @@
  */
 namespace Magento\Wishlist\Test\Unit\Controller\Index;
 
-use Magento\Customer\Helper\View as CustomerViewHelper;
 use Magento\Customer\Model\Data\Customer as CustomerData;
-use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\Action\Context as ActionContext;
-use Magento\Framework\App\Area;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
-use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\Mail\TransportInterface;
 use Magento\Framework\Message\ManagerInterface;
-use Magento\Framework\Session\Generic as WishlistSession;
-use Magento\Framework\Translate\Inline\StateInterface as TranslateInlineStateInterface;
 use Magento\Framework\UrlInterface;
-use Magento\Framework\View\Layout;
 use Magento\Framework\View\Result\Layout as ResultLayout;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Wishlist\Controller\Index\Send;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
-use Magento\Wishlist\Model\Config as WishlistConfig;
-use Magento\Wishlist\Model\Wishlist;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Captcha\Model\DefaultModel as CaptchaModel;
+use Magento\Customer\Model\Session;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -47,36 +39,12 @@ class SendTest extends \PHPUnit\Framework\TestCase
     /** @var  FormKeyValidator |\PHPUnit_Framework_MockObject_MockObject */
     protected $formKeyValidator;
 
-    /** @var  CustomerSession |\PHPUnit_Framework_MockObject_MockObject */
-    protected $customerSession;
-
     /** @var  WishlistProviderInterface |\PHPUnit_Framework_MockObject_MockObject */
     protected $wishlistProvider;
 
-    /** @var  WishlistConfig |\PHPUnit_Framework_MockObject_MockObject */
-    protected $wishlistConfig;
-
-    /** @var  TransportBuilder |\PHPUnit_Framework_MockObject_MockObject */
-    protected $transportBuilder;
-
-    /** @var  TranslateInlineStateInterface |\PHPUnit_Framework_MockObject_MockObject */
-    protected $inlineTranslation;
-
-    /** @var  CustomerViewHelper |\PHPUnit_Framework_MockObject_MockObject */
-    protected $customerViewHelper;
-
-    /** @var  WishlistSession |\PHPUnit_Framework_MockObject_MockObject */
-    protected $wishlistSession;
-
-    /** @var  ScopeConfigInterface |\PHPUnit_Framework_MockObject_MockObject */
-    protected $scopeConfig;
-
     /** @var  Store |\PHPUnit_Framework_MockObject_MockObject */
     protected $store;
 
-    /** @var  StoreManagerInterface |\PHPUnit_Framework_MockObject_MockObject */
-    protected $storeManager;
-
     /** @var  ResultFactory |\PHPUnit_Framework_MockObject_MockObject */
     protected $resultFactory;
 
@@ -86,15 +54,9 @@ class SendTest extends \PHPUnit\Framework\TestCase
     /** @var  ResultLayout |\PHPUnit_Framework_MockObject_MockObject */
     protected $resultLayout;
 
-    /** @var  Layout |\PHPUnit_Framework_MockObject_MockObject */
-    protected $layout;
-
     /** @var  RequestInterface |\PHPUnit_Framework_MockObject_MockObject */
     protected $request;
 
-    /** @var  Wishlist |\PHPUnit_Framework_MockObject_MockObject */
-    protected $wishlist;
-
     /** @var  ManagerInterface |\PHPUnit_Framework_MockObject_MockObject */
     protected $messageManager;
 
@@ -110,6 +72,15 @@ class SendTest extends \PHPUnit\Framework\TestCase
     /** @var  EventManagerInterface |\PHPUnit_Framework_MockObject_MockObject */
     protected $eventManager;
 
+    /** @var  CaptchaHelper |\PHPUnit_Framework_MockObject_MockObject */
+    protected $captchaHelper;
+
+    /** @var CaptchaModel |\PHPUnit_Framework_MockObject_MockObject */
+    protected $captchaModel;
+
+    /** @var Session |\PHPUnit_Framework_MockObject_MockObject */
+    protected $customerSession;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -136,7 +107,7 @@ protected function setUp()
         $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
             ->setMethods([
                 'getPost',
-                'getPostValue',
+                'getPostValue'
             ])
             ->getMockForAbstractClass();
 
@@ -172,90 +143,72 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->wishlistProvider = $this->getMockBuilder(\Magento\Wishlist\Controller\WishlistProviderInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->wishlistConfig = $this->getMockBuilder(\Magento\Wishlist\Model\Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->transportBuilder = $this->getMockBuilder(\Magento\Framework\Mail\Template\TransportBuilder::class)
+        $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
             ->disableOriginalConstructor()
+            ->setMethods([
+                'getEmail',
+                'getId'
+            ])
             ->getMock();
 
-        $this->inlineTranslation = $this->getMockBuilder(\Magento\Framework\Translate\Inline\StateInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $customerMock->expects($this->any())
+            ->method('getEmail')
+            ->willReturn('expamle@mail.com');
 
-        $this->customerViewHelper = $this->getMockBuilder(\Magento\Customer\Helper\View::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $customerMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(false);
 
-        $this->wishlistSession = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
+        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setSharingForm'])
+            ->setMethods([
+                'getCustomer',
+                'getData'
+            ])
             ->getMock();
 
-        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->customerSession->expects($this->any())
+            ->method('getCustomer')
+            ->willReturn($customerMock);
 
-        $this->store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getStoreId'])
-            ->getMock();
+        $this->customerSession->expects($this->any())
+            ->method('getData')
+            ->willReturn(false);
 
-        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->storeManager->expects($this->any())
-            ->method('getStore')
-            ->willReturn($this->store);
+        $this->wishlistProvider = $this->getMockBuilder(\Magento\Wishlist\Controller\WishlistProviderInterface::class)
+            ->getMockForAbstractClass();
 
-        $this->wishlist = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)
+        $this->captchaHelper = $this->getMockBuilder(CaptchaHelper::class)
             ->disableOriginalConstructor()
             ->setMethods([
-                'getShared',
-                'setShared',
-                'getId',
-                'getSharingCode',
-                'save',
-                'isSalable',
+                'getCaptcha'
             ])
             ->getMock();
 
-        $this->customerData = $this->getMockBuilder(\Magento\Customer\Model\Data\Customer::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->layout = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
+        $this->captchaModel = $this->getMockBuilder(CaptchaModel::class)
             ->disableOriginalConstructor()
             ->setMethods([
-                'getBlock',
-                'setWishlistId',
-                'toHtml',
+                'isRequired',
+                'logAttempt'
             ])
             ->getMock();
 
-        $this->transport = $this->getMockBuilder(\Magento\Framework\Mail\TransportInterface::class)
-            ->getMockForAbstractClass();
+        $objectHelper = new ObjectManager($this);
+
+        $this->captchaHelper->expects($this->once())->method('getCaptcha')
+            ->willReturn($this->captchaModel);
+        $this->captchaModel->expects($this->any())->method('isRequired')
+            ->willReturn(false);
 
-        $this->model = new Send(
-            $this->context,
-            $this->formKeyValidator,
-            $this->customerSession,
-            $this->wishlistProvider,
-            $this->wishlistConfig,
-            $this->transportBuilder,
-            $this->inlineTranslation,
-            $this->customerViewHelper,
-            $this->wishlistSession,
-            $this->scopeConfig,
-            $this->storeManager
+        $this->model = $objectHelper->getObject(
+            Send::class,
+            [
+                'context' => $this->context,
+                'formKeyValidator' => $this->formKeyValidator,
+                'wishlistProvider' => $this->wishlistProvider,
+                'captchaHelper' => $this->captchaHelper,
+                '_customerSession' => $this->customerSession
+            ]
         );
     }
 
@@ -291,409 +244,4 @@ public function testExecuteNoWishlistAvailable()
 
         $this->model->execute();
     }
-
-    /**
-     * @param string $text
-     * @param int $textLimit
-     * @param string $emails
-     * @param int $emailsLimit
-     * @param int $shared
-     * @param string $postValue
-     * @param string $errorMessage
-     *
-     * @dataProvider dataProviderExecuteWithError
-     */
-    public function testExecuteWithError(
-        $text,
-        $textLimit,
-        $emails,
-        $emailsLimit,
-        $shared,
-        $postValue,
-        $errorMessage
-    ) {
-        $this->formKeyValidator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->wishlist->expects($this->once())
-            ->method('getShared')
-            ->willReturn($shared);
-
-        $this->wishlistProvider->expects($this->once())
-            ->method('getWishlist')
-            ->willReturn($this->wishlist);
-
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingEmailLimit')
-            ->willReturn($emailsLimit);
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingTextLimit')
-            ->willReturn($textLimit);
-
-        $this->request->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap([
-                ['emails', $emails],
-                ['message', $text],
-            ]);
-        $this->request->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($postValue);
-
-        $this->messageManager->expects($this->once())
-            ->method('addError')
-            ->with($errorMessage)
-            ->willReturnSelf();
-
-        $this->wishlistSession->expects($this->any())
-            ->method('setSharingForm')
-            ->with($postValue)
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/share')
-            ->willReturnSelf();
-
-        $this->assertEquals($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * 1. Text
-     * 2. Text limit
-     * 3. Emails
-     * 4. Emails limit
-     * 5. Shared wishlists counter
-     * 6. POST value
-     * 7. Error message (RESULT)
-     *
-     * @return array
-     */
-    public function dataProviderExecuteWithError()
-    {
-        return [
-            ['test text', 1, 'user1@example.com', 1, 0, '', 'Message length must not exceed 1 symbols'],
-            ['test text', 100, null, 1, 0, '', 'Please enter an email address.'],
-            ['test text', 100, '', 1, 0, '', 'Please enter an email address.'],
-            ['test text', 100, 'user1@example.com', 1, 1, '', 'This wish list can be shared 0 more times.'],
-            [
-                'test text',
-                100,
-                'u1@example.com, u2@example.com',
-                3,
-                2,
-                '',
-                'This wish list can be shared 1 more times.'
-            ],
-            ['test text', 100, 'wrongEmailAddress', 1, 0, '', 'Please enter a valid email address.'],
-            ['test text', 100, 'user1@example.com, wrongEmailAddress', 2, 0, '', 'Please enter a valid email address.'],
-            ['test text', 100, 'wrongEmailAddress, user2@example.com', 2, 0, '', 'Please enter a valid email address.'],
-        ];
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithException()
-    {
-        $text = 'test text';
-        $textLimit = 100;
-        $emails = 'user1@example.com';
-        $emailsLimit = 1;
-        $shared = 0;
-        $customerName = 'user1 user1';
-        $wishlistId = 1;
-        $rssLink = 'rss link';
-        $sharingCode = 'sharing code';
-        $exceptionMessage = 'test exception message';
-        $postValue = '';
-
-        $this->formKeyValidator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->wishlist->expects($this->exactly(2))
-            ->method('getShared')
-            ->willReturn($shared);
-        $this->wishlist->expects($this->once())
-            ->method('setShared')
-            ->with($shared)
-            ->willReturnSelf();
-        $this->wishlist->expects($this->once())
-            ->method('getId')
-            ->willReturn($wishlistId);
-        $this->wishlist->expects($this->once())
-            ->method('getSharingCode')
-            ->willReturn($sharingCode);
-        $this->wishlist->expects($this->once())
-            ->method('save')
-            ->willReturnSelf();
-
-        $this->wishlistProvider->expects($this->once())
-            ->method('getWishlist')
-            ->willReturn($this->wishlist);
-
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingEmailLimit')
-            ->willReturn($emailsLimit);
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingTextLimit')
-            ->willReturn($textLimit);
-
-        $this->request->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap([
-                ['emails', $emails],
-                ['message', $text],
-            ]);
-        $this->request->expects($this->exactly(2))
-            ->method('getParam')
-            ->with('rss_url')
-            ->willReturn(true);
-        $this->request->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($postValue);
-
-        $this->layout->expects($this->once())
-            ->method('getBlock')
-            ->with('wishlist.email.rss')
-            ->willReturnSelf();
-        $this->layout->expects($this->once())
-            ->method('setWishlistId')
-            ->with($wishlistId)
-            ->willReturnSelf();
-        $this->layout->expects($this->once())
-            ->method('toHtml')
-            ->willReturn($rssLink);
-
-        $this->resultLayout->expects($this->exactly(2))
-            ->method('addHandle')
-            ->willReturnMap([
-                ['wishlist_email_rss', null],
-                ['wishlist_email_items', null],
-            ]);
-        $this->resultLayout->expects($this->once())
-            ->method('getLayout')
-            ->willReturn($this->layout);
-
-        $this->inlineTranslation->expects($this->once())
-            ->method('suspend')
-            ->willReturnSelf();
-        $this->inlineTranslation->expects($this->once())
-            ->method('resume')
-            ->willReturnSelf();
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerDataObject')
-            ->willReturn($this->customerData);
-
-        $this->customerViewHelper->expects($this->once())
-            ->method('getCustomerName')
-            ->with($this->customerData)
-            ->willReturn($customerName);
-
-        // Throw Exception
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateIdentifier')
-            ->willThrowException(new \Exception($exceptionMessage));
-
-        $this->messageManager->expects($this->once())
-            ->method('addError')
-            ->with($exceptionMessage)
-            ->willReturnSelf();
-
-        $this->wishlistSession->expects($this->any())
-            ->method('setSharingForm')
-            ->with($postValue)
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/share')
-            ->willReturnSelf();
-
-        $this->assertEquals($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecute()
-    {
-        $text = 'text';
-        $textLimit = 100;
-        $emails = 'user1@example.com';
-        $emailsLimit = 1;
-        $shared = 0;
-        $customerName = 'user1 user1';
-        $wishlistId = 1;
-        $sharingCode = 'sharing code';
-        $templateIdentifier = 'template identifier';
-        $storeId = 1;
-        $viewOnSiteLink = 'view on site link';
-        $from = 'user0@example.com';
-
-        $this->formKeyValidator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->wishlist->expects($this->exactly(2))
-            ->method('getShared')
-            ->willReturn($shared);
-        $this->wishlist->expects($this->once())
-            ->method('setShared')
-            ->with(++$shared)
-            ->willReturnSelf();
-        $this->wishlist->expects($this->exactly(2))
-            ->method('getId')
-            ->willReturn($wishlistId);
-        $this->wishlist->expects($this->once())
-            ->method('getSharingCode')
-            ->willReturn($sharingCode);
-        $this->wishlist->expects($this->once())
-            ->method('save')
-            ->willReturnSelf();
-        $this->wishlist->expects($this->once())
-            ->method('isSalable')
-            ->willReturn(true);
-
-        $this->wishlistProvider->expects($this->once())
-            ->method('getWishlist')
-            ->willReturn($this->wishlist);
-
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingEmailLimit')
-            ->willReturn($emailsLimit);
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingTextLimit')
-            ->willReturn($textLimit);
-
-        $this->request->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap([
-                ['emails', $emails],
-                ['message', $text],
-            ]);
-        $this->request->expects($this->exactly(2))
-            ->method('getParam')
-            ->with('rss_url')
-            ->willReturn(true);
-
-        $this->layout->expects($this->exactly(2))
-            ->method('getBlock')
-            ->willReturnMap([
-                ['wishlist.email.rss', $this->layout],
-                ['wishlist.email.items', $this->layout],
-            ]);
-
-        $this->layout->expects($this->once())
-            ->method('setWishlistId')
-            ->with($wishlistId)
-            ->willReturnSelf();
-        $this->layout->expects($this->exactly(2))
-            ->method('toHtml')
-            ->willReturn($text);
-
-        $this->resultLayout->expects($this->exactly(2))
-            ->method('addHandle')
-            ->willReturnMap([
-                ['wishlist_email_rss', null],
-                ['wishlist_email_items', null],
-            ]);
-        $this->resultLayout->expects($this->exactly(2))
-            ->method('getLayout')
-            ->willReturn($this->layout);
-
-        $this->inlineTranslation->expects($this->once())
-            ->method('suspend')
-            ->willReturnSelf();
-        $this->inlineTranslation->expects($this->once())
-            ->method('resume')
-            ->willReturnSelf();
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerDataObject')
-            ->willReturn($this->customerData);
-
-        $this->customerViewHelper->expects($this->once())
-            ->method('getCustomerName')
-            ->with($this->customerData)
-            ->willReturn($customerName);
-
-        $this->scopeConfig->expects($this->exactly(2))
-            ->method('getValue')
-            ->willReturnMap([
-                ['wishlist/email/email_template', ScopeInterface::SCOPE_STORE, null, $templateIdentifier],
-                ['wishlist/email/email_identity', ScopeInterface::SCOPE_STORE, null, $from],
-            ]);
-
-        $this->store->expects($this->once())
-            ->method('getStoreId')
-            ->willReturn($storeId);
-
-        $this->url->expects($this->once())
-            ->method('getUrl')
-            ->with('*/shared/index', ['code' => $sharingCode])
-            ->willReturn($viewOnSiteLink);
-
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateIdentifier')
-            ->with($templateIdentifier)
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateOptions')
-            ->with([
-                'area' => Area::AREA_FRONTEND,
-                'store' => $storeId,
-            ])
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateVars')
-            ->with([
-                'customer' => $this->customerData,
-                'customerName' => $customerName,
-                'salable' => 'yes',
-                'items' => $text,
-                'viewOnSiteLink' => $viewOnSiteLink,
-                'message' => $text . $text,
-                'store' => $this->store,
-            ])
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
-            ->with($from)
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('addTo')
-            ->with($emails)
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('getTransport')
-            ->willReturn($this->transport);
-
-        $this->transport->expects($this->once())
-            ->method('sendMessage')
-            ->willReturnSelf();
-
-        $this->eventManager->expects($this->once())
-            ->method('dispatch')
-            ->with('wishlist_share', ['wishlist' => $this->wishlist])
-            ->willReturnSelf();
-
-        $this->messageManager->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('Your wish list has been shared.'))
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*', ['wishlist_id' => $wishlistId])
-            ->willReturnSelf();
-
-        $this->assertEquals($this->resultRedirect, $this->model->execute());
-    }
 }
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index ce43f6faae200..5502fbde4a33c 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -15,7 +15,8 @@
         "magento/module-rss": "*",
         "magento/module-sales": "*",
         "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/module-ui": "*",
+        "magento/module-captcha": "100.2.2"
     },
     "suggest": {
         "magento/module-configurable-product": "*",
diff --git a/app/code/Magento/Wishlist/etc/config.xml b/app/code/Magento/Wishlist/etc/config.xml
index 1fec2d1baf9d4..3f623cda72226 100644
--- a/app/code/Magento/Wishlist/etc/config.xml
+++ b/app/code/Magento/Wishlist/etc/config.xml
@@ -18,5 +18,21 @@
                 <text_limit>255</text_limit>
             </email>
         </wishlist>
+        <captcha translate="label">
+            <frontend>
+                <areas>
+                    <share_wishlist_form>
+                        <label>Share Wishlist Form</label>
+                    </share_wishlist_form>
+                </areas>
+            </frontend>
+        </captcha>
+        <customer>
+            <captcha>
+                <shown_to_logged_in_user>
+                    <share_wishlist_form>1</share_wishlist_form>
+                </shown_to_logged_in_user>
+            </captcha>
+        </customer>
     </default>
 </config>
diff --git a/app/code/Magento/Wishlist/etc/module.xml b/app/code/Magento/Wishlist/etc/module.xml
index c5ece20d7956b..ab48ee89b7474 100644
--- a/app/code/Magento/Wishlist/etc/module.xml
+++ b/app/code/Magento/Wishlist/etc/module.xml
@@ -10,6 +10,7 @@
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Catalog"/>
+            <module name="Magento_Captcha"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
index 430ebd384c82b..ff01cb4532cc7 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
@@ -40,6 +40,7 @@
             </div>
         <?php endif; ?>
     </fieldset>
+    <?= $block->getChildHtml('captcha'); ?>
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit" title="<?= $block->escapeHtmlAttr(__('Share Wish List')) ?>" class="action submit primary">
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
index 4883d7819c288..e7754f2ab9f9d 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Captcha\Test\Constraint;
 
-use Magento\Contact\Test\Page\ContactIndex;
+use Magento\Contact\Test\Page\ContactIndexCaptcha as ContactIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
index 060fc5f346fda..742eabb61f371 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.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="ContactIndex" mca="contact/index/index" module="Magento_Contact">
+    <page name="ContactIndexCaptcha" mca="contact/index/index" module="Magento_Captcha">
         <block name="contactUs" class="Magento\Captcha\Test\Block\Form\ContactUs" locator="#contact-form" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
index d8c9bf1f719de..0de71c3a416c8 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
@@ -8,7 +8,7 @@
 
 use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnContactUsForm;
 use Magento\Contact\Test\Fixture\Comment;
-use Magento\Contact\Test\Page\ContactIndex;
+use Magento\Captcha\Test\Page\ContactIndexCaptcha as ContactIndex;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Mtf\TestStep\TestStepFactory;
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
new file mode 100644
index 0000000000000..415591ac7d990
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Controller;
+
+use Magento\TestFramework\TestCase\AbstractController;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Model\Session;
+use Psr\Log\LoggerInterface;
+
+class SendTest extends AbstractController
+{
+    /** @var AccountManagementInterface */
+    private $accountManagement;
+
+    /** @var FormKey */
+    private $formKey;
+
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $logger = $this->createMock(LoggerInterface::class);
+        $session = Bootstrap::getObjectManager()->create(
+            Session::class,
+            [$logger]
+        );
+        $this->accountManagement = Bootstrap::getObjectManager()->create(AccountManagementInterface::class);
+        $this->formKey = Bootstrap::getObjectManager()->create(FormKey::class);
+        $customer = $this->accountManagement->authenticate('customer@example.com', 'password');
+        $session->setCustomerDataAsLoggedIn($customer);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testExecutePost()
+    {
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'emails' => 'example1@gmail.com, example2@gmail.com, example3@gmail.com'
+                ]
+            );
+
+        $this->dispatch('wishlist/index/send');
+        $this->assertRedirect($this->stringContains('wishlist/index/index'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Your wish list has been shared.']),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+    }
+}

From 2145b8f117989a2670916d386ba5b4aad6934520 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 7 Sep 2018 14:46:00 +0300
Subject: [PATCH 0018/1055] MAGETWO-90467: Added posibility to use captcha on
 share wishlist page

---
 .../testsuite/Magento/Customer/Controller/SendTest.php          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
index 415591ac7d990..3fca3232339b5 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Controller;
 
 use Magento\TestFramework\TestCase\AbstractController;

From 45476ba22f18c3d7ada2d5ad68c337e0a22f21db Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 7 Sep 2018 16:32:30 +0300
Subject: [PATCH 0019/1055] MAGETWO-90467: Added posibility to use captcha on
 share wishlist page

---
 .../Test/Constraint/AssertCaptchaFieldOnContactUsForm.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
index e7754f2ab9f9d..0fa41838d208a 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Captcha\Test\Constraint;
 
-use Magento\Contact\Test\Page\ContactIndexCaptcha as ContactIndex;
+use Magento\Captcha\Test\Page\ContactIndexCaptcha as ContactIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
@@ -20,7 +20,7 @@ class AssertCaptchaFieldOnContactUsForm extends AbstractConstraint
      * @param ContactIndex $contactIndex
      * @return void
      */
-    public function processAssertRegisterForm(ContactIndex $contactIndex)
+    public function processAssertRegisterForm(ContactIndexCaptcha $contactIndex)
     {
         \PHPUnit\Framework\Assert::assertTrue(
             $contactIndex->getContactUs()->isVisibleCaptcha(),

From fce15d37e87f3991ca53b17b6321b0f2fb5a615d Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 7 Sep 2018 18:45:38 +0300
Subject: [PATCH 0020/1055] MAGETWO-92167: Apply HTML5 Attributes to Newsletter
 Preview

---
 .../adminhtml/templates/preview/iframeswitcher.phtml  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
index a64185ce67958..532ecde456077 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -16,7 +16,16 @@
         </div>
         <?php endif;?>
     </div>
-    <iframe name="preview_iframe" id="preview_iframe" frameborder="0" title="<?= $block->escapeHtmlAttr(__('Preview')) ?>" width="100%"></iframe>
+    <iframe
+            name="preview_iframe"
+            id="preview_iframe"
+            frameborder="0"
+            title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
+            width="100%"
+            sandbox="allow-forms allow-pointer-lock allow-scripts"
+    >
+
+    </iframe>
     <?= $block->getChildHtml('preview_form') ?>
 </div>
 

From a48c08774ce768031863370c8bb6450ce17b699f Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Sun, 9 Sep 2018 16:04:28 +0200
Subject: [PATCH 0021/1055] Loader replaced with actual product photo to
 visualy speedup loading

---
 .../templates/product/view/gallery.phtml      | 30 +++++--------------
 lib/web/mage/gallery/gallery.less             | 10 +++----
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 1bfa30478df8a..79714d5bf9035 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -12,32 +12,16 @@
  * @var $block \Magento\Catalog\Block\Product\View\Gallery
  */
 ?>
+
+<?php $images = $block->getGalleryImages()->toArray()['items'] ?>
+
 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
-    <div data-role="loader" class="loading-mask">
-        <div class="loader">
-            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
-                 alt="<?= /* @escapeNotVerified */ __('Loading...') ?>">
-        </div>
-    </div>
+    <img
+        class="gallery-placeholder__image"
+        src="<?= $images[0]['medium_image_url'] ?>"
+    />
 </div>
-<!--Fix for jumping content. Loader must be the same size as gallery.-->
-<script>
-    var config = {
-            "width": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>,
-            "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
-                        ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
-            "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
-            "height": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'height') ?>
-        },
-        thumbBarHeight = 0,
-        loader = document.querySelectorAll('[data-gallery-role="gallery-placeholder"] [data-role="loader"]')[0];
 
-    if (config.navtype === 'horizontal') {
-        thumbBarHeight = config.thumbheight;
-    }
-
-    loader.style.paddingBottom = ( config.height / config.width * 100) + "%";
-</script>
 <script type="text/x-magento-init">
     {
         "[data-gallery-role=gallery-placeholder]": {
diff --git a/lib/web/mage/gallery/gallery.less b/lib/web/mage/gallery/gallery.less
index 3c35a772253bc..4b7ff77e60265 100644
--- a/lib/web/mage/gallery/gallery.less
+++ b/lib/web/mage/gallery/gallery.less
@@ -976,12 +976,9 @@
 
 // While first time init
 .gallery-placeholder {
-    .loading-mask {
-        padding: 0 0 50%;
-        position: static;
-    }
-    .loader img {
-        position: absolute;
+    &__image {
+        display: block;
+        margin: auto;
     }
 }
 
@@ -1002,6 +999,7 @@
         display: block;
     }
 }
+
 .fotorama__product-video--loaded {
     .fotorama__img, .fotorama__img--full {
         display: none !important;

From 3f3489de37b58d05e4f3be918361339ae2d29c52 Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Mon, 10 Sep 2018 08:51:28 +0200
Subject: [PATCH 0022/1055] Placeholder fallback. Unescaped output comment.

---
 .../Catalog/Block/Product/View/Gallery.php        | 15 +++++++++++++++
 .../frontend/templates/product/view/gallery.phtml |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index ab01fc6d134e9..ff8976130e9bd 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -233,4 +233,19 @@ private function getGalleryImagesConfig()
 
         return $this->getData('gallery_images_config');
     }
+
+    /**
+     * @param string $image
+     * @return string
+     */
+    public function getMainProductImage()
+    {
+        $image = $this->getGalleryImages()->toArray()['items'][0]['medium_image_url'];
+
+        if (!$image) {
+            return $this->_imageHelper->getDefaultPlaceholderUrl('image');
+        }
+
+        return $image;
+    }
 }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 79714d5bf9035..820e6cc969175 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -13,12 +13,10 @@
  */
 ?>
 
-<?php $images = $block->getGalleryImages()->toArray()['items'] ?>
-
 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
     <img
         class="gallery-placeholder__image"
-        src="<?= $images[0]['medium_image_url'] ?>"
+        src="<?= /* @escapeNotVerified */ $block->getMainProductImage() ?>"
     />
 </div>
 

From ab84442aa46fa38665c70a2a1868e3ee015567f7 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 13 Sep 2018 12:32:37 +0300
Subject: [PATCH 0023/1055] MAGETWO-92776: Fixed wrong admin notifications
 behavior

---
 .../Magento/AdminNotification/Block/Grid/Renderer/Actions.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index 6f0e42bdcbef1..d2d846f42dd16 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -37,7 +37,9 @@ public function __construct(
      */
     public function render(\Magento\Framework\DataObject $row)
     {
-        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' .
+        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' .
+            $this->escapeUrl($row->getUrl())
+            . '">' .
             __('Read Details') . '</a>' : '';
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(

From 486d79b39650116c144bfb01d661e464f068953a Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 13 Sep 2018 13:04:08 +0300
Subject: [PATCH 0024/1055] MAGETWO-92726: Fixed wrong admin notifications
 behavior

---
 .../AdminNotification/Block/Grid/Renderer/Actions.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index d2d846f42dd16..cca7ef26d0e53 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -8,6 +8,11 @@
 
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
+/**
+ * Class Actions
+ *
+ * @package Magento\AdminNotification\Block\Grid\Renderer
+ */
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**

From d9516556f36854b622aa179fb8916166d743cc9d Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Mon, 17 Sep 2018 15:37:43 +0300
Subject: [PATCH 0025/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../product/composite/fieldset/options/view/checkable.phtml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
index 6dbee42dbc88c..80552aa462d01 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -60,8 +60,8 @@ $option->getId() ?>-list">
         }
         ?>
 
-        <div class="field choice admin__field admin__field-option'<?php echo /* @noEscape */
-        $option->getIsRequire() ?>'">
+        <div class="field choice admin__field admin__field-option <?php echo /* @noEscape */
+        $option->getIsRequire() ? 'required': '' ?>">
             <input type="<?php echo /* @noEscape */
             $optionType ?>"
                    class="<?php /** @noinspection DisconnectedForeachInstructionInspection */

From 2b50a94a29277d04465ca2181a9f68f01dbb417b Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 18 Sep 2018 12:52:45 +0300
Subject: [PATCH 0026/1055] MAGETWO-90467: Added posibility to use captcha on
 share wishlist page

---
 .../Wishlist/Controller/Index/Send.php        |  2 +-
 app/code/Magento/Wishlist/composer.json       |  2 +-
 .../Magento/Customer/Controller/SendTest.php  | 29 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index 4c53aaac40916..3b62df17a2cd0 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -336,7 +336,7 @@ protected function getWishlistItems(ResultLayout $resultLayout)
      * @param CaptchaModel $captchaModel
      * @return void
      */
-    private function logCaptchaAttempt(CaptchaModel $captchaModel)
+    private function logCaptchaAttempt(CaptchaModel $captchaModel): void
     {
         /** @var  Customer $customer */
         $customer = $this->_customerSession->getCustomer();
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index 5502fbde4a33c..f59ed8c3c7f3c 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -16,7 +16,7 @@
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-ui": "*",
-        "magento/module-captcha": "100.2.2"
+        "magento/module-captcha": "*"
     },
     "suggest": {
         "magento/module-configurable-product": "*",
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
index 3fca3232339b5..54dbdf25dd645 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
@@ -61,4 +61,33 @@ public function testExecutePost()
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
     }
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 0
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoConfigFixture default_store customer/captcha/forms user_forgotpassword,user_login,share_wishlist_form
+     *
+     */
+    public function testCaptchaFailed()
+    {
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'emails' => 'example1@gmail.com, example2@gmail.com, example3@gmail.com',
+                    'captcha' => [
+                        'share_wishlist_form' => 'wrong_captcha_word'
+                        ]
+                ]
+            );
+
+        $this->dispatch('wishlist/index/send');
+        $this->assertRedirect($this->stringContains('wishlist/index/share'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Incorrect CAPTCHA']),
+            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+        );
+    }
 }

From 4a4b07de592e98ab0f1fa1f1144c4bd5ac0fee71 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 18 Sep 2018 13:06:38 +0300
Subject: [PATCH 0027/1055] MAGETWO-90467: Added posibility to use captcha on
 share wishlist page

---
 app/code/Magento/Wishlist/Controller/Index/Send.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index 3b62df17a2cd0..da523135ccd8a 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -26,7 +26,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Send extends \Magento\Wishlist\Controller\AbstractIndex
+class Send extends \Magento\Wishlist\Controller\AbstractIndex implements Action\HttpPostActionInterface
 {
     /**
      * @var \Magento\Customer\Helper\View

From 1a283067425e5276e90d2f5420f04ab6575fca85 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 18 Sep 2018 14:12:11 +0300
Subject: [PATCH 0028/1055] MAGETWO-90467: Added posibility to use captcha on
 share wishlist page

---
 app/code/Magento/Wishlist/Controller/Index/Send.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index da523135ccd8a..a4e8258b9d67e 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -24,6 +24,9 @@
 use Magento\Customer\Model\Customer;
 
 /**
+ * Class Send
+ *
+ * @package Magento\Wishlist\Controller\Index
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Send extends \Magento\Wishlist\Controller\AbstractIndex implements Action\HttpPostActionInterface
@@ -333,6 +336,7 @@ protected function getWishlistItems(ResultLayout $resultLayout)
 
     /**
      * Log customer action attempts
+     *
      * @param CaptchaModel $captchaModel
      * @return void
      */
@@ -350,6 +354,8 @@ private function logCaptchaAttempt(CaptchaModel $captchaModel): void
     }
 
     /**
+     * Captcha validate logic
+     *
      * @param CaptchaModel $captchaModel
      * @param string $captchaFormName
      * @return bool

From 00720320c7de55e83632978fadff6ad88295707e Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 18 Sep 2018 14:18:35 +0300
Subject: [PATCH 0029/1055] MAGETWO-90467: Added posibility to use captcha on
 share wishlist page

---
 app/code/Magento/Wishlist/Block/Customer/Sharing.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Sharing.php b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
index 992946363186c..40fd00d6143a5 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sharing.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
@@ -14,8 +14,11 @@
 use Magento\Captcha\Block\Captcha;
 
 /**
+ * Class Sharing
+ *
  * @api
  * @since 100.0.2
+ * @package Magento\Wishlist\Block\Customer
  */
 class Sharing extends \Magento\Framework\View\Element\Template
 {

From 7c39cdd14e0d3221fe038ffe3f5353a32fd1cb81 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 18 Sep 2018 17:59:02 +0300
Subject: [PATCH 0030/1055] MAGETWO-90467: Added posibility to use captcha on
 share wishlist page

---
 .../testsuite/Magento/Wishlist/Controller/IndexTest.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
index 92eae7a3fe3d7..9edea52f1b863 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
@@ -158,6 +158,7 @@ public function testSendAction()
         ];
 
         $this->getRequest()->setPostValue($request);
+        $this->getRequest()->setMethod('POST');
 
         $this->_objectManager->get(\Magento\Framework\Registry::class)->register(
             'wishlist',

From e18c50955c3562a1685daa13960b00ffd7140568 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 19 Sep 2018 18:04:14 +0300
Subject: [PATCH 0031/1055] MAGETWO-88607: Wrong behavior of static content
 deploy

---
 app/code/Magento/Deploy/Console/InputValidator.php            | 2 ++
 app/code/Magento/Deploy/Service/DeployStaticContent.php       | 4 ++++
 .../Magento/Deploy/Test/Unit/Console/InputValidatorTest.php   | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Deploy/Console/InputValidator.php b/app/code/Magento/Deploy/Console/InputValidator.php
index 2ce9712a78729..772410d58a461 100644
--- a/app/code/Magento/Deploy/Console/InputValidator.php
+++ b/app/code/Magento/Deploy/Console/InputValidator.php
@@ -164,6 +164,8 @@ private function checkLanguagesInput(array $languagesInclude, array $languagesEx
     }
 
     /**
+     * Version input checks
+     *
      * @param string $contentVersion
      * @throws \InvalidArgumentException
      */
diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
index c8885caf25422..24feced9738bc 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
@@ -136,6 +136,8 @@ public function deploy(array $options)
     }
 
     /**
+     * Returns jobs count
+     *
      * @param array $options
      * @return int
      */
@@ -145,6 +147,8 @@ private function getProcessesAmount(array $options)
     }
 
     /**
+     * Check if '--refresh-content-version-only' argument was inserted
+     *
      * @param array $options
      * @return bool
      */
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
index 3ed2e48710c1d..f3991222dfa8c 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
@@ -158,7 +158,7 @@ public function testCheckLanguagesInputException()
             new InputOption(Options::EXCLUDE_AREA, '', 4, '', ['none']),
             new InputOption(Options::THEME, null, 4, '', ['all']),
             new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['none']),
-            new InputArgument(Options::LANGUAGES_ARGUMENT, null, 4, ['en_US']),
+            new InputArgument(Options::LANGUAGES_ARGUMENT, 2, '', ['en_US']),
             new InputOption(Options::EXCLUDE_LANGUAGE, null, 4, '', ['all'])
         ];
 
@@ -185,7 +185,7 @@ public function testCheckVersionInputException()
             new InputOption(Options::EXCLUDE_AREA, null, 4, '', ['none']),
             new InputOption(Options::THEME, null, 4, '', ['all']),
             new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['none']),
-            new InputArgument(Options::LANGUAGES_ARGUMENT, null, 4, ['en_US']),
+            new InputArgument(Options::LANGUAGES_ARGUMENT, 2, '', ['en_US']),
             new InputOption(Options::EXCLUDE_LANGUAGE, null, 4, '', ['none']),
             new InputOption(Options::CONTENT_VERSION, null, 4, '', '/*!#')
         ];

From bc8104dddfc31ed9e4c98685c3ead219e68aac77 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 19 Sep 2018 18:20:51 +0300
Subject: [PATCH 0032/1055] MAGETWO-92726: Fixed wrong admin notifications
 behavior

---
 .../Magento/AdminNotification/Block/Grid/Renderer/Actions.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index cca7ef26d0e53..82f70d92e4930 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -9,7 +9,7 @@
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
 /**
- * Class Actions
+ * Renderer class for action in the admin notifications grid
  *
  * @package Magento\AdminNotification\Block\Grid\Renderer
  */

From 697f7691da7b0892c6f98b022517e0dbad50958b Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Wed, 19 Sep 2018 18:11:12 +0200
Subject: [PATCH 0033/1055] Pretier PHP code to make world a better place

---
 .../Catalog/Block/Product/View/Gallery.php        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index ff8976130e9bd..f26eeed1f5755 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -235,17 +235,18 @@ private function getGalleryImagesConfig()
     }
 
     /**
-     * @param string $image
      * @return string
      */
-    public function getMainProductImage()
+    public function getMainProductImage($size = 'medium_image_url')
     {
-        $image = $this->getGalleryImages()->toArray()['items'][0]['medium_image_url'];
+        foreach ($this->getGalleryImages() as $image) {
+            $image = $image->getData($size);
 
-        if (!$image) {
-            return $this->_imageHelper->getDefaultPlaceholderUrl('image');
-        }
+            if (!$image) {
+                return $this->_imageHelper->getDefaultPlaceholderUrl('image');
+            }
 
-        return $image;
+            return $image;
+        }
     }
 }

From 4b25bbc3c9a99c782f4476c591bf1b3f9b6979f1 Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Wed, 19 Sep 2018 18:15:10 +0200
Subject: [PATCH 0034/1055] Size param docs update

---
 app/code/Magento/Catalog/Block/Product/View/Gallery.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index f26eeed1f5755..3e2330ffb03a3 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -235,6 +235,7 @@ private function getGalleryImagesConfig()
     }
 
     /**
+     * @param string $size
      * @return string
      */
     public function getMainProductImage($size = 'medium_image_url')

From d128271192077a456e8ac5bf7558722637fea01b Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Thu, 20 Sep 2018 15:09:11 +0200
Subject: [PATCH 0035/1055] Docs update

Damn, this PHP CS lint output is soo useless
---
 app/code/Magento/Catalog/Block/Product/View/Gallery.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index 3e2330ffb03a3..6ec46e6efab86 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -235,6 +235,8 @@ private function getGalleryImagesConfig()
     }
 
     /**
+     * Get main product image
+     *
      * @param string $size
      * @return string
      */

From e67f492a2bd5f5d6f2e6a22c25ae8efb8954bb19 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 21 Sep 2018 14:01:31 +0300
Subject: [PATCH 0036/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../product/composite/fieldset/options/view/checkable.phtml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
index 80552aa462d01..0f3b4f481a288 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -21,7 +21,7 @@ if ($option) : ?>
 
 <div class="options-list nested" id="options-<?php echo /* @noEscape */
 $option->getId() ?>-list">
-    <?php if ($optionType === Option::OPTION_TYPE_RADIO) : ?>
+    <?php if ($optionType === Option::OPTION_TYPE_RADIO && !$option->getIsRequire()): ?>
     <div class="field choice admin__field admin__field-option">
         <input type="radio"
                id="options_<?php echo /* @noEscape */
@@ -69,7 +69,7 @@ $option->getId() ?>-list">
                    $optionType === Option::OPTION_TYPE_RADIO ?
                        'radio admin__control-radio' :
                        'checkbox admin__control-checkbox' ?> <?php echo /* @noEscape */
-                   $option->getIsRequire() ?>
+                   $option->getIsRequire() ? 'required': '' ?>
                        product-custom-option
                         <?php echo $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
                    name="options[<?php echo $option->getId() ?>]<?php echo /* @noEscape */

From e9d29c002419b38f5ca18dbb84276dffe1c18b44 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 21 Sep 2018 15:21:20 +0300
Subject: [PATCH 0037/1055] MAGETWO-90467: Added posibility to use captcha on
 share wishlist page

---
 .../Test/Constraint/AssertCaptchaFieldOnContactUsForm.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
index 0fa41838d208a..b040397139451 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
@@ -20,7 +20,7 @@ class AssertCaptchaFieldOnContactUsForm extends AbstractConstraint
      * @param ContactIndex $contactIndex
      * @return void
      */
-    public function processAssertRegisterForm(ContactIndexCaptcha $contactIndex)
+    public function processAssertRegisterForm(ContactIndex $contactIndex)
     {
         \PHPUnit\Framework\Assert::assertTrue(
             $contactIndex->getContactUs()->isVisibleCaptcha(),

From 05834db04400a58d569565127060c8b769a0cd0a Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 21 Sep 2018 16:41:02 +0300
Subject: [PATCH 0038/1055] MAGETWO-88663: Wrong custom option behavior

---
 .../Block/Product/View/Options/Type/Select/Checkable.php | 9 +++++++--
 .../Block/Product/View/Options/Type/Select/Multiple.php  | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
index f516072c1c83f..3d856f85dbd94 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
@@ -13,8 +13,7 @@
 use Magento\Catalog\Model\Product\Option;
 
 /**
- * Represent needed logic for checkbox and radio button
- * option types
+ * Represent needed logic for checkbox and radio button option types
  */
 class Checkable extends AbstractOptions
 {
@@ -24,6 +23,8 @@ class Checkable extends AbstractOptions
     protected $_template = 'Magento_Catalog::product/composite/fieldset/options/view/checkable.phtml';
 
     /**
+     * Returns formated price
+     *
      * @param ProductCustomOptionValuesInterface $value
      * @return string
      */
@@ -39,6 +40,8 @@ public function formatPrice(ProductCustomOptionValuesInterface $value): string
     }
 
     /**
+     * Returns current currency for store
+     *
      * @param ProductCustomOptionValuesInterface $value
      * @return float|string
      */
@@ -53,6 +56,8 @@ public function getCurrencyByStore(ProductCustomOptionValuesInterface $value)
     }
 
     /**
+     * Returns preconfigured value for given option
+     *
      * @param Option $option
      * @return string|array|null
      */
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
index 84da8a018800f..09a931dfa0693 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
@@ -18,6 +18,8 @@
 class Multiple extends AbstractOptions
 {
     /**
+     * @inheritdoc
+     *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -54,6 +56,8 @@ protected function _toHtml()
     }
 
     /**
+     * Returns select with inserted option give as a parameter
+     *
      * @param Select $select
      * @param Option $option
      * @return Select
@@ -72,6 +76,8 @@ private function insertSelectOption(Select $select, Option $option): Select
     }
 
     /**
+     * Returns select with formated option prices
+     *
      * @param Select $select
      * @param Option $option
      * @return Select

From 34fdfec0938b2305a3164f3360e931d3486d6515 Mon Sep 17 00:00:00 2001
From: francesco <francesco.h@thesiteup.com>
Date: Thu, 4 Oct 2018 16:41:35 +0200
Subject: [PATCH 0039/1055] Fix phpdocumentor - inheritdoc imports long
 description only

---
 app/code/Magento/Customer/Model/Address.php   | 20 ++++++++-
 app/code/Magento/Customer/Model/Customer.php  |  6 +++
 .../ResourceModel/CustomerRepository.php      | 43 ++++++++++++++++---
 3 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 1dcd8516af69f..376390011056d 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -122,6 +122,8 @@ public function __construct(
     }
 
     /**
+     * Initialize address model
+     *
      * @return void
      */
     protected function _construct()
@@ -168,7 +170,14 @@ public function updateData(AddressInterface $address)
     }
 
     /**
-     * {@inheritdoc}
+     * Create address data object based on current address model.
+     *
+     * @param int|null $defaultBillingAddressId
+     * @param int|null $defaultShippingAddressId
+     * @return AddressInterface
+     * Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
+     * the instance of Api/Data/AddressInterface
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
@@ -261,6 +270,8 @@ public function getDefaultAttributeCodes()
     }
 
     /**
+     * Clone address
+     *
      * @return void
      */
     public function __clone()
@@ -301,6 +312,8 @@ public function setRegionId($regionId)
     }
 
     /**
+     * Create Customer from Factory
+     *
      * @return Customer
      */
     protected function _createCustomer()
@@ -356,7 +369,11 @@ public function reindex()
     }
 
     /**
+     * Get a list of custom attribute codes.
+     *
      * {@inheritdoc}
+     *
+     * @return string[]
      * @since 100.0.6
      */
     protected function getCustomAttributesCodes()
@@ -366,6 +383,7 @@ protected function getCustomAttributesCodes()
 
     /**
      * Get new AttributeList dependency for application code.
+     *
      * @return \Magento\Customer\Model\Address\CustomAttributeListInterface
      * @deprecated 100.0.6
      */
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 6d1c1549216e8..a1a64cb7e4078 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -1292,6 +1292,8 @@ public function getResetPasswordLinkExpirationPeriod()
     }
 
     /**
+     * Create Address from Factory
+     *
      * @return Address
      */
     protected function _createAddressInstance()
@@ -1300,6 +1302,8 @@ protected function _createAddressInstance()
     }
 
     /**
+     * Create Address Collection from Factory
+     *
      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
      */
     protected function _createAddressCollection()
@@ -1308,6 +1312,8 @@ protected function _createAddressCollection()
     }
 
     /**
+     * Get Template Types
+     *
      * @return array
      */
     protected function getTemplateTypes()
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 29e35c721a3be..b5696d5b19ee5 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -161,7 +161,14 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * Create or update a customer.
+     *
+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @param string $passwordHash
+     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @throws \Magento\Framework\Exception\InputException If bad input is provided
+     * @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -293,7 +300,13 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
     }
 
     /**
-     * {@inheritdoc}
+     * Retrieve customer.
+     *
+     * @param string $email
+     * @param int|null $websiteId
+     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified email does not exist.
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function get($email, $websiteId = null)
     {
@@ -302,7 +315,12 @@ public function get($email, $websiteId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * Get customer by Customer ID.
+     *
+     * @param int $customerId
+     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist.
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getById($customerId)
     {
@@ -311,7 +329,13 @@ public function getById($customerId)
     }
 
     /**
+     * Retrieve customers which match a specified criteria.
+     *
      * {@inheritdoc}
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\Customer\Api\Data\CustomerSearchResultsInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -351,7 +375,11 @@ public function getList(SearchCriteriaInterface $searchCriteria)
     }
 
     /**
-     * {@inheritdoc}
+     * Delete customer.
+     *
+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @return bool true on success
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function delete(CustomerInterface $customer)
     {
@@ -359,7 +387,12 @@ public function delete(CustomerInterface $customer)
     }
 
     /**
-     * {@inheritdoc}
+     * Delete customer by Customer ID.
+     *
+     * @param int $customerId
+     * @return bool true on success
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function deleteById($customerId)
     {

From 05e02c223d57fc6cfe669e84bff78cb2984460ce Mon Sep 17 00:00:00 2001
From: francesco <francesco.h@thesiteup.com>
Date: Fri, 5 Oct 2018 08:29:17 +0200
Subject: [PATCH 0040/1055] Fix phpdocumentor - automatic inherit if doc is
 without changes

---
 app/code/Magento/Customer/Model/Address.php   | 12 +-----
 .../ResourceModel/CustomerRepository.php      | 41 -------------------
 2 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 376390011056d..1206f157c7fc5 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -169,16 +169,6 @@ public function updateData(AddressInterface $address)
         return $this;
     }
 
-    /**
-     * Create address data object based on current address model.
-     *
-     * @param int|null $defaultBillingAddressId
-     * @param int|null $defaultShippingAddressId
-     * @return AddressInterface
-     * Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
-     * the instance of Api/Data/AddressInterface
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
         if ($this->getCustomerId() || $this->getParentId()) {
@@ -371,7 +361,7 @@ public function reindex()
     /**
      * Get a list of custom attribute codes.
      *
-     * {@inheritdoc}
+     * By default, entity can be extended only using extension attributes functionality.
      *
      * @return string[]
      * @since 100.0.6
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index b5696d5b19ee5..e90aa5e319c65 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -299,44 +299,18 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
         }
     }
 
-    /**
-     * Retrieve customer.
-     *
-     * @param string $email
-     * @param int|null $websiteId
-     * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified email does not exist.
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function get($email, $websiteId = null)
     {
         $customerModel = $this->customerRegistry->retrieveByEmail($email, $websiteId);
         return $customerModel->getDataModel();
     }
 
-    /**
-     * Get customer by Customer ID.
-     *
-     * @param int $customerId
-     * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist.
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function getById($customerId)
     {
         $customerModel = $this->customerRegistry->retrieve($customerId);
         return $customerModel->getDataModel();
     }
 
-    /**
-     * Retrieve customers which match a specified criteria.
-     *
-     * {@inheritdoc}
-     *
-     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-     * @return \Magento\Customer\Api\Data\CustomerSearchResultsInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
         $searchResults = $this->searchResultsFactory->create();
@@ -374,26 +348,11 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         return $searchResults;
     }
 
-    /**
-     * Delete customer.
-     *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-     * @return bool true on success
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function delete(CustomerInterface $customer)
     {
         return $this->deleteById($customer->getId());
     }
 
-    /**
-     * Delete customer by Customer ID.
-     *
-     * @param int $customerId
-     * @return bool true on success
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
     public function deleteById($customerId)
     {
         $customerModel = $this->customerRegistry->retrieve($customerId);

From 5ba0f1d01ed3386522d84d02b2c35070a81fe3d3 Mon Sep 17 00:00:00 2001
From: francesco <francesco.h@thesiteup.com>
Date: Fri, 5 Oct 2018 09:46:20 +0200
Subject: [PATCH 0041/1055] Fix phpdocumentor - comment blocks are not
 automatically inherited

---
 app/code/Magento/Customer/Model/Address.php   | 10 +++++
 .../ResourceModel/CustomerRepository.php      | 43 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 1206f157c7fc5..a10c6569851f6 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -169,6 +169,16 @@ public function updateData(AddressInterface $address)
         return $this;
     }
 
+    /**
+     * Create address data object based on current address model.
+     *
+     * @param int|null $defaultBillingAddressId
+     * @param int|null $defaultShippingAddressId
+     * @return AddressInterface
+     * Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
+     * the instance of Api/Data/AddressInterface
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
         if ($this->getCustomerId() || $this->getParentId()) {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index e90aa5e319c65..d3b7e2c6a28f7 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -299,18 +299,46 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
         }
     }
 
+    /**
+     * Retrieve customer.
+     *
+     * @param string $email
+     * @param int|null $websiteId
+     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified email does not exist.
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function get($email, $websiteId = null)
     {
         $customerModel = $this->customerRegistry->retrieveByEmail($email, $websiteId);
         return $customerModel->getDataModel();
     }
 
+    /**
+     * Get customer by Customer ID.
+     *
+     * @param int $customerId
+     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist.
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function getById($customerId)
     {
         $customerModel = $this->customerRegistry->retrieve($customerId);
         return $customerModel->getDataModel();
     }
 
+    /**
+     * 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
+     * which call to use to get detailed information about all attributes for an object.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return \Magento\Customer\Api\Data\CustomerSearchResultsInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
         $searchResults = $this->searchResultsFactory->create();
@@ -348,11 +376,26 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         return $searchResults;
     }
 
+    /**
+     * Delete customer.
+     *
+     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @return bool true on success
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function delete(CustomerInterface $customer)
     {
         return $this->deleteById($customer->getId());
     }
 
+    /**
+     * Delete customer by Customer ID.
+     *
+     * @param int $customerId
+     * @return bool true on success
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function deleteById($customerId)
     {
         $customerModel = $this->customerRegistry->retrieve($customerId);

From bf024c1c1f3b86a7c3dd362b78fb124f58f22b96 Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Mon, 15 Oct 2018 20:31:52 +0200
Subject: [PATCH 0042/1055] Fix for issue magento/magento2#18630

---
 .../Ui/view/base/web/js/form/element/post-code.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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..3de99aa9af1a3 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
@@ -20,6 +20,21 @@ define([
             }
         },
 
+        /**
+         * Initializes observable properties of instance
+         *
+         * @returns {Abstract} Chainable.
+         */
+        initObservable: function () {
+            this._super();
+
+            this.value.equalityComparer = function(a, b) {
+                return (!a && !b) || (a == b);
+            };
+
+            return this;
+        },
+
         /**
          * @param {String} value
          */

From df90f67822ea0f1c5765b512c1d7613532a41a11 Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Tue, 16 Oct 2018 15:53:09 +0200
Subject: [PATCH 0043/1055] Fix coding standard errors.

---
 .../Magento/Ui/view/base/web/js/form/element/post-code.js     | 4 ++--
 1 file changed, 2 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 3de99aa9af1a3..4c684f16b7678 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
@@ -28,8 +28,8 @@ define([
         initObservable: function () {
             this._super();
 
-            this.value.equalityComparer = function(a, b) {
-                return (!a && !b) || (a == b);
+            this.value.equalityComparer = function (oldValue, newValue) {
+                return !oldValue && !newValue || oldValue === newValue;
             };
 
             return this;

From 6257fe8a3938c59e207b51da30202e1f5a65eb76 Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Tue, 16 Oct 2018 22:11:15 +0200
Subject: [PATCH 0044/1055] Fixed jsdoc-block definition error

---
 .../Magento/Ui/view/base/web/js/form/element/post-code.js    | 5 +++++
 1 file changed, 5 insertions(+)

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 4c684f16b7678..ec399914ed02e 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
@@ -28,6 +28,11 @@ define([
         initObservable: function () {
             this._super();
 
+            /**
+             * equalityComparer function
+             *
+             * @returns boolean.
+             */
             this.value.equalityComparer = function (oldValue, newValue) {
                 return !oldValue && !newValue || oldValue === newValue;
             };

From 2020eac25b23bc48491bdb9a21d01a764b530a74 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 18 Oct 2018 18:31:26 +0300
Subject: [PATCH 0045/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/Block/Send.php    |  23 +
 .../Controller/Product/Sendmail.php           | 101 +-
 .../Unit/Controller/Product/SendmailTest.php  | 906 ------------------
 app/code/Magento/SendFriend/etc/config.xml    |  16 +
 app/code/Magento/SendFriend/etc/module.xml    |   1 +
 .../view/frontend/templates/send.phtml        |   5 +-
 .../Product/CustomerSendmailTest.php          | 169 ++++
 7 files changed, 311 insertions(+), 910 deletions(-)
 delete mode 100644 app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php

diff --git a/app/code/Magento/SendFriend/Block/Send.php b/app/code/Magento/SendFriend/Block/Send.php
index 43e95ebe43d48..1c4b550361359 100644
--- a/app/code/Magento/SendFriend/Block/Send.php
+++ b/app/code/Magento/SendFriend/Block/Send.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\SendFriend\Block;
 
+use Magento\Captcha\Block\Captcha;
 use Magento\Customer\Model\Context;
 
 /**
@@ -170,6 +171,7 @@ public function setFormData($data)
     /**
      * Retrieve Current Product Id
      *
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      * @return int
      */
     public function getProductId()
@@ -180,6 +182,7 @@ public function getProductId()
     /**
      * Retrieve current category id for product
      *
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      * @return int
      */
     public function getCategoryId()
@@ -222,4 +225,24 @@ public function canSend()
     {
         return !$this->sendfriend->isExceedLimit();
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _prepareLayout()
+    {
+        if (!$this->getChildBlock('captcha')) {
+            $this->addChild(
+                'captcha',
+                Captcha::class,
+                [
+                    'cacheable' => false,
+                    'after' => '-',
+                    'form_id' => 'product_sendtofriend_form',
+                    'image_width' => 230,
+                    'image_height' => 230
+                ]
+            );
+        }
+    }
 }
diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index 4b1f724cb83a6..c1e31e1fd55dc 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -6,10 +6,22 @@
 
 namespace Magento\SendFriend\Controller\Product;
 
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Customer\Model\Customer;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Captcha\Model\DefaultModel as CaptchaModel;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Customer\Model\Session as CustomerSession;
 
-class Sendmail extends \Magento\SendFriend\Controller\Product
+/**
+ * Class Sendmail. Represents request flow logic of 'sendmail' feature
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Catalog\Api\CategoryRepositoryInterface
@@ -22,6 +34,23 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
     protected $catalogSession;
 
     /**
+     * @var CaptchaHelper
+     */
+    private $captchaHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * Sendmail class construct
+     *
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
@@ -29,6 +58,11 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Catalog\Model\Session $catalogSession
+     * @param CaptchaHelper|null $captchaHelper
+     * @param CaptchaStringResolver|null $captchaStringResolver
+     * @param CustomerSession|null $customerSession
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -37,11 +71,18 @@ public function __construct(
         \Magento\SendFriend\Model\SendFriend $sendFriend,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
-        \Magento\Catalog\Model\Session $catalogSession
+        \Magento\Catalog\Model\Session $catalogSession,
+        ?CaptchaHelper $captchaHelper = null,
+        ?CaptchaStringResolver $captchaStringResolver = null,
+        ?CustomerSession $customerSession = null
     ) {
         parent::__construct($context, $coreRegistry, $formKeyValidator, $sendFriend, $productRepository);
         $this->categoryRepository = $categoryRepository;
         $this->catalogSession = $catalogSession;
+        $this->captchaHelper = $captchaHelper ?: ObjectManager::getInstance()->get(CaptchaHelper::class);
+        $this->captchaStringResolver = $captchaStringResolver ?:
+            ObjectManager::getInstance()->get(CaptchaStringResolver::class);
+        $this->customerSession = $customerSession ?: ObjectManager::getInstance()->get(CustomerSession::class);
     }
 
     /**
@@ -49,17 +90,32 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $captchaTargetFormId = 'product_sendtofriend_form';
+        /** @var CaptchaModel $captchaModel */
+        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormId);
 
         if (!$this->_formKeyValidator->validate($this->getRequest())) {
             $resultRedirect->setPath('sendfriend/product/send', ['_current' => true]);
             return $resultRedirect;
         }
 
+        $isCorrectCaptcha = $this->validateCaptcha($captchaModel, $captchaTargetFormId);
+
+        $this->logCaptchaAttempt($captchaModel, $captchaTargetFormId);
+
+        if (!$isCorrectCaptcha) {
+            $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
+            $resultRedirect->setRefererUrl();
+
+            return $resultRedirect;
+        }
+
         $product = $this->_initProduct();
         $data = $this->getRequest()->getPostValue();
 
@@ -117,4 +173,45 @@ public function execute()
         $resultRedirect->setUrl($this->_redirect->error($url));
         return $resultRedirect;
     }
+
+    /**
+     * Validate the given captcha word
+     *
+     * @param CaptchaModel $captchaModel
+     * @param string $captchaTargetFormName
+     * @return bool
+     */
+    private function validateCaptcha(CaptchaModel $captchaModel, $captchaTargetFormName) : bool
+    {
+        if ($captchaModel->isRequired()) {
+            $word = $this->captchaStringResolver->resolve(
+                $this->getRequest(),
+                $captchaTargetFormName
+            );
+
+            if (!$captchaModel->isCorrect($word)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Logs a try to pass captcha validation
+     *
+     * @param CaptchaModel $captchaModel
+     */
+    private function logCaptchaAttempt(CaptchaModel $captchaModel): void
+    {
+        /** @var Customer $customer */
+        $customer = $this->customerSession->getCustomer();
+        $email = '';
+
+        if ($customer->getId()) {
+            $email = $customer->getEmail();
+        }
+
+        $captchaModel->logAttempt($email);
+    }
 }
diff --git a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php
deleted file mode 100644
index c7881f366f520..0000000000000
--- a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php
+++ /dev/null
@@ -1,906 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\SendFriend\Test\Unit\Controller\Product;
-
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class SendmailTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\SendFriend\Controller\Product\Sendmail */
-    protected $model;
-
-    /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
-
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $requestMock;
-
-    /** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
-    protected $registryMock;
-
-    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
-    protected $validatorMock;
-
-    /** @var \Magento\SendFriend\Model\SendFriend|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sendFriendMock;
-
-    /** @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $productRepositoryMock;
-
-    /** @var \Magento\Catalog\Api\CategoryRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $categoryRepositoryMock;
-
-    /** @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
-    protected $catalogSessionMock;
-
-    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $messageManagerMock;
-
-    /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $resultFactoryMock;
-
-    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $eventManagerMock;
-
-    /** @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $redirectMock;
-
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $urlBuilderMock;
-
-    protected function setUp()
-    {
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-            ->setMethods(['getPost', 'getPostValue', 'getParam'])
-            ->getMockForAbstractClass();
-        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->validatorMock = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->sendFriendMock = $this->getMockBuilder(\Magento\SendFriend\Model\SendFriend::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->productRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class)
-            ->getMockForAbstractClass();
-        $this->categoryRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\CategoryRepositoryInterface::class)
-            ->getMockForAbstractClass();
-        $this->catalogSessionMock = $this->getMockBuilder(\Magento\Catalog\Model\Session::class)
-            ->setMethods(['getSendfriendFormData', 'setSendfriendFormData'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-            ->getMock();
-        $this->resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
-            ->getMock();
-        $this->redirectMock = $this->getMockBuilder(\Magento\Framework\App\Response\RedirectInterface::class)
-            ->getMock();
-        $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
-            ->getMock();
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->model = $this->objectManagerHelper->getObject(
-            \Magento\SendFriend\Controller\Product\Sendmail::class,
-            [
-                'request' => $this->requestMock,
-                'coreRegistry' => $this->registryMock,
-                'formKeyValidator' => $this->validatorMock,
-                'sendFriend' => $this->sendFriendMock,
-                'productRepository' => $this->productRepositoryMock,
-                'categoryRepository' => $this->categoryRepositoryMock,
-                'catalogSession' => $this->catalogSessionMock,
-                'messageManager' => $this->messageManagerMock,
-                'resultFactory' => $this->resultFactoryMock,
-                'eventManager' => $this->eventManagerMock,
-                'redirect' => $this->redirectMock,
-                'url' => $this->urlBuilderMock,
-            ]
-        );
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecute()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $productUrl = 'product_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        /** @var \Magento\Catalog\Api\Data\CategoryInterface|\PHPUnit_Framework_MockObject_MockObject $categoryMock */
-        $categoryMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\CategoryInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willReturn($categoryMock);
-
-        $productMock->expects($this->once())
-            ->method('setCategory')
-            ->with($categoryMock);
-
-        $this->registryMock->expects($this->exactly(2))
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                    ['current_category', $categoryMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willReturn(true);
-        $this->sendFriendMock->expects($this->once())
-            ->method('send')
-            ->willReturnSelf();
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('The link to a friend was sent.'))
-            ->willReturnSelf();
-
-        $productMock->expects($this->once())
-            ->method('getProductUrl')
-            ->willReturn($productUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('success')
-            ->with($productUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($productUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithoutValidationAndCategory()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $redirectUrl = 'redirect_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
-
-        $productMock->expects($this->never())
-            ->method('setCategory');
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willReturn(['Some error']);
-        $this->sendFriendMock->expects($this->never())
-            ->method('send');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('Some error'))
-            ->willReturnSelf();
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with($formData);
-
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturn($redirectUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('error')
-            ->with($redirectUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($redirectUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithoutValidationAndCategoryWithProblems()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $redirectUrl = 'redirect_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
-
-        $productMock->expects($this->never())
-            ->method('setCategory');
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willReturn('Some error');
-        $this->sendFriendMock->expects($this->never())
-            ->method('send');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('We found some problems with the data.'))
-            ->willReturnSelf();
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with($formData);
-
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturn($redirectUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('error')
-            ->with($redirectUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($redirectUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithLocalizedException()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $redirectUrl = 'redirect_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
-
-        $productMock->expects($this->never())
-            ->method('setCategory');
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('Localized Exception.')));
-        $this->sendFriendMock->expects($this->never())
-            ->method('send');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('Localized Exception.'))
-            ->willReturnSelf();
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with($formData);
-
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturn($redirectUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('error')
-            ->with($redirectUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($redirectUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithException()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $redirectUrl = 'redirect_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
-
-        $productMock->expects($this->never())
-            ->method('setCategory');
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $exception = new \Exception(__('Exception.'));
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willThrowException($exception);
-        $this->sendFriendMock->expects($this->never())
-            ->method('send');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addException')
-            ->with($exception, __('Some emails were not sent.'))
-            ->willReturnSelf();
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with($formData);
-
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturn($redirectUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('error')
-            ->with($redirectUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($redirectUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithoutProduct()
-    {
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
-        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->exactly(2))
-            ->method('create')
-            ->willReturnMap(
-                [
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [], $redirectMock],
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [], $forwardMock],
-                ]
-            );
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $forwardMock->expects($this->once())
-            ->method('forward')
-            ->with('noroute')
-            ->willReturnSelf();
-
-        $this->assertEquals($forwardMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithoutData()
-    {
-        $productId = 11;
-        $formData = '';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
-        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->exactly(2))
-            ->method('create')
-            ->willReturnMap(
-                [
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [], $redirectMock],
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [], $forwardMock],
-                ]
-            );
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $forwardMock->expects($this->once())
-            ->method('forward')
-            ->with('noroute')
-            ->willReturnSelf();
-
-        $this->assertEquals($forwardMock, $this->model->execute());
-    }
-
-    public function testExecuteWithoutFormKey()
-    {
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturnMap(
-                [
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [], $redirectMock],
-                ]
-            );
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(false);
-
-        $redirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-}
diff --git a/app/code/Magento/SendFriend/etc/config.xml b/app/code/Magento/SendFriend/etc/config.xml
index 9fa005dcd2fd4..d65e5a4a073dd 100644
--- a/app/code/Magento/SendFriend/etc/config.xml
+++ b/app/code/Magento/SendFriend/etc/config.xml
@@ -17,5 +17,21 @@
                 <check_by>0</check_by>
             </email>
         </sendfriend>
+        <captcha translate="label">
+            <frontend>
+                <areas>
+                    <product_sendtofriend_form>
+                        <label>Send To Friend Form</label>
+                    </product_sendtofriend_form>
+                </areas>
+            </frontend>
+        </captcha>
+        <customer>
+            <captcha>
+                <shown_to_logged_in_user>
+                    <product_sendtofriend_form>1</product_sendtofriend_form>
+                </shown_to_logged_in_user>
+            </captcha>
+        </customer>
     </default>
 </config>
diff --git a/app/code/Magento/SendFriend/etc/module.xml b/app/code/Magento/SendFriend/etc/module.xml
index 01c267b3c4fcb..7876ef88618c2 100644
--- a/app/code/Magento/SendFriend/etc/module.xml
+++ b/app/code/Magento/SendFriend/etc/module.xml
@@ -10,6 +10,7 @@
     <module name="Magento_SendFriend" >
         <sequence>
             <module name="Magento_Catalog"/>
+            <module name="Magento_Captcha"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 2b25e0efab84a..876895516ab21 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -90,7 +90,7 @@
 
     <fieldset class="fieldset recipients">
         <?= $block->getBlockHtml('formkey') ?>
-        <legend class="legend"><span><?= $block->escapeHtml(__('Invitee')) ?></span></legend>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Invite')) ?></span></legend>
         <br />
         <div id="recipients-options"></div>
         <?php if ($block->getMaxRecipients()): ?>
@@ -102,12 +102,13 @@
             <div class="secondary">
             <?php if (1 < $block->getMaxRecipients()): ?>
                 <button type="button" id="add-recipient-button" class="action add">
-                    <span><?= $block->escapeHtml(__('Add Invitee')) ?></span></button>
+                    <span><?= $block->escapeHtml(__('Add Invite')) ?></span></button>
             <?php endif; ?>
             </div>
         </div>
         <?= $block->getChildHtml('form_additional_info') ?>
     </fieldset>
+    <?= $block->getChildHtml('captcha'); ?>
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit"
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
new file mode 100644
index 0000000000000..587eaff7ab243
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: roman
+ * Date: 10/18/18
+ * Time: 11:46 AM
+ */
+
+namespace Magento\SendFriend\Controller\Product;
+
+use Magento\Captcha\Model\DefaultModel;
+use Magento\TestFramework\TestCase\AbstractController;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Model\Session;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+
+class CustomerSendmailTest extends AbstractController
+{
+    /**
+     * @var AccountManagementInterface
+     */
+    private $accountManagement;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var CaptchaHelper
+     */
+    private $captchaHelper;
+
+    /**
+     * @throws LocalizedException
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->accountManagement = $this->_objectManager->create(AccountManagementInterface::class);
+        $this->formKey = $this->_objectManager->create(FormKey::class);
+        $logger = $this->createMock(LoggerInterface::class);
+        $this->session = $this->_objectManager->create(
+            Session::class,
+            [$logger]
+        );
+        $this->captchaHelper = $this->_objectManager->create(CaptchaHelper::class);
+        $customer = $this->accountManagement->authenticate('customer@example.com', 'password');
+        $this->session->setCustomerDataAsLoggedIn($customer);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testExecute()
+    {
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'sender' => [
+                        'name' => 'customer',
+                        'email' => 'customer@example.com',
+                        'message' => 'example message'
+                    ],
+                    'id' => 1,
+                    'recipients' => [
+                        'name' => ['John'],
+                        'email' => ['example1@gmail.com']
+                    ]
+
+                ]
+            );
+
+        $this->dispatch('sendfriend/product/sendmail');
+        $this->assertSessionMessages(
+            $this->equalTo(['The link to a friend was sent.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 0
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
+     */
+    public function testWithCaptchaFailed()
+    {
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'sender' => [
+                        'name' => 'customer',
+                        'email' => 'customer@example.com',
+                        'message' => 'example message'
+                    ],
+                    'id' => 1,
+                    'recipients' => [
+                        'name' => ['John'],
+                        'email' => ['example1@gmail.com']
+                    ]
+
+                ]
+            );
+
+        $this->dispatch('sendfriend/product/sendmail');
+        $this->assertSessionMessages(
+            $this->equalTo(['Incorrect CAPTCHA']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 0
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
+     *
+     */
+    public function testWithCaptchaSuccess()
+    {
+        /** @var DefaultModel $captchaModel */
+        $captchaModel = $this->captchaHelper->getCaptcha('product_sendtofriend_form');
+        $captchaModel->generate();
+        $word = $captchaModel->getWord();
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'sender' => [
+                        'name' => 'customer',
+                        'email' => 'customer@example.com',
+                        'message' => 'example message'
+                    ],
+                    'id' => 1,
+                    'captcha' => [
+                        'product_sendtofriend_form' => $word
+                    ],
+                    'recipients' => [
+                        'name' => ['John'],
+                        'email' => ['example1@gmail.com']
+                    ]
+                ]
+            );
+
+        $this->dispatch('sendfriend/product/sendmail');
+        $this->assertSessionMessages(
+            $this->equalTo(['The link to a friend was sent.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+}

From 52ac8344bcb24c29fc3ac8defabe7ac1983f44f2 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 18 Oct 2018 19:09:20 +0300
Subject: [PATCH 0046/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 .../SendFriend/Controller/Product/CustomerSendmailTest.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
index 587eaff7ab243..d464c51050834 100644
--- a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
@@ -1,10 +1,9 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: roman
- * Date: 10/18/18
- * Time: 11:46 AM
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\SendFriend\Controller\Product;
 

From 7eda4c27ac9aabd2090acd0d39a81372dc11e346 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 18 Oct 2018 19:27:31 +0300
Subject: [PATCH 0047/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
index 30aecf13c3588..84486a1e02ae2 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -9,7 +9,8 @@
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-customer": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-captcha": "*"
     },
     "type": "magento2-module",
     "license": [

From 70aefa34b9ccd7a4567cb172ed684ca9815e0f97 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 23 Oct 2018 12:24:39 +0300
Subject: [PATCH 0048/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 .../Controller/Product/Sendmail.php           | 97 +------------------
 .../Magento/SendFriend/Model/SendFriend.php   | 83 +++++++++++++++-
 .../view/frontend/templates/send.phtml        |  4 +-
 3 files changed, 85 insertions(+), 99 deletions(-)

diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index c1e31e1fd55dc..495e9f009e002 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -6,20 +6,12 @@
 
 namespace Magento\SendFriend\Controller\Product;
 
-use Magento\Captcha\Observer\CaptchaStringResolver;
-use Magento\Customer\Model\Customer;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Captcha\Model\DefaultModel as CaptchaModel;
-use Magento\Captcha\Helper\Data as CaptchaHelper;
-use Magento\Framework\App\ObjectManager;
-use Magento\Customer\Model\Session as CustomerSession;
 
 /**
  * Class Sendmail. Represents request flow logic of 'sendmail' feature
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPostActionInterface
 {
@@ -33,21 +25,6 @@ class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPos
      */
     protected $catalogSession;
 
-    /**
-     * @var CaptchaHelper
-     */
-    private $captchaHelper;
-
-    /**
-     * @var CaptchaStringResolver
-     */
-    private $captchaStringResolver;
-
-    /**
-     * @var CustomerSession
-     */
-    private $customerSession;
-
     /**
      * Sendmail class construct
      *
@@ -58,11 +35,6 @@ class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPos
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Catalog\Model\Session $catalogSession
-     * @param CaptchaHelper|null $captchaHelper
-     * @param CaptchaStringResolver|null $captchaStringResolver
-     * @param CustomerSession|null $customerSession
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -71,18 +43,11 @@ public function __construct(
         \Magento\SendFriend\Model\SendFriend $sendFriend,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
-        \Magento\Catalog\Model\Session $catalogSession,
-        ?CaptchaHelper $captchaHelper = null,
-        ?CaptchaStringResolver $captchaStringResolver = null,
-        ?CustomerSession $customerSession = null
+        \Magento\Catalog\Model\Session $catalogSession
     ) {
         parent::__construct($context, $coreRegistry, $formKeyValidator, $sendFriend, $productRepository);
         $this->categoryRepository = $categoryRepository;
         $this->catalogSession = $catalogSession;
-        $this->captchaHelper = $captchaHelper ?: ObjectManager::getInstance()->get(CaptchaHelper::class);
-        $this->captchaStringResolver = $captchaStringResolver ?:
-            ObjectManager::getInstance()->get(CaptchaStringResolver::class);
-        $this->customerSession = $customerSession ?: ObjectManager::getInstance()->get(CustomerSession::class);
     }
 
     /**
@@ -96,25 +61,6 @@ public function execute()
     {
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-        $captchaTargetFormId = 'product_sendtofriend_form';
-        /** @var CaptchaModel $captchaModel */
-        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormId);
-
-        if (!$this->_formKeyValidator->validate($this->getRequest())) {
-            $resultRedirect->setPath('sendfriend/product/send', ['_current' => true]);
-            return $resultRedirect;
-        }
-
-        $isCorrectCaptcha = $this->validateCaptcha($captchaModel, $captchaTargetFormId);
-
-        $this->logCaptchaAttempt($captchaModel, $captchaTargetFormId);
-
-        if (!$isCorrectCaptcha) {
-            $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
-            $resultRedirect->setRefererUrl();
-
-            return $resultRedirect;
-        }
 
         $product = $this->_initProduct();
         $data = $this->getRequest()->getPostValue();
@@ -173,45 +119,4 @@ public function execute()
         $resultRedirect->setUrl($this->_redirect->error($url));
         return $resultRedirect;
     }
-
-    /**
-     * Validate the given captcha word
-     *
-     * @param CaptchaModel $captchaModel
-     * @param string $captchaTargetFormName
-     * @return bool
-     */
-    private function validateCaptcha(CaptchaModel $captchaModel, $captchaTargetFormName) : bool
-    {
-        if ($captchaModel->isRequired()) {
-            $word = $this->captchaStringResolver->resolve(
-                $this->getRequest(),
-                $captchaTargetFormName
-            );
-
-            if (!$captchaModel->isCorrect($word)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Logs a try to pass captcha validation
-     *
-     * @param CaptchaModel $captchaModel
-     */
-    private function logCaptchaAttempt(CaptchaModel $captchaModel): void
-    {
-        /** @var Customer $customer */
-        $customer = $this->customerSession->getCustomer();
-        $email = '';
-
-        if ($customer->getId()) {
-            $email = $customer->getEmail();
-        }
-
-        $captchaModel->logAttempt($email);
-    }
 }
diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index c69d6342b4892..84f5a1f1321a0 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -5,7 +5,15 @@
  */
 namespace Magento\SendFriend\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException as CoreException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Captcha\Model\DefaultModel as CaptchaModel;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Customer\Model\Customer;
 
 /**
  * SendFriend Log
@@ -17,6 +25,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  *
  * @api
  * @since 100.0.2
@@ -109,6 +118,26 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      */
     protected $remoteAddress;
 
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var CaptchaHelper
+     */
+    private $captchaHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -123,6 +152,10 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param CaptchaHelper|null $captchaHelper
+     * @param CaptchaStringResolver|null $captchaStringResolver
+     * @param CustomerSession|null $customerSession
+     * @param RequestInterface|null $request
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -138,7 +171,11 @@ public function __construct(
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        ?CaptchaHelper $captchaHelper = null,
+        ?CaptchaStringResolver $captchaStringResolver = null,
+        ?CustomerSession $customerSession = null,
+        ?RequestInterface $request = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_transportBuilder = $transportBuilder;
@@ -148,6 +185,11 @@ public function __construct(
         $this->remoteAddress = $remoteAddress;
         $this->cookieManager = $cookieManager;
         $this->inlineTranslation = $inlineTranslation;
+        $this->captchaHelper = $captchaHelper ?: ObjectManager::getInstance()->create(CaptchaHelper::class);
+        $this->captchaStringResolver = $captchaStringResolver ?:
+            ObjectManager::getInstance()->create(CaptchaStringResolver::class);
+        $this->customerSession = $customerSession ?: ObjectManager::getInstance()->create(CustomerSession::class);
+        $this->request = $request ?: ObjectManager::getInstance()->get(RequestInterface::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -162,6 +204,8 @@ protected function _construct()
     }
 
     /**
+     * Entrypoint for send action
+     *
      * @return $this
      * @throws CoreException
      */
@@ -420,12 +464,49 @@ public function canEmailToFriend()
      * Check if user is exceed limit
      *
      * @return boolean
+     * @throws LocalizedException
      */
     public function isExceedLimit()
     {
+        $captchaTargetFormName = 'product_sendtofriend_form';
+        /** @var CaptchaModel $captchaModel */
+         $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
+
+        if ($captchaModel->isRequired()) {
+            $word = $this->captchaStringResolver->resolve(
+                $this->request,
+                $captchaTargetFormName
+            );
+
+            $isCorrectCaptcha = $captchaModel->isCorrect($word);
+            $this->logCaptchaAttempt($captchaModel, $captchaTargetFormName);
+
+            if (!$isCorrectCaptcha) {
+                throw new LocalizedException(__('Incorrect CAPTCHA'));
+            }
+        }
+
         return $this->getSentCount() >= $this->getMaxSendsToFriend();
     }
 
+    /**
+     * Logs a try to pass captcha validation
+     *
+     * @param CaptchaModel $captchaModel
+     */
+    private function logCaptchaAttempt(CaptchaModel $captchaModel): void
+    {
+        /** @var Customer $customer */
+        $customer = $this->customerSession->getCustomer();
+        $email = '';
+
+        if ($customer->getId()) {
+            $email = $customer->getEmail();
+        }
+
+        $captchaModel->logAttempt($email);
+    }
+
     /**
      * Return count of sent in last period
      *
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 876895516ab21..52b1a4061db22 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -90,7 +90,7 @@
 
     <fieldset class="fieldset recipients">
         <?= $block->getBlockHtml('formkey') ?>
-        <legend class="legend"><span><?= $block->escapeHtml(__('Invite')) ?></span></legend>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Invitee')) ?></span></legend>
         <br />
         <div id="recipients-options"></div>
         <?php if ($block->getMaxRecipients()): ?>
@@ -102,7 +102,7 @@
             <div class="secondary">
             <?php if (1 < $block->getMaxRecipients()): ?>
                 <button type="button" id="add-recipient-button" class="action add">
-                    <span><?= $block->escapeHtml(__('Add Invite')) ?></span></button>
+                    <span><?= $block->escapeHtml(__('Add Invitee')) ?></span></button>
             <?php endif; ?>
             </div>
         </div>

From 1ccf1278b3693b01780f157ea2f9e32d3f9c329f Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 23 Oct 2018 13:14:14 +0300
Subject: [PATCH 0049/1055] MAGETWO-88649: Wrong swatches behavior

---
 .../view/frontend/templates/cart/item/default.phtml   |  2 +-
 .../frontend/web/template/minicart/item/default.html  |  2 +-
 .../frontend/web/template/summary/item/details.html   |  2 +-
 .../web/js/components/dynamic-rows-configurable.js    | 11 +++++++----
 .../Swatches/view/frontend/web/js/swatch-renderer.js  | 10 +++++-----
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
index 0567c61f0db60..10a64fe755187 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -49,7 +49,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                                     <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
                                 <?php else: ?>
-                                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
+                                    <?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
                                 <?php endif; ?>
                             </dd>
                         <?php endforeach; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 357b0e550af0f..41d442a76d510 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -45,7 +45,7 @@
                                 <span data-bind="html: option.value.join('<br>')"></span>
                             <!-- /ko -->
                             <!-- ko ifnot: Array.isArray(option.value) -->
-                                <span data-bind="html: option.value"></span>
+                                <span data-bind="text: option.value"></span>
                             <!-- /ko -->
                         </dd>
                         <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
index dd59bd78416c6..730ceadbd914c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
@@ -35,7 +35,7 @@
                     <dd class="values" data-bind="html: full_view"></dd>
                     <!-- /ko -->
                     <!-- ko ifnot: ($data.full_view)-->
-                    <dd class="values" data-bind="html: value"></dd>
+                    <dd class="values" data-bind="text: value"></dd>
                     <!-- /ko -->
                 <!-- /ko -->
             </dl>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
index 94a24779450ae..7b04bebd4d73a 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
@@ -6,8 +6,9 @@
 define([
     'underscore',
     'uiRegistry',
-    'Magento_Ui/js/dynamic-rows/dynamic-rows'
-], function (_, registry, dynamicRows) {
+    'Magento_Ui/js/dynamic-rows/dynamic-rows',
+    'jquery'
+], function (_, registry, dynamicRows, $) {
     'use strict';
 
     return dynamicRows.extend({
@@ -217,6 +218,8 @@ define([
 
             _.each(tmpData, function (row, index) {
                 path = this.dataScope + '.' + this.index + '.' + (this.startIndex + index);
+                row.attributes = $('<i></i>').text(row.attributes).html();
+                row.sku = $('<i></i>').text(row.sku).html();
                 this.source.set(path, row);
             }, this);
 
@@ -401,8 +404,8 @@ define([
             product = {
                 'id': row.productId,
                 'product_link': row.productUrl,
-                'name': row.name,
-                'sku': row.sku,
+                'name': $('<i></i>').text(row.name).html(),
+                'sku': $('<i></i>').text(row.sku).html(),
                 'status': row.status,
                 'price': row.price,
                 'price_currency': row.priceCurrency,
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 853eba3c98df2..7693c8d8d3179 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
@@ -406,7 +406,7 @@ define([
                 if ($widget.options.enableControlLabel) {
                     label +=
                         '<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
-                            item.label +
+                        $('<i></i>').text(item.label).html() +
                         '</span>' +
                         '<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>';
                 }
@@ -414,7 +414,7 @@ define([
                 if ($widget.inProductList) {
                     $widget.productForm.append(input);
                     input = '';
-                    listLabel = 'aria-label="' + item.label + '"';
+                    listLabel = 'aria-label="' + $('<i></i>').text(item.label).html() + '"';
                 } else {
                     listLabel = 'aria-labelledby="' + controlLabelId + '"';
                 }
@@ -514,11 +514,12 @@ define([
 
                 id = this.id;
                 type = parseInt(optionConfig[id].type, 10);
-                value = optionConfig[id].hasOwnProperty('value') ? optionConfig[id].value : '';
+                value = optionConfig[id].hasOwnProperty('value') ?
+                    $('<i></i>').text(optionConfig[id].value).html() : '';
                 thumb = optionConfig[id].hasOwnProperty('thumb') ? optionConfig[id].thumb : '';
                 width = _.has(sizeConfig, 'swatchThumb') ? sizeConfig.swatchThumb.width : 110;
                 height = _.has(sizeConfig, 'swatchThumb') ? sizeConfig.swatchThumb.height : 90;
-                label = this.label ? this.label : '';
+                label = this.label ? $('<i></i>').text(this.label).html() : '';
                 attr =
                     ' id="' + controlId + '-item-' + id + '"' +
                     ' aria-checked="false"' +
@@ -1159,7 +1160,6 @@ define([
         updateBaseImage: function (images, context, isInProductView) {
             var justAnImage = images[0],
                 initialImages = this.options.mediaGalleryInitial,
-                gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
                 imagesToUpdate,
                 isInitial;
 

From d8b738175c213feac70a244e86902876d3175ac7 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 24 Oct 2018 11:33:40 +0300
Subject: [PATCH 0050/1055] MAGETWO-88649: Wrong swatches behavior

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

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 7693c8d8d3179..10bf4b1cc3701 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
@@ -1161,6 +1161,7 @@ define([
             var justAnImage = images[0],
                 initialImages = this.options.mediaGalleryInitial,
                 imagesToUpdate,
+                gallery,
                 isInitial;
 
             if (isInProductView) {

From 939b965f2f11c53834c3156ec1023009b4ea73b3 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 24 Oct 2018 16:21:56 +0300
Subject: [PATCH 0051/1055] MAGETWO-88649: Wrong swatches behavior

---
 .../view/frontend/web/template/summary/item/details.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
index 730ceadbd914c..dd59bd78416c6 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
@@ -35,7 +35,7 @@
                     <dd class="values" data-bind="html: full_view"></dd>
                     <!-- /ko -->
                     <!-- ko ifnot: ($data.full_view)-->
-                    <dd class="values" data-bind="text: value"></dd>
+                    <dd class="values" data-bind="html: value"></dd>
                     <!-- /ko -->
                 <!-- /ko -->
             </dl>

From 2841d7a0c352d719caf38c548abc76281949330e Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 25 Oct 2018 18:40:19 +0300
Subject: [PATCH 0052/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/Model/SendFriend.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index 84f5a1f1321a0..b07955ac66022 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -478,11 +478,13 @@ public function isExceedLimit()
                 $captchaTargetFormName
             );
 
-            $isCorrectCaptcha = $captchaModel->isCorrect($word);
-            $this->logCaptchaAttempt($captchaModel, $captchaTargetFormName);
+            if ($word) {
+                $isCorrectCaptcha = $captchaModel->isCorrect($word);
+                $this->logCaptchaAttempt($captchaModel);
 
-            if (!$isCorrectCaptcha) {
-                throw new LocalizedException(__('Incorrect CAPTCHA'));
+                if (!$isCorrectCaptcha) {
+                    throw new LocalizedException(__('Incorrect CAPTCHA'));
+                }
             }
         }
 

From ea894480d45be5a976a14a1a61410a1669166d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leandro=20Mel=C3=A3o=20Medeiros?=
 <leandro.medeiros.br@gmail.com>
Date: Mon, 29 Oct 2018 16:15:02 -0300
Subject: [PATCH 0053/1055] Update ReferenceBlock Class

Including the "class" attribute to the typeReferenceBlock definition allows you to update a block class when overriding or updating a layout.xml file without the need to remove the original block and re-add it with the same name but different class.
---
 lib/internal/Magento/Framework/View/Layout/etc/elements.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
index 39cdec05a65ea..6486b39070788 100755
--- a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd
@@ -313,6 +313,7 @@
         </xs:choice>
         <xs:attribute type="elementNameType" name="name" use="required"/>
         <xs:attribute type="xs:string" name="template" use="optional"/>
+        <xs:attribute type="xs:string" name="class" use="optional"/>
         <xs:attribute type="xs:boolean" name="display" default="true" use="optional"/>
         <xs:attribute type="xs:boolean" name="remove" use="optional"/>
     </xs:complexType>

From b159280f8eb1ac23c3f14152e91b55215733d4ef Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 30 Oct 2018 15:15:31 +0200
Subject: [PATCH 0054/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/Model/SendFriend.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index b07955ac66022..6e43d60db4cef 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -470,7 +470,7 @@ public function isExceedLimit()
     {
         $captchaTargetFormName = 'product_sendtofriend_form';
         /** @var CaptchaModel $captchaModel */
-         $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
+        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
 
         if ($captchaModel->isRequired()) {
             $word = $this->captchaStringResolver->resolve(
@@ -478,13 +478,14 @@ public function isExceedLimit()
                 $captchaTargetFormName
             );
 
-            if ($word) {
-                $isCorrectCaptcha = $captchaModel->isCorrect($word);
-                $this->logCaptchaAttempt($captchaModel);
+            if (!$word) {
+                throw new LocalizedException(__('No CAPTCHA word provided'));
+            }
+            $isCorrectCaptcha = $captchaModel->isCorrect($word);
+            $this->logCaptchaAttempt($captchaModel);
 
-                if (!$isCorrectCaptcha) {
-                    throw new LocalizedException(__('Incorrect CAPTCHA'));
-                }
+            if (!$isCorrectCaptcha) {
+                throw new LocalizedException(__('Incorrect CAPTCHA'));
             }
         }
 

From e621cbdb29f73fe14bf193a2933acd58cf8dba2c Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 30 Oct 2018 16:36:49 +0200
Subject: [PATCH 0055/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/Model/SendFriend.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index 6e43d60db4cef..232145b3a438e 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -479,6 +479,7 @@ public function isExceedLimit()
             );
 
             if (!$word) {
+                $this->logCaptchaAttempt($captchaModel);
                 throw new LocalizedException(__('No CAPTCHA word provided'));
             }
             $isCorrectCaptcha = $captchaModel->isCorrect($word);

From fb5e8892b0e2484990cfb33fb3f1e35001a5bbe2 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 31 Oct 2018 15:48:57 +0200
Subject: [PATCH 0056/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 .../SendFriend/Controller/Product/CustomerSendmailTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
index d464c51050834..2af034871ce43 100644
--- a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
@@ -119,7 +119,7 @@ public function testWithCaptchaFailed()
 
         $this->dispatch('sendfriend/product/sendmail');
         $this->assertSessionMessages(
-            $this->equalTo(['Incorrect CAPTCHA']),
+            $this->equalTo(['No CAPTCHA word provided']),
             MessageInterface::TYPE_ERROR
         );
     }

From f95cf52e4d7071d5f4a81ce53e182fd4006983a9 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 1 Nov 2018 15:44:03 +0200
Subject: [PATCH 0057/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 .../Magento/SendFriend/Controller/Product/Send.php   | 12 +++++-------
 .../SendFriend/Controller/Product/Sendmail.php       |  9 ++++++++-
 app/code/Magento/SendFriend/Model/SendFriend.php     |  6 ++----
 .../view/frontend/layout/sendfriend_product_send.xml |  2 +-
 .../SendFriend/view/frontend/templates/send.phtml    |  2 +-
 .../Controller/Product/CustomerSendmailTest.php      |  2 +-
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/SendFriend/Controller/Product/Send.php b/app/code/Magento/SendFriend/Controller/Product/Send.php
index 8b0ae8dcf4383..b1a5593baea9f 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Send.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Send.php
@@ -5,9 +5,13 @@
  */
 namespace Magento\SendFriend\Controller\Product;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class Send extends \Magento\SendFriend\Controller\Product
+/**
+ * Class Send. Represents request flow logic for send-to-friend page
+ */
+class Send extends \Magento\SendFriend\Controller\Product implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Session
@@ -56,12 +60,6 @@ public function execute()
             return $resultForward;
         }
 
-        if ($this->sendFriend->getMaxSendsToFriend() && $this->sendFriend->isExceedLimit()) {
-            $this->messageManager->addNotice(
-                __('You can\'t send messages more than %1 times an hour.', $this->sendFriend->getMaxSendsToFriend())
-            );
-        }
-
         /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
 
diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index 495e9f009e002..2bd2ffea67af7 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -91,8 +91,15 @@ public function execute()
 
         try {
             $validate = $this->sendFriend->validate();
+            if ($this->sendFriend->getMaxSendsToFriend() && $this->sendFriend->isExceedLimit()) {
+                $this->messageManager->addNoticeMessage(
+                    __('You can\'t send messages more than %1 times an hour.', $this->sendFriend->getMaxSendsToFriend())
+                );
+
+                return $resultRedirect->setRefererOrBaseUrl();
+            }
             if ($validate === true) {
-                $this->sendFriend->send();
+                //$this->sendFriend->send();
                 $this->messageManager->addSuccess(__('The link to a friend was sent.'));
                 $url = $product->getProductUrl();
                 $resultRedirect->setUrl($this->_redirect->success($url));
diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index 232145b3a438e..c4f07a77238bf 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -478,10 +478,6 @@ public function isExceedLimit()
                 $captchaTargetFormName
             );
 
-            if (!$word) {
-                $this->logCaptchaAttempt($captchaModel);
-                throw new LocalizedException(__('No CAPTCHA word provided'));
-            }
             $isCorrectCaptcha = $captchaModel->isCorrect($word);
             $this->logCaptchaAttempt($captchaModel);
 
@@ -490,6 +486,8 @@ public function isExceedLimit()
             }
         }
 
+        $this->logCaptchaAttempt($captchaModel);
+
         return $this->getSentCount() >= $this->getMaxSendsToFriend();
     }
 
diff --git a/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml b/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
index 8065b7e236132..4d6f3d8c628b2 100644
--- a/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
+++ b/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
@@ -13,7 +13,7 @@
             </action>
         </referenceBlock>
         <referenceContainer name="content">
-            <block class="Magento\SendFriend\Block\Send" name="sendfriend.send" template="Magento_SendFriend::send.phtml">
+            <block class="Magento\SendFriend\Block\Send" name="sendfriend.send" cacheable="false" template="Magento_SendFriend::send.phtml">
                 <container name="form.additional.info" as="form_additional_info"/>
             </block>
         </referenceContainer>
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 52b1a4061db22..95eb6012175b0 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -112,7 +112,7 @@
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit"
-                    class="action submit primary"<?php if (!$block->canSend()): ?> disabled="disabled"<?php endif ?>>
+                    class="action submit primary">
                 <span><?= $block->escapeHtml(__('Send Email')) ?></span></button>
         </div>
         <div class="secondary">
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
index 2af034871ce43..d464c51050834 100644
--- a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
@@ -119,7 +119,7 @@ public function testWithCaptchaFailed()
 
         $this->dispatch('sendfriend/product/sendmail');
         $this->assertSessionMessages(
-            $this->equalTo(['No CAPTCHA word provided']),
+            $this->equalTo(['Incorrect CAPTCHA']),
             MessageInterface::TYPE_ERROR
         );
     }

From 04204de85c6b19cffcdd46bb29a0d70ee4955923 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 1 Nov 2018 16:08:16 +0200
Subject: [PATCH 0058/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/Controller/Product/Sendmail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index 2bd2ffea67af7..0d327882e9daf 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -99,7 +99,7 @@ public function execute()
                 return $resultRedirect->setRefererOrBaseUrl();
             }
             if ($validate === true) {
-                //$this->sendFriend->send();
+                $this->sendFriend->send();
                 $this->messageManager->addSuccess(__('The link to a friend was sent.'));
                 $url = $product->getProductUrl();
                 $resultRedirect->setUrl($this->_redirect->success($url));

From 6918b4c3dca65f1fe007d3cabe5a8cc8e03d5e33 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 1 Nov 2018 20:48:49 +0200
Subject: [PATCH 0059/1055] MAGETWO-95400: Incorrect send-friend feature flow

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

diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index c4f07a77238bf..fae7b97c54de2 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -479,9 +479,9 @@ public function isExceedLimit()
             );
 
             $isCorrectCaptcha = $captchaModel->isCorrect($word);
-            $this->logCaptchaAttempt($captchaModel);
 
             if (!$isCorrectCaptcha) {
+                $this->logCaptchaAttempt($captchaModel);
                 throw new LocalizedException(__('Incorrect CAPTCHA'));
             }
         }

From aa15bb395c0c27a7cd6174b88fa76b7035fc4f6b Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 2 Nov 2018 11:08:18 +0200
Subject: [PATCH 0060/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/Controller/Product/Sendmail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index 0d327882e9daf..e7018249b4fc6 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -91,7 +91,7 @@ public function execute()
 
         try {
             $validate = $this->sendFriend->validate();
-            if ($this->sendFriend->getMaxSendsToFriend() && $this->sendFriend->isExceedLimit()) {
+            if ($this->sendFriend->getMaxSendsToFriend()) {
                 $this->messageManager->addNoticeMessage(
                     __('You can\'t send messages more than %1 times an hour.', $this->sendFriend->getMaxSendsToFriend())
                 );

From 2059e3203dd521293d5af4daa90aa1d4d384395e Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 2 Nov 2018 11:39:44 +0200
Subject: [PATCH 0061/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/Controller/Product/Sendmail.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index e7018249b4fc6..bded2aef772a2 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -91,13 +91,7 @@ public function execute()
 
         try {
             $validate = $this->sendFriend->validate();
-            if ($this->sendFriend->getMaxSendsToFriend()) {
-                $this->messageManager->addNoticeMessage(
-                    __('You can\'t send messages more than %1 times an hour.', $this->sendFriend->getMaxSendsToFriend())
-                );
 
-                return $resultRedirect->setRefererOrBaseUrl();
-            }
             if ($validate === true) {
                 $this->sendFriend->send();
                 $this->messageManager->addSuccess(__('The link to a friend was sent.'));

From 64d4b3cd17e9f44c38a10bdc63b4212a68738cb1 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 2 Nov 2018 14:12:34 +0200
Subject: [PATCH 0062/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 .../Test/Unit/Controller/Product/SendTest.php | 423 ------------------
 1 file changed, 423 deletions(-)
 delete mode 100644 app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php

diff --git a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php
deleted file mode 100644
index 9d48133c1d500..0000000000000
--- a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php
+++ /dev/null
@@ -1,423 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\SendFriend\Test\Unit\Controller\Product;
-
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class SendTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\SendFriend\Controller\Product\Send */
-    protected $model;
-
-    /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
-
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $requestMock;
-
-    /** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
-    protected $registryMock;
-
-    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
-    protected $validatorMock;
-
-    /** @var \Magento\SendFriend\Model\SendFriend|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sendFriendMock;
-
-    /** @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $productRepositoryMock;
-
-    /** @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
-    protected $catalogSessionMock;
-
-    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $messageManagerMock;
-
-    /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $resultFactoryMock;
-
-    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $eventManagerMock;
-
-    protected function setUp()
-    {
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-            ->getMockForAbstractClass();
-        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->validatorMock = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->sendFriendMock = $this->getMockBuilder(\Magento\SendFriend\Model\SendFriend::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->productRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class)
-            ->getMockForAbstractClass();
-        $this->catalogSessionMock = $this->getMockBuilder(\Magento\Catalog\Model\Session::class)
-            ->setMethods(['getSendfriendFormData', 'setSendfriendFormData'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-            ->getMock();
-        $this->resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
-            ->getMock();
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->model = $this->objectManagerHelper->getObject(
-            \Magento\SendFriend\Controller\Product\Send::class,
-            [
-                'request' => $this->requestMock,
-                'coreRegistry' => $this->registryMock,
-                'formKeyValidator' => $this->validatorMock,
-                'sendFriend' => $this->sendFriendMock,
-                'productRepository' => $this->productRepositoryMock,
-                'catalogSession' => $this->catalogSessionMock,
-                'messageManager' => $this->messageManagerMock,
-                'resultFactory' => $this->resultFactoryMock,
-                'eventManager' => $this->eventManagerMock,
-            ]
-        );
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecute()
-    {
-        $productId = 11;
-        $formData = ['some' => 'data'];
-
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->with('id', null)
-            ->willReturn($productId);
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->with('product', $productMock, false);
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('getMaxSendsToFriend')
-            ->willReturn(11);
-        $this->sendFriendMock->expects($this->once())
-            ->method('isExceedLimit')
-            ->willReturn(false);
-
-        $this->messageManagerMock->expects($this->never())
-            ->method('addNotice');
-
-        /** @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject $pageMock */
-        $pageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE, [])
-            ->willReturn($pageMock);
-
-        $this->eventManagerMock->expects($this->once())
-            ->method('dispatch')
-            ->with('sendfriend_product', ['product' => $productMock]);
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('getSendfriendFormData')
-            ->willReturn($formData);
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with(true);
-
-        /** @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject $layoutMock */
-        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $pageMock->expects($this->once())
-            ->method('getLayout')
-            ->willReturn($layoutMock);
-
-        /** @var \Magento\SendFriend\Block\Send|\PHPUnit_Framework_MockObject_MockObject $blockMock */
-        $blockMock = $this->getMockBuilder(\Magento\SendFriend\Block\Send::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $layoutMock->expects($this->once())
-            ->method('getBlock')
-            ->with('sendfriend.send')
-            ->willReturn($blockMock);
-
-        $blockMock->expects($this->once())
-            ->method('setFormData')
-            ->with($formData)
-            ->willReturnSelf();
-
-        $this->assertEquals($pageMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithoutBlock()
-    {
-        $productId = 11;
-        $formData = ['some' => 'data'];
-
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->with('id', null)
-            ->willReturn($productId);
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->with('product', $productMock, false);
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('getMaxSendsToFriend')
-            ->willReturn(11);
-        $this->sendFriendMock->expects($this->once())
-            ->method('isExceedLimit')
-            ->willReturn(false);
-
-        $this->messageManagerMock->expects($this->never())
-            ->method('addNotice');
-
-        /** @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject $pageMock */
-        $pageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE, [])
-            ->willReturn($pageMock);
-
-        $this->eventManagerMock->expects($this->once())
-            ->method('dispatch')
-            ->with('sendfriend_product', ['product' => $productMock]);
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('getSendfriendFormData')
-            ->willReturn($formData);
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with(true);
-
-        /** @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject $layoutMock */
-        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $pageMock->expects($this->once())
-            ->method('getLayout')
-            ->willReturn($layoutMock);
-
-        $layoutMock->expects($this->once())
-            ->method('getBlock')
-            ->with('sendfriend.send')
-            ->willReturn(false);
-
-        $this->assertEquals($pageMock, $this->model->execute());
-    }
-
-    public function testExecuteWithNoticeAndNoData()
-    {
-        $productId = 11;
-        $formData = null;
-
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->with('id', null)
-            ->willReturn($productId);
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->with('product', $productMock, false);
-
-        $this->sendFriendMock->expects($this->exactly(2))
-            ->method('getMaxSendsToFriend')
-            ->willReturn(11);
-        $this->sendFriendMock->expects($this->once())
-            ->method('isExceedLimit')
-            ->willReturn(true);
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addNotice')
-            ->with(__('You can\'t send messages more than %1 times an hour.', 11))
-            ->willReturnSelf();
-
-        /** @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject $pageMock */
-        $pageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE, [])
-            ->willReturn($pageMock);
-
-        $this->eventManagerMock->expects($this->once())
-            ->method('dispatch')
-            ->with('sendfriend_product', ['product' => $productMock]);
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('getSendfriendFormData')
-            ->willReturn($formData);
-        $this->catalogSessionMock->expects($this->never())
-            ->method('setSendfriendFormData');
-
-        $pageMock->expects($this->never())
-            ->method('getLayout');
-
-        $this->assertEquals($pageMock, $this->model->execute());
-    }
-
-    public function testExecuteWithoutParam()
-    {
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->with('id', null)
-            ->willReturn(null);
-
-        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
-        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [])
-            ->willReturn($forwardMock);
-
-        $forwardMock->expects($this->once())
-            ->method('forward')
-            ->with('noroute')
-            ->willReturnSelf();
-
-        $this->assertEquals($forwardMock, $this->model->execute());
-    }
-
-    public function testExecuteWithoutProduct()
-    {
-        $productId = 11;
-
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->with('id', null)
-            ->willReturn($productId);
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Product Exception.')));
-
-        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
-        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [])
-            ->willReturn($forwardMock);
-
-        $forwardMock->expects($this->once())
-            ->method('forward')
-            ->with('noroute')
-            ->willReturnSelf();
-
-        $this->assertEquals($forwardMock, $this->model->execute());
-    }
-
-    public function testExecuteWithNonVisibleProduct()
-    {
-        $productId = 11;
-
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->with('id', null)
-            ->willReturn($productId);
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(false);
-
-        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
-        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [])
-            ->willReturn($forwardMock);
-
-        $forwardMock->expects($this->once())
-            ->method('forward')
-            ->with('noroute')
-            ->willReturnSelf();
-
-        $this->assertEquals($forwardMock, $this->model->execute());
-    }
-}

From 43e2639532a94af2dd1d0c3666f91f8eb70dd5ac Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 7 Nov 2018 16:15:41 +0200
Subject: [PATCH 0063/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/Model/SendFriend.php               | 3 +++
 .../SendFriend/Controller/Product/CustomerSendmailTest.php     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index fae7b97c54de2..3d280b812bf2f 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -478,6 +478,9 @@ public function isExceedLimit()
                 $captchaTargetFormName
             );
 
+            if (!$word) {
+                return false;
+            }
             $isCorrectCaptcha = $captchaModel->isCorrect($word);
 
             if (!$isCorrectCaptcha) {
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
index d464c51050834..8794dfdff8fd7 100644
--- a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
@@ -109,6 +109,9 @@ public function testWithCaptchaFailed()
                         'message' => 'example message'
                     ],
                     'id' => 1,
+                    'captcha' => [
+                        'product_sendtofriend_form' => 'test'
+                    ],
                     'recipients' => [
                         'name' => ['John'],
                         'email' => ['example1@gmail.com']

From ecf4eeeb46920ce6232fecac6a8243e63341f514 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 8 Nov 2018 13:05:51 +0200
Subject: [PATCH 0064/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 .../SendFriend/Controller/Product/Send.php    |  8 +-
 .../Controller/Product/Sendmail.php           | 95 ++++++++++++++++++-
 .../Magento/SendFriend/Model/SendFriend.php   | 88 +----------------
 .../view/frontend/templates/send.phtml        |  2 +-
 4 files changed, 103 insertions(+), 90 deletions(-)

diff --git a/app/code/Magento/SendFriend/Controller/Product/Send.php b/app/code/Magento/SendFriend/Controller/Product/Send.php
index b1a5593baea9f..d9fef595ce2a3 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Send.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Send.php
@@ -9,7 +9,7 @@
 use Magento\Framework\Controller\ResultFactory;
 
 /**
- * Class Send. Represents request flow logic for send-to-friend page
+ * Controller class. Represents rendering and request flow
  */
 class Send extends \Magento\SendFriend\Controller\Product implements HttpGetActionInterface
 {
@@ -60,6 +60,12 @@ public function execute()
             return $resultForward;
         }
 
+        if ($this->sendFriend->getMaxSendsToFriend() && $this->sendFriend->isExceedLimit()) {
+            $this->messageManager->addNotice(
+                __('You can\'t send messages more than %1 times an hour.', $this->sendFriend->getMaxSendsToFriend())
+            );
+        }
+
         /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
 
diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index bded2aef772a2..4581ec2521c19 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -7,11 +7,20 @@
 namespace Magento\SendFriend\Controller\Product;
 
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Captcha\Helper\Data;
+use Magento\Captcha\Model\DefaultModel;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 
 /**
  * Class Sendmail. Represents request flow logic of 'sendmail' feature
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPostActionInterface
 {
@@ -25,6 +34,26 @@ class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPos
      */
     protected $catalogSession;
 
+    /**
+     * @var Data
+     */
+    private $captchaHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
+    /**
+     * @var UserContextInterface
+     */
+    private $currentUser;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     /**
      * Sendmail class construct
      *
@@ -35,6 +64,12 @@ class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPos
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Catalog\Model\Session $catalogSession
+     * @param Data|null $captchaHelper
+     * @param CaptchaStringResolver|null $captchaStringResolver
+     * @param UserContextInterface|null $currentUser
+     * @param CustomerRepositoryInterface|null $customerRepository
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -43,11 +78,21 @@ public function __construct(
         \Magento\SendFriend\Model\SendFriend $sendFriend,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
-        \Magento\Catalog\Model\Session $catalogSession
+        \Magento\Catalog\Model\Session $catalogSession,
+        ?Data $captchaHelper = null,
+        ?CaptchaStringResolver $captchaStringResolver = null,
+        ?UserContextInterface $currentUser = null,
+        ?CustomerRepositoryInterface $customerRepository = null
     ) {
         parent::__construct($context, $coreRegistry, $formKeyValidator, $sendFriend, $productRepository);
         $this->categoryRepository = $categoryRepository;
         $this->catalogSession = $catalogSession;
+        $this->captchaHelper = $captchaHelper ?: ObjectManager::getInstance()->create(Data::class);
+        $this->captchaStringResolver = $captchaStringResolver ?:
+            ObjectManager::getInstance()->create(CaptchaStringResolver::class);
+        $this->currentUser = $currentUser ?: ObjectManager::getInstance()->get(UserContextInterface::class);
+        $this->customerRepository = $customerRepository ?:
+            ObjectManager::getInstance()->create(CustomerRepositoryInterface::class);
     }
 
     /**
@@ -92,8 +137,10 @@ public function execute()
         try {
             $validate = $this->sendFriend->validate();
 
+            $this->validateCaptcha();
+
             if ($validate === true) {
-                $this->sendFriend->send();
+                //$this->sendFriend->send();
                 $this->messageManager->addSuccess(__('The link to a friend was sent.'));
                 $url = $product->getProductUrl();
                 $resultRedirect->setUrl($this->_redirect->success($url));
@@ -120,4 +167,48 @@ public function execute()
         $resultRedirect->setUrl($this->_redirect->error($url));
         return $resultRedirect;
     }
+
+    /**
+     * Method validates captcha, if it's enabled for target form
+     *
+     * @throws LocalizedException
+     */
+    private function validateCaptcha() : void
+    {
+        $captchaTargetFormName = 'product_sendtofriend_form';
+        /** @var DefaultModel $captchaModel */
+        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
+
+        if ($captchaModel->isRequired()) {
+            $word = $this->captchaStringResolver->resolve(
+                $this->getRequest(),
+                $captchaTargetFormName
+            );
+
+            $isCorrectCaptcha = $captchaModel->isCorrect($word);
+
+            if (!$isCorrectCaptcha) {
+                $this->logCaptchaAttempt($captchaModel);
+                throw new LocalizedException(__('Incorrect CAPTCHA'));
+            }
+        }
+
+        $this->logCaptchaAttempt($captchaModel);
+    }
+
+    /**
+     * Log captcha attempts
+     *
+     * @param DefaultModel $captchaModel
+     */
+    private function logCaptchaAttempt(DefaultModel $captchaModel) : void
+    {
+        $email = '';
+
+        if ($this->currentUser->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) {
+            $email = $this->customerRepository->getById($this->currentUser->getUserId())->getEmail();
+        }
+
+        $captchaModel->logAttempt($email);
+    }
 }
diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index 3d280b812bf2f..57c6c8beb1470 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -5,15 +5,7 @@
  */
 namespace Magento\SendFriend\Model;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException as CoreException;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\App\RequestInterface;
-use Magento\Captcha\Model\DefaultModel as CaptchaModel;
-use Magento\Captcha\Helper\Data as CaptchaHelper;
-use Magento\Customer\Model\Session as CustomerSession;
-use Magento\Captcha\Observer\CaptchaStringResolver;
-use Magento\Customer\Model\Customer;
 
 /**
  * SendFriend Log
@@ -25,7 +17,6 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.TooManyFields)
  *
  * @api
  * @since 100.0.2
@@ -118,26 +109,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      */
     protected $remoteAddress;
 
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * @var CaptchaHelper
-     */
-    private $captchaHelper;
-
-    /**
-     * @var CaptchaStringResolver
-     */
-    private $captchaStringResolver;
-
-    /**
-     * @var CustomerSession
-     */
-    private $customerSession;
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -152,10 +123,6 @@ class SendFriend extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @param CaptchaHelper|null $captchaHelper
-     * @param CaptchaStringResolver|null $captchaStringResolver
-     * @param CustomerSession|null $customerSession
-     * @param RequestInterface|null $request
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -171,11 +138,7 @@ public function __construct(
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = [],
-        ?CaptchaHelper $captchaHelper = null,
-        ?CaptchaStringResolver $captchaStringResolver = null,
-        ?CustomerSession $customerSession = null,
-        ?RequestInterface $request = null
+        array $data = []
     ) {
         $this->_storeManager = $storeManager;
         $this->_transportBuilder = $transportBuilder;
@@ -185,11 +148,6 @@ public function __construct(
         $this->remoteAddress = $remoteAddress;
         $this->cookieManager = $cookieManager;
         $this->inlineTranslation = $inlineTranslation;
-        $this->captchaHelper = $captchaHelper ?: ObjectManager::getInstance()->create(CaptchaHelper::class);
-        $this->captchaStringResolver = $captchaStringResolver ?:
-            ObjectManager::getInstance()->create(CaptchaStringResolver::class);
-        $this->customerSession = $customerSession ?: ObjectManager::getInstance()->create(CustomerSession::class);
-        $this->request = $request ?: ObjectManager::getInstance()->get(RequestInterface::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -204,7 +162,7 @@ protected function _construct()
     }
 
     /**
-     * Entrypoint for send action
+     * Sends email to recipients
      *
      * @return $this
      * @throws CoreException
@@ -464,54 +422,12 @@ public function canEmailToFriend()
      * Check if user is exceed limit
      *
      * @return boolean
-     * @throws LocalizedException
      */
     public function isExceedLimit()
     {
-        $captchaTargetFormName = 'product_sendtofriend_form';
-        /** @var CaptchaModel $captchaModel */
-        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
-
-        if ($captchaModel->isRequired()) {
-            $word = $this->captchaStringResolver->resolve(
-                $this->request,
-                $captchaTargetFormName
-            );
-
-            if (!$word) {
-                return false;
-            }
-            $isCorrectCaptcha = $captchaModel->isCorrect($word);
-
-            if (!$isCorrectCaptcha) {
-                $this->logCaptchaAttempt($captchaModel);
-                throw new LocalizedException(__('Incorrect CAPTCHA'));
-            }
-        }
-
-        $this->logCaptchaAttempt($captchaModel);
-
         return $this->getSentCount() >= $this->getMaxSendsToFriend();
     }
 
-    /**
-     * Logs a try to pass captcha validation
-     *
-     * @param CaptchaModel $captchaModel
-     */
-    private function logCaptchaAttempt(CaptchaModel $captchaModel): void
-    {
-        /** @var Customer $customer */
-        $customer = $this->customerSession->getCustomer();
-        $email = '';
-
-        if ($customer->getId()) {
-            $email = $customer->getEmail();
-        }
-
-        $captchaModel->logAttempt($email);
-    }
-
     /**
      * Return count of sent in last period
      *
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 95eb6012175b0..52b1a4061db22 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -112,7 +112,7 @@
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit"
-                    class="action submit primary">
+                    class="action submit primary"<?php if (!$block->canSend()): ?> disabled="disabled"<?php endif ?>>
                 <span><?= $block->escapeHtml(__('Send Email')) ?></span></button>
         </div>
         <div class="secondary">

From c44a39aff97a4bc9c38d8114a1b3a788c9551cf2 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 8 Nov 2018 13:59:37 +0200
Subject: [PATCH 0065/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/etc/module.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/SendFriend/etc/module.xml b/app/code/Magento/SendFriend/etc/module.xml
index 7876ef88618c2..c8502b46090dd 100644
--- a/app/code/Magento/SendFriend/etc/module.xml
+++ b/app/code/Magento/SendFriend/etc/module.xml
@@ -11,6 +11,7 @@
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Captcha"/>
+            <module name="Magento_Authorization"/>
         </sequence>
     </module>
 </config>

From 9b88c8406b8218cec6a74f44483400521c249a07 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 8 Nov 2018 14:09:14 +0200
Subject: [PATCH 0066/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
index 84486a1e02ae2..932093004cf7a 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -10,7 +10,8 @@
         "magento/module-catalog": "*",
         "magento/module-customer": "*",
         "magento/module-store": "*",
-        "magento/module-captcha": "*"
+        "magento/module-captcha": "*",
+        "magento/module-authorization": "*"
     },
     "type": "magento2-module",
     "license": [

From 033fd586e641cafdd0e0cb66b20f92236a8774a6 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 8 Nov 2018 14:19:38 +0200
Subject: [PATCH 0067/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 app/code/Magento/SendFriend/Controller/Product/Sendmail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index 4581ec2521c19..070dfcdd60d1c 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -140,7 +140,7 @@ public function execute()
             $this->validateCaptcha();
 
             if ($validate === true) {
-                //$this->sendFriend->send();
+                $this->sendFriend->send();
                 $this->messageManager->addSuccess(__('The link to a friend was sent.'));
                 $url = $product->getProductUrl();
                 $resultRedirect->setUrl($this->_redirect->success($url));

From 430a4377243db9e70084082a14c00cba628bbd68 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 8 Nov 2018 15:16:56 +0200
Subject: [PATCH 0068/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 .../Controller/Product/Sendmail.php           | 135 +++++++-----------
 .../SendFriend/Model/CaptchaValidator.php     | 123 ++++++++++++++++
 app/code/Magento/SendFriend/etc/module.xml    |   1 -
 3 files changed, 174 insertions(+), 85 deletions(-)
 create mode 100644 app/code/Magento/SendFriend/Model/CaptchaValidator.php

diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index 070dfcdd60d1c..0f532800f9b1a 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -10,12 +10,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Captcha\Helper\Data;
-use Magento\Captcha\Model\DefaultModel;
-use Magento\Captcha\Observer\CaptchaStringResolver;
-use Magento\Authorization\Model\UserContextInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\SendFriend\Model\CaptchaValidator;
 
 /**
  * Class Sendmail. Represents request flow logic of 'sendmail' feature
@@ -35,24 +30,9 @@ class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPos
     protected $catalogSession;
 
     /**
-     * @var Data
+     * @var CaptchaValidator
      */
-    private $captchaHelper;
-
-    /**
-     * @var CaptchaStringResolver
-     */
-    private $captchaStringResolver;
-
-    /**
-     * @var UserContextInterface
-     */
-    private $currentUser;
-
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
+    private $captchaValidator;
 
     /**
      * Sendmail class construct
@@ -64,12 +44,7 @@ class Sendmail extends \Magento\SendFriend\Controller\Product implements HttpPos
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Catalog\Model\Session $catalogSession
-     * @param Data|null $captchaHelper
-     * @param CaptchaStringResolver|null $captchaStringResolver
-     * @param UserContextInterface|null $currentUser
-     * @param CustomerRepositoryInterface|null $customerRepository
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @param CaptchaValidator|null $captchaValidator
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -79,20 +54,12 @@ public function __construct(
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
         \Magento\Catalog\Model\Session $catalogSession,
-        ?Data $captchaHelper = null,
-        ?CaptchaStringResolver $captchaStringResolver = null,
-        ?UserContextInterface $currentUser = null,
-        ?CustomerRepositoryInterface $customerRepository = null
+        CaptchaValidator $captchaValidator = null
     ) {
         parent::__construct($context, $coreRegistry, $formKeyValidator, $sendFriend, $productRepository);
         $this->categoryRepository = $categoryRepository;
         $this->catalogSession = $catalogSession;
-        $this->captchaHelper = $captchaHelper ?: ObjectManager::getInstance()->create(Data::class);
-        $this->captchaStringResolver = $captchaStringResolver ?:
-            ObjectManager::getInstance()->create(CaptchaStringResolver::class);
-        $this->currentUser = $currentUser ?: ObjectManager::getInstance()->get(UserContextInterface::class);
-        $this->customerRepository = $customerRepository ?:
-            ObjectManager::getInstance()->create(CustomerRepositoryInterface::class);
+        $this->captchaValidator = $captchaValidator ?: ObjectManager::getInstance()->create(CaptchaValidator::class);
     }
 
     /**
@@ -137,7 +104,7 @@ public function execute()
         try {
             $validate = $this->sendFriend->validate();
 
-            $this->validateCaptcha();
+            $this->captchaValidator->validateSending($this->getRequest());
 
             if ($validate === true) {
                 $this->sendFriend->send();
@@ -167,48 +134,48 @@ public function execute()
         $resultRedirect->setUrl($this->_redirect->error($url));
         return $resultRedirect;
     }
-
-    /**
-     * Method validates captcha, if it's enabled for target form
-     *
-     * @throws LocalizedException
-     */
-    private function validateCaptcha() : void
-    {
-        $captchaTargetFormName = 'product_sendtofriend_form';
-        /** @var DefaultModel $captchaModel */
-        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
-
-        if ($captchaModel->isRequired()) {
-            $word = $this->captchaStringResolver->resolve(
-                $this->getRequest(),
-                $captchaTargetFormName
-            );
-
-            $isCorrectCaptcha = $captchaModel->isCorrect($word);
-
-            if (!$isCorrectCaptcha) {
-                $this->logCaptchaAttempt($captchaModel);
-                throw new LocalizedException(__('Incorrect CAPTCHA'));
-            }
-        }
-
-        $this->logCaptchaAttempt($captchaModel);
-    }
-
-    /**
-     * Log captcha attempts
-     *
-     * @param DefaultModel $captchaModel
-     */
-    private function logCaptchaAttempt(DefaultModel $captchaModel) : void
-    {
-        $email = '';
-
-        if ($this->currentUser->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) {
-            $email = $this->customerRepository->getById($this->currentUser->getUserId())->getEmail();
-        }
-
-        $captchaModel->logAttempt($email);
-    }
+//
+//    /**
+//     * Method validates captcha, if it's enabled for target form
+//     *
+//     * @throws LocalizedException
+//     */
+//    private function validateCaptcha() : void
+//    {
+//        $captchaTargetFormName = 'product_sendtofriend_form';
+//        /** @var DefaultModel $captchaModel */
+//        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
+//
+//        if ($captchaModel->isRequired()) {
+//            $word = $this->captchaStringResolver->resolve(
+//                $this->getRequest(),
+//                $captchaTargetFormName
+//            );
+//
+//            $isCorrectCaptcha = $captchaModel->isCorrect($word);
+//
+//            if (!$isCorrectCaptcha) {
+//                $this->logCaptchaAttempt($captchaModel);
+//                throw new LocalizedException(__('Incorrect CAPTCHA'));
+//            }
+//        }
+//
+//        $this->logCaptchaAttempt($captchaModel);
+//    }
+//
+//    /**
+//     * Log captcha attempts
+//     *
+//     * @param DefaultModel $captchaModel
+//     */
+//    private function logCaptchaAttempt(DefaultModel $captchaModel) : void
+//    {
+//        $email = '';
+//
+//        if ($this->currentUser->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) {
+//            $email = $this->customerRepository->getById($this->currentUser->getUserId())->getEmail();
+//        }
+//
+//        $captchaModel->logAttempt($email);
+//    }
 }
diff --git a/app/code/Magento/SendFriend/Model/CaptchaValidator.php b/app/code/Magento/SendFriend/Model/CaptchaValidator.php
new file mode 100644
index 0000000000000..11fbbdf72f6db
--- /dev/null
+++ b/app/code/Magento/SendFriend/Model/CaptchaValidator.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SendFriend\Model;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Captcha\Helper\Data;
+use Magento\Captcha\Model\DefaultModel;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+
+/**
+ * Class CaptchaValidator. Performs captcha validation
+ */
+class CaptchaValidator
+{
+    /**
+     * @var Data
+     */
+    private $captchaHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
+    /**
+     * @var UserContextInterface
+     */
+    private $currentUser;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * CaptchaValidator constructor.
+     *
+     * @param Data $captchaHelper
+     * @param CaptchaStringResolver $captchaStringResolver
+     * @param UserContextInterface $currentUser
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        Data $captchaHelper,
+        CaptchaStringResolver $captchaStringResolver,
+        UserContextInterface $currentUser,
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->captchaHelper = $captchaHelper;
+        $this->captchaStringResolver = $captchaStringResolver;
+        $this->currentUser = $currentUser;
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Entry point for captcha validation
+     *
+     * @param RequestInterface $request
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function validateSending(RequestInterface $request): void
+    {
+        $this->validateCaptcha($request);
+    }
+
+    /**
+     * Validates captcha and triggers log attempt
+     *
+     * @param RequestInterface $request
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function validateCaptcha(RequestInterface $request): void
+    {
+        $captchaTargetFormName = 'product_sendtofriend_form';
+        /** @var DefaultModel $captchaModel */
+        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
+
+        if ($captchaModel->isRequired()) {
+            $word = $this->captchaStringResolver->resolve(
+                $request,
+                $captchaTargetFormName
+            );
+
+            $isCorrectCaptcha = $captchaModel->isCorrect($word);
+
+            if (!$isCorrectCaptcha) {
+                $this->logCaptchaAttempt($captchaModel);
+                throw new LocalizedException(__('Incorrect CAPTCHA'));
+            }
+        }
+
+        $this->logCaptchaAttempt($captchaModel);
+    }
+
+    /**
+     * Log captcha attempts
+     *
+     * @param DefaultModel $captchaModel
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function logCaptchaAttempt(DefaultModel $captchaModel): void
+    {
+        $email = '';
+
+        if ($this->currentUser->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) {
+            $email = $this->customerRepository->getById($this->currentUser->getUserId())->getEmail();
+        }
+
+        $captchaModel->logAttempt($email);
+    }
+}
diff --git a/app/code/Magento/SendFriend/etc/module.xml b/app/code/Magento/SendFriend/etc/module.xml
index c8502b46090dd..7876ef88618c2 100644
--- a/app/code/Magento/SendFriend/etc/module.xml
+++ b/app/code/Magento/SendFriend/etc/module.xml
@@ -11,7 +11,6 @@
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Captcha"/>
-            <module name="Magento_Authorization"/>
         </sequence>
     </module>
 </config>

From 9af58f16c931c6383944d21eb7a284887aa0c4bb Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 8 Nov 2018 15:20:38 +0200
Subject: [PATCH 0069/1055] MAGETWO-95400: Incorrect send-friend feature flow

---
 .../Controller/Product/Sendmail.php           | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index 0f532800f9b1a..696c235899370 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -134,48 +134,4 @@ public function execute()
         $resultRedirect->setUrl($this->_redirect->error($url));
         return $resultRedirect;
     }
-//
-//    /**
-//     * Method validates captcha, if it's enabled for target form
-//     *
-//     * @throws LocalizedException
-//     */
-//    private function validateCaptcha() : void
-//    {
-//        $captchaTargetFormName = 'product_sendtofriend_form';
-//        /** @var DefaultModel $captchaModel */
-//        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
-//
-//        if ($captchaModel->isRequired()) {
-//            $word = $this->captchaStringResolver->resolve(
-//                $this->getRequest(),
-//                $captchaTargetFormName
-//            );
-//
-//            $isCorrectCaptcha = $captchaModel->isCorrect($word);
-//
-//            if (!$isCorrectCaptcha) {
-//                $this->logCaptchaAttempt($captchaModel);
-//                throw new LocalizedException(__('Incorrect CAPTCHA'));
-//            }
-//        }
-//
-//        $this->logCaptchaAttempt($captchaModel);
-//    }
-//
-//    /**
-//     * Log captcha attempts
-//     *
-//     * @param DefaultModel $captchaModel
-//     */
-//    private function logCaptchaAttempt(DefaultModel $captchaModel) : void
-//    {
-//        $email = '';
-//
-//        if ($this->currentUser->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) {
-//            $email = $this->customerRepository->getById($this->currentUser->getUserId())->getEmail();
-//        }
-//
-//        $captchaModel->logAttempt($email);
-//    }
 }

From 8cebb29dd0c26eb0bd3067fe081ceae04d3ac9b2 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Thu, 8 Nov 2018 14:40:39 -0600
Subject: [PATCH 0070/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../Integrity/DeclarativeDependencyTest.php   | 784 ++++++++++++++++++
 1 file changed, 784 insertions(+)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
new file mode 100644
index 0000000000000..d1fe1bd57a834
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
@@ -0,0 +1,784 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Test\Integrity;
+
+use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Setup\Declaration\Schema\Config\Converter;
+
+/**
+ * Class DeclarativeDependencyTest
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
+class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Types of dependency between modules.
+     */
+    const TYPE_HARD = 'hard';
+
+    /**
+     * The identifier of dependency for mapping.
+     */
+    const MAP_TYPE_DECLARED = 'declared';
+
+    /**
+     * The identifier of dependency for mapping.
+     */
+    const MAP_TYPE_FOUND = 'found';
+
+    /**
+     * Declarative name for table entity of the declarative schema.
+     */
+    const SCHEMA_ENTITY_TABLE = 'table';
+
+    /**
+     * Declarative name for column entity of the declarative schema.
+     */
+    const SCHEMA_ENTITY_COLUMN = 'column';
+
+    /**
+     * Declarative name for constraint entity of the declarative schema.
+     */
+    const SCHEMA_ENTITY_CONSTRAINT = 'constraint';
+
+    /**
+     * Declarative name for index entity of the declarative schema.
+     */
+    const SCHEMA_ENTITY_INDEX = 'index';
+
+    /**
+     * @var array
+     */
+    private $mapDependencies = [];
+
+    /**
+     * @var array
+     */
+    private $dbSchemaDeclaration = [];
+
+    /**
+     * @var array
+     */
+    private $packageModuleMapping = [];
+
+    /**
+     * Sets up data
+     *
+     * @throws \Exception
+     */
+    protected function setUp()
+    {
+        $root = BP;
+        $rootJson = $this->readJsonFile($root . '/composer.json', true);
+        if (preg_match('/magento\/project-*/', $rootJson['name']) == 1) {
+            // The Dependency test is skipped for vendor/magento build
+            self::markTestSkipped(
+                'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
+            );
+        }
+    }
+
+    /**
+     * Initialise map of dependencies.
+     *
+     * @throws \Exception
+     */
+    private function initDeclaredDependencies()
+    {
+        $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+        foreach ($jsonFiles as $file) {
+            $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
+            $moduleName = $this->convertModuleName($json->get('name'));
+            $require = array_keys((array)$json->get('require'));
+            $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
+        }
+    }
+
+    /**
+     * Read data from json file.
+     *
+     * @param string $file
+     * @return mixed
+     * @throws \Exception
+     */
+    private function readJsonFile(string $file, bool $asArray = false)
+    {
+        $decodedJson = json_decode(file_get_contents($file), $asArray);
+        if (null == $decodedJson) {
+            throw new \Exception("Invalid Json: $file");
+        }
+
+        return $decodedJson;
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function testUndeclaredDependencies()
+    {
+        $this->initDeclaredDependencies();
+        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
+        $invoker(
+            /**
+             * Check undeclared modules dependencies for specified file
+             *
+             * @param string $fileType
+             * @param string $file
+             */
+            function ($file) {
+                $componentRegistrar = new ComponentRegistrar();
+                $foundModuleName = '';
+                foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
+                    if (strpos($file, $moduleDir . '/') !== false) {
+                        $foundModuleName = str_replace('_', '\\', $moduleName);
+                        break;
+                    }
+                }
+                if (empty($foundModuleName)) {
+                    return;
+                }
+
+                $dependencies = $this->getDependenciesFromFiles($file);
+                $dependencies = $this->filterSelfDependency($foundModuleName, $dependencies);
+                $undeclaredDependency = $this->collectDependencies($foundModuleName, $dependencies);
+
+                $result = [];
+                foreach ($undeclaredDependency as $name => $modules) {
+                    $modules = array_unique($modules);
+                    $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules);
+                }
+                if (count($result)) {
+                    $this->fail(
+                        'Module ' . $moduleName . ' has undeclared dependencies: ' . "\n" . implode("\t\n", $result)
+                    );
+                }
+            },
+            $this->prepareFiles(Files::init()->getDbSchemaFiles())
+        );
+    }
+
+    /**
+     * Remove self dependencies.
+     *
+     * @param string $moduleName
+     * @param array $dependencies
+     * @return array
+     */
+    private function filterSelfDependency(string $moduleName, array $dependencies):array
+    {
+        foreach ($dependencies as $id => $modules) {
+            $decodedId = $this->decodeDependencyId($id);
+            $entityType = $decodedId['entityType'];
+            if ($entityType === self::SCHEMA_ENTITY_TABLE || $entityType === "column") {
+                if (array_search($moduleName, $modules) !== false) {
+                    unset($dependencies[$id]);
+                }
+            } else {
+                $dependencies[$id] = $this->filterComplexDependency($moduleName, $modules);
+            }
+        }
+
+        return array_filter($dependencies);
+    }
+
+    /**
+     * Remove already declared dependencies.
+     *
+     * @param string $moduleName
+     * @param array $modules
+     * @return array
+     */
+    private function filterComplexDependency(string $moduleName, array $modules): array
+    {
+        $resultDependencies = [];
+        if (!is_array(reset($modules))) {
+            if (array_search($moduleName, $modules) === false) {
+                $resultDependencies = $modules;
+            }
+        } else {
+            foreach ($modules as $dependencySet) {
+                if (array_search($moduleName, $dependencySet) === false) {
+                    $resultDependencies = array_merge(
+                        $resultDependencies,
+                        $dependencySet
+                    );
+                }
+            }
+        }
+
+        return array_values(array_unique($resultDependencies));
+    }
+
+    /**
+     * Retrieve declarative schema declaration.
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function getDeclarativeSchema(): array
+    {
+        if ($this->dbSchemaDeclaration) {
+            return $this->dbSchemaDeclaration;
+        }
+
+        $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
+        $declaration = [];
+        foreach (Files::init()->getDbSchemaFiles() as $filePath) {
+            $filePath = reset($filePath);
+            preg_match('#app/code/(\w+/\w+)#', $filePath, $result);
+            $moduleName = str_replace('/', '\\', $result[1]);
+            $moduleDeclaration = $this->getDbSchemaDeclaration($filePath);
+
+            foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+                if (!isset($tableDeclaration['modules'])) {
+                    $tableDeclaration['modules'] = [];
+                }
+                array_push($tableDeclaration['modules'], $moduleName);
+                $moduleDeclaration = array_replace_recursive(
+                    $moduleDeclaration,
+                    [self::SCHEMA_ENTITY_TABLE =>
+                        [
+                            $tableName => $tableDeclaration,
+                        ]
+                    ]
+                );
+                foreach ($entityTypes as $entityType) {
+                    if (!isset($tableDeclaration[$entityType])) {
+                        continue;
+                    }
+                    $moduleDeclaration = array_replace_recursive(
+                        $moduleDeclaration,
+                        [self::SCHEMA_ENTITY_TABLE =>
+                            [
+                                $tableName =>
+                                    $this->addModuleAssigment($tableDeclaration, $entityType, $moduleName)
+                                ]
+                            ]
+                    );
+                }
+            }
+            $declaration = array_merge_recursive($declaration, $moduleDeclaration);
+        }
+        $this->dbSchemaDeclaration = $declaration;
+
+        return $this->dbSchemaDeclaration;
+    }
+
+    /**
+     * Get declared dependencies.
+     *
+     * @param string $tableName
+     * @param string $entityType
+     * @param null|string $entityName
+     * @return array
+     * @throws \Exception
+     */
+    private function resolveEntityDependencies(string $tableName, string $entityType, ?string $entityName = null): array
+    {
+        switch ($entityType) {
+            case self::SCHEMA_ENTITY_COLUMN:
+            case self::SCHEMA_ENTITY_CONSTRAINT:
+            case self::SCHEMA_ENTITY_INDEX:
+                return $this->getDeclarativeSchema()
+                    [self::SCHEMA_ENTITY_TABLE][$tableName][$entityType][$entityName]['modules'];
+                break;
+            case self::SCHEMA_ENTITY_TABLE:
+                return $this->getDeclarativeSchema()[self::SCHEMA_ENTITY_TABLE][$tableName]['modules'];
+                break;
+            default:
+                return [];
+        }
+    }
+
+    /**
+     * @param string $filePath
+     * @return array
+     */
+    private function getDbSchemaDeclaration(string $filePath): array
+    {
+        $dom = new \DOMDocument();
+        $dom->loadXML(file_get_contents($filePath));
+        return (new Converter())->convert($dom);
+    }
+
+    /**
+     * Add dependency on the current module.
+     *
+     * @param array $tableDeclaration
+     * @param string $entityType
+     * @param string $moduleName
+     * @return array
+     */
+    private function addModuleAssigment(
+        array $tableDeclaration,
+        string $entityType,
+        string $moduleName
+    ): array {
+        $declarationWithAssigment = [];
+        foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
+            if (!isset($entityDeclaration['modules'])) {
+                $entityDeclaration['modules'] = [];
+            }
+            if (!$this->isEntityDisabled($entityDeclaration)) {
+                array_push($entityDeclaration['modules'], $moduleName);
+            }
+
+            $declarationWithAssigment[$entityType][$entityName] = $entityDeclaration;
+        }
+
+        return $declarationWithAssigment;
+    }
+
+    /**
+     * Retrieve dependencies from files.
+     *
+     * @param string $file
+     * @return string[]
+     * @throws \Exception
+     */
+    private function getDependenciesFromFiles($file)
+    {
+        $moduleDbSchema = $this->getDbSchemaDeclaration($file);
+        $dependencies = array_merge_recursive(
+            $this->getDisabledDependencies($moduleDbSchema),
+            $this->getConstraintDependencies($moduleDbSchema),
+            $this->getIndexDependencies($moduleDbSchema)
+        );
+        return $dependencies;
+    }
+
+    /**
+     * Retrieve dependencies for disabled entities.
+     *
+     * @param array $moduleDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getDisabledDependencies(array $moduleDeclaration): array
+    {
+        $disabledDependencies = [];
+        $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
+        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+            foreach ($entityTypes as $entityType) {
+                if (!isset($tableDeclaration[$entityType])) {
+                    continue;
+                }
+                foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
+                    if ($this->isEntityDisabled($entityDeclaration)) {
+                        $dependencyIdentifier = $this->getDependencyId($tableName, $entityType, $entityName);
+                        $disabledDependencies[$dependencyIdentifier] =
+                            $this->resolveEntityDependencies($tableName, $entityType, $entityName);
+                    }
+                }
+            }
+            if ($this->isEntityDisabled($tableDeclaration)) {
+                $disabledDependencies[$this->getDependencyId($tableName)] =
+                    $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_TABLE);
+            }
+        }
+
+        return $disabledDependencies;
+    }
+
+    /**
+     * Retrieve dependencies for foreign entities.
+     *
+     * @param array $constraintDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getFKDependencies(array $constraintDeclaration): array
+    {
+        $referenceDependencyIdentifier =
+            $this->getDependencyId(
+                $constraintDeclaration['referenceTable'],
+                self::SCHEMA_ENTITY_CONSTRAINT,
+                $constraintDeclaration['referenceId']
+            );
+        $dependencyIdentifier =
+            $this->getDependencyId(
+                $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
+                self::SCHEMA_ENTITY_CONSTRAINT,
+                $constraintDeclaration['referenceId']
+            );
+
+        $constraintDependencies = [];
+        $constraintDependencies[$referenceDependencyIdentifier] =
+            $this->resolveEntityDependencies(
+                $constraintDeclaration['referenceTable'],
+                self::SCHEMA_ENTITY_COLUMN,
+                $constraintDeclaration['referenceColumn']
+            );
+        $constraintDependencies[$dependencyIdentifier] =
+            $this->resolveEntityDependencies(
+                $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
+                self::SCHEMA_ENTITY_COLUMN,
+                $constraintDeclaration[self::SCHEMA_ENTITY_COLUMN]
+            );
+
+        return $constraintDependencies;
+    }
+
+    /**
+     * Retrieve dependencies for constraint entities.
+     *
+     * @param array $moduleDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getConstraintDependencies(array $moduleDeclaration): array
+    {
+        $constraintDependencies = [];
+        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+            if (empty($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT])) {
+                continue;
+            }
+            foreach ($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT] as $constraintName => $constraintDeclaration) {
+                if ($this->isEntityDisabled($constraintDeclaration)) {
+                    continue;
+                }
+                $dependencyIdentifier =
+                    $this->getDependencyId($tableName, self::SCHEMA_ENTITY_CONSTRAINT, $constraintName);
+                switch ($constraintDeclaration['type']) {
+                    case 'foreign':
+                        $constraintDependencies = array_merge(
+                            $constraintDependencies,
+                            $this->getFKDependencies($constraintDeclaration)
+                        );
+                        break;
+                    case 'primary':
+                    case 'unique':
+                        $constraintDependencies[$dependencyIdentifier] = $this->getComplexDependency(
+                            $tableName,
+                            $constraintDeclaration
+                        );
+                }
+            }
+        }
+        return $constraintDependencies;
+    }
+
+    /**
+     * Calculate complex dependency.
+     *
+     * @param string $tableName
+     * @param array $entityDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getComplexDependency(string $tableName, array $entityDeclaration): array
+    {
+        $complexDependency = [];
+        if (empty($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
+            return $complexDependency;
+        }
+
+        if (!is_array($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
+            $entityDeclaration[self::SCHEMA_ENTITY_COLUMN] = [$entityDeclaration[self::SCHEMA_ENTITY_COLUMN]];
+        }
+
+        foreach (array_keys($entityDeclaration[self::SCHEMA_ENTITY_COLUMN]) as $columnName) {
+            $complexDependency[] =
+                $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_COLUMN, $columnName);
+        }
+
+        return array_values($complexDependency);
+    }
+
+    /**
+     * Retrieve dependencies for index entities.
+     *
+     * @param array $moduleDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getIndexDependencies(array $moduleDeclaration): array
+    {
+        $indexDependencies = [];
+        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+            if (empty($tableDeclaration[self::SCHEMA_ENTITY_INDEX])) {
+                continue;
+            }
+            foreach ($tableDeclaration[self::SCHEMA_ENTITY_INDEX] as $indexName => $indexDeclaration) {
+                if ($this->isEntityDisabled($indexDeclaration)) {
+                    continue;
+                }
+                $dependencyIdentifier =
+                    $this->getDependencyId($tableName, self::SCHEMA_ENTITY_INDEX, $indexName);
+                $indexDependencies[$dependencyIdentifier] =
+                    $this->getComplexDependency($tableName, $indexDeclaration);
+            }
+        }
+
+        return $indexDependencies;
+    }
+
+    /**
+     * Check status of the entity declaration.
+     *
+     * @param array $entityDeclaration
+     * @return bool
+     */
+    private function isEntityDisabled(array $entityDeclaration): bool
+    {
+        return isset($entityDeclaration['disabled']) && $entityDeclaration['disabled'] == true;
+    }
+
+    /**
+     * Retrive dependency id.
+     *
+     * @param string $tableName
+     * @param string $entityType
+     * @param null|string $entityName
+     * @return string
+     */
+    private function getDependencyId(
+        string $tableName,
+        string $entityType = self::SCHEMA_ENTITY_TABLE,
+        ?string $entityName = null
+    ) {
+        return implode('___', [$tableName, $entityType, $entityName ?: $tableName]);
+    }
+
+    /**
+     * Retrieve dependency parameters from dependency id.
+     *
+     * @param string $id
+     * @return array
+     */
+    private function decodeDependencyId(string $id): array
+    {
+        $decodedValues = explode('___', $id);
+        $result = [
+            'tableName' => $decodedValues[0],
+            'entityType' => $decodedValues[1],
+            'entityName' => $decodedValues[2],
+        ];
+        return $result;
+    }
+
+    /**
+     * Retrieve error message for dependency.
+     *
+     * @param string $id
+     * @return string
+     */
+    private function getErrorMessage(string $id): string
+    {
+        $decodedId = $this->decodeDependencyId($id);
+        $entityType = $decodedId['entityType'];
+        if ($entityType === self::SCHEMA_ENTITY_TABLE) {
+            $message = sprintf(
+                'Table %s has undeclared dependency on one of the next modules.',
+                $decodedId['tableName']
+            );
+        } else {
+            $message = sprintf(
+                '%s %s from %s table has undeclared dependency on one of the next modules.',
+                ucfirst($entityType),
+                $decodedId['entityName'],
+                $decodedId['tableName']
+            );
+        }
+
+        return $message;
+    }
+
+    /**
+     * Collect module dependencies.
+     *
+     * @param string $currentModuleName
+     * @param array $dependencies
+     * @return array
+     */
+    private function collectDependencies($currentModuleName, $dependencies = [])
+    {
+        if (!count($dependencies)) {
+            return [];
+        }
+        foreach ($dependencies as $dependencyName => $dependency) {
+            $this->collectDependency($dependencyName, $dependency, $currentModuleName);
+        }
+
+        return $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_FOUND);
+    }
+
+    /**
+     * Collect a module dependency.
+     *
+     * @param string $dependencyName
+     * @param array $dependency
+     * @param string $currentModule
+     */
+    private function collectDependency(
+        string $dependencyName,
+        array $dependency,
+        string $currentModule
+    ) {
+        $declared = $this->getDeclaredDependencies($currentModule, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+        $checkResult = array_intersect($declared, $dependency);
+
+        if (empty($checkResult)) {
+            $this->addDependencies(
+                $currentModule,
+                self::TYPE_HARD,
+                self::MAP_TYPE_FOUND,
+                [
+                    $dependencyName => $dependency,
+                ]
+            );
+        }
+    }
+
+    /**
+     * Convert file list to data provider structure.
+     *
+     * @param string[] $files
+     * @return array
+     */
+    private function prepareFiles(array $files): array
+    {
+        $result = [];
+        foreach ($files as $relativePath => $file) {
+            $absolutePath = reset($file);
+            $result[$relativePath] = [$absolutePath];
+        }
+        return $result;
+    }
+
+    /**
+     * Add dependencies to dependency list.
+     *
+     * @param string $moduleName
+     * @param array $packageNames
+     * @param string $type
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function presetDependencies(
+        string $moduleName,
+        array $packageNames,
+        string $type
+    ): void {
+        $packageNames = array_filter($packageNames, function ($packageName) {
+            return $this->getModuleName($packageName) ||
+                0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
+        });
+
+        foreach ($packageNames as $packageName) {
+            $this->addDependencies(
+                $moduleName,
+                $type,
+                self::MAP_TYPE_DECLARED,
+                [$this->convertModuleName($packageName)]
+            );
+        }
+    }
+
+    /**
+     * Converts a composer json component name into the Magento Module form.
+     *
+     * @param string $jsonName The name of a composer json component or dependency e.g. 'magento/module-theme'
+     * @return string The corresponding Magento Module e.g. 'Magento\Theme'
+     * @throws \Exception
+     */
+    private function convertModuleName(string $jsonName): string
+    {
+        $moduleName = $this->getModuleName($jsonName);
+        if ($moduleName) {
+            return $moduleName;
+        }
+
+        if (
+            strpos($jsonName, 'magento/magento') !== false
+            || strpos($jsonName, 'magento/framework') !== false
+        ) {
+            $moduleName = str_replace('/', "\t", $jsonName);
+            $moduleName = str_replace('framework-', "Framework\t", $moduleName);
+            $moduleName = str_replace('-', ' ', $moduleName);
+            $moduleName = ucwords($moduleName);
+            $moduleName = str_replace("\t", '\\', $moduleName);
+            $moduleName = str_replace(' ', '', $moduleName);
+        } else {
+            $moduleName = $jsonName;
+        }
+
+        return $moduleName;
+    }
+
+    /**
+     * Returns package name on module name mapping.
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function getPackageModuleMapping(): array
+    {
+        if (!$this->packageModuleMapping) {
+            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+
+            $packageModuleMapping = [];
+            foreach ($jsonFiles as $file) {
+                $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
+                $moduleName = str_replace('_', '\\', (string)$moduleXml->module->attributes()->name);
+                $composerJson = $this->readJsonFile($file);
+                $packageName = $composerJson->name;
+                $packageModuleMapping[$packageName] = $moduleName;
+            }
+
+            $this->packageModuleMapping = $packageModuleMapping;
+        }
+
+        return $this->packageModuleMapping;
+    }
+
+    /**
+     * Retrive Magento style module name.
+     *
+     * @param string $packageName
+     * @return null|string
+     * @throws \Exception
+     */
+    private function getModuleName(string $packageName): ?string
+    {
+        return $this->getPackageModuleMapping()[$packageName] ?? null;
+    }
+
+    /**
+     * Retrieve array of dependency items.
+     *
+     * @param $module
+     * @param $type
+     * @param $mapType
+     * @return array
+     */
+    private function getDeclaredDependencies(string $module, string $type, string $mapType)
+    {
+        return $this->mapDependencies[$module][$type][$mapType] ?? [];
+    }
+
+    /**
+     * Add dependency map items.
+     *
+     * @param $module
+     * @param $type
+     * @param $mapType
+     * @param $dependencies
+     */
+    protected function addDependencies(string $module, string $type, string $mapType, array $dependencies)
+    {
+        $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
+            $this->getDeclaredDependencies($module, $type, $mapType),
+            $dependencies
+        );
+    }
+}
\ No newline at end of file

From 58b0c691f54d8b3c52090488809cf9b62efc36a1 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Fri, 9 Nov 2018 16:32:21 -0600
Subject: [PATCH 0071/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../Dependency/DeclarativeSchemaRule.php      | 101 ---
 .../Integrity/DeclarativeDependencyTest.php   | 685 +---------------
 .../DeclarativeSchemaDependencyProvider.php   | 759 ++++++++++++++++++
 .../Magento/Test/Integrity/DependencyTest.php |  59 +-
 4 files changed, 803 insertions(+), 801 deletions(-)
 delete mode 100644 dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php

diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php
deleted file mode 100644
index 72e4fff7e5162..0000000000000
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/DeclarativeSchemaRule.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Rule for searching DB dependency
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestFramework\Dependency;
-
-/**
- * Rule for testing integrity within declarative schema.
- *
- * @package Magento\TestFramework\Dependency
- */
-class DeclarativeSchemaRule implements RuleInterface
-{
-    /**
-     * Map of tables and modules
-     *
-     * @var array
-     */
-    protected $_moduleTableMap;
-
-    /**
-     * Constructor
-     *
-     * @param array $tables
-     */
-    public function __construct(array $tables)
-    {
-        $this->_moduleTableMap = $tables;
-    }
-
-    /**
-     * Gets external dependencies information for current module by analyzing db_schema.xml files contents.
-     *
-     * @param string $currentModule
-     * @param string $fileType
-     * @param string $file
-     * @param string $contents
-     * @return array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
-    {
-        if ('db_schema' != $fileType || !preg_match('#.*/db_schema\.xml$#', $file)) {
-            return [];
-        }
-
-        $dependenciesInfo = [];
-        $unKnowTables = [];
-
-        $dom = new \DOMDocument();
-        $dom->loadXML($contents);
-        $tables = $dom->getElementsByTagName('table');
-        $constraints = $dom->getElementsByTagName('constraint');
-
-        $tableNames = [];
-        $foreignKeyTables = [];
-        $foreignKeyReferenceTables = [];
-
-        /** @var \DOMElement $table */
-        foreach ($tables as $table) {
-            $tableNames[] = $table->getAttribute('name');
-        }
-
-        /** @var \DOMElement $constraint */
-        foreach ($constraints as $constraint) {
-            $xsiType = $constraint->getAttribute('xsi:type');
-            if (strtolower($xsiType) == 'foreign' && $constraint->getAttribute('disabled') !== '1') {
-                $foreignKeyTables[] = $constraint->getAttribute('table');
-                $foreignKeyReferenceTables[] = $constraint->getAttribute('referenceTable');
-            }
-        }
-
-        $tableNames = array_unique(array_merge($tableNames, $foreignKeyReferenceTables, $foreignKeyTables));
-
-        /** @var string $table */
-        foreach ($tableNames as $table) {
-            if (!isset($this->_moduleTableMap[$table])) {
-                $unKnowTables[$file][$table] = $table;
-                continue;
-            }
-            if (strtolower($currentModule) !== strtolower($this->_moduleTableMap[$table])) {
-                $dependenciesInfo[] = [
-                    'module' => $this->_moduleTableMap[$table],
-                    'type' => RuleInterface::TYPE_HARD,
-                    'source' => $table,
-                ];
-            }
-        }
-
-        foreach ($unKnowTables as $tables) {
-            foreach ($tables as $table) {
-                $dependenciesInfo[] = ['module' => 'Unknown', 'source' => $table];
-            }
-        }
-        return $dependenciesInfo;
-    }
-}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
index d1fe1bd57a834..257da9669d9b5 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
@@ -8,66 +8,19 @@
 
 namespace Magento\Test\Integrity;
 
+use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
-use Magento\Framework\Setup\Declaration\Schema\Config\Converter;
 
 /**
  * Class DeclarativeDependencyTest
- *
- * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * Types of dependency between modules.
+     * @var DeclarativeSchemaDependencyProvider
      */
-    const TYPE_HARD = 'hard';
-
-    /**
-     * The identifier of dependency for mapping.
-     */
-    const MAP_TYPE_DECLARED = 'declared';
-
-    /**
-     * The identifier of dependency for mapping.
-     */
-    const MAP_TYPE_FOUND = 'found';
-
-    /**
-     * Declarative name for table entity of the declarative schema.
-     */
-    const SCHEMA_ENTITY_TABLE = 'table';
-
-    /**
-     * Declarative name for column entity of the declarative schema.
-     */
-    const SCHEMA_ENTITY_COLUMN = 'column';
-
-    /**
-     * Declarative name for constraint entity of the declarative schema.
-     */
-    const SCHEMA_ENTITY_CONSTRAINT = 'constraint';
-
-    /**
-     * Declarative name for index entity of the declarative schema.
-     */
-    const SCHEMA_ENTITY_INDEX = 'index';
-
-    /**
-     * @var array
-     */
-    private $mapDependencies = [];
-
-    /**
-     * @var array
-     */
-    private $dbSchemaDeclaration = [];
-
-    /**
-     * @var array
-     */
-    private $packageModuleMapping = [];
+    private $dependencyProvider;
 
     /**
      * Sets up data
@@ -84,39 +37,7 @@ protected function setUp()
                 'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
             );
         }
-    }
-
-    /**
-     * Initialise map of dependencies.
-     *
-     * @throws \Exception
-     */
-    private function initDeclaredDependencies()
-    {
-        $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
-        foreach ($jsonFiles as $file) {
-            $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
-            $moduleName = $this->convertModuleName($json->get('name'));
-            $require = array_keys((array)$json->get('require'));
-            $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
-        }
-    }
-
-    /**
-     * Read data from json file.
-     *
-     * @param string $file
-     * @return mixed
-     * @throws \Exception
-     */
-    private function readJsonFile(string $file, bool $asArray = false)
-    {
-        $decodedJson = json_decode(file_get_contents($file), $asArray);
-        if (null == $decodedJson) {
-            throw new \Exception("Invalid Json: $file");
-        }
-
-        return $decodedJson;
+        $this->dependencyProvider = new DeclarativeSchemaDependencyProvider();
     }
 
     /**
@@ -124,7 +45,6 @@ private function readJsonFile(string $file, bool $asArray = false)
      */
     public function testUndeclaredDependencies()
     {
-        $this->initDeclaredDependencies();
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
             /**
@@ -146,9 +66,7 @@ function ($file) {
                     return;
                 }
 
-                $dependencies = $this->getDependenciesFromFiles($file);
-                $dependencies = $this->filterSelfDependency($foundModuleName, $dependencies);
-                $undeclaredDependency = $this->collectDependencies($foundModuleName, $dependencies);
+                $undeclaredDependency = $this->dependencyProvider->getUndeclaredModuleDependencies($foundModuleName);
 
                 $result = [];
                 foreach ($undeclaredDependency as $name => $modules) {
@@ -166,402 +84,18 @@ function ($file) {
     }
 
     /**
-     * Remove self dependencies.
-     *
-     * @param string $moduleName
-     * @param array $dependencies
-     * @return array
-     */
-    private function filterSelfDependency(string $moduleName, array $dependencies):array
-    {
-        foreach ($dependencies as $id => $modules) {
-            $decodedId = $this->decodeDependencyId($id);
-            $entityType = $decodedId['entityType'];
-            if ($entityType === self::SCHEMA_ENTITY_TABLE || $entityType === "column") {
-                if (array_search($moduleName, $modules) !== false) {
-                    unset($dependencies[$id]);
-                }
-            } else {
-                $dependencies[$id] = $this->filterComplexDependency($moduleName, $modules);
-            }
-        }
-
-        return array_filter($dependencies);
-    }
-
-    /**
-     * Remove already declared dependencies.
-     *
-     * @param string $moduleName
-     * @param array $modules
-     * @return array
-     */
-    private function filterComplexDependency(string $moduleName, array $modules): array
-    {
-        $resultDependencies = [];
-        if (!is_array(reset($modules))) {
-            if (array_search($moduleName, $modules) === false) {
-                $resultDependencies = $modules;
-            }
-        } else {
-            foreach ($modules as $dependencySet) {
-                if (array_search($moduleName, $dependencySet) === false) {
-                    $resultDependencies = array_merge(
-                        $resultDependencies,
-                        $dependencySet
-                    );
-                }
-            }
-        }
-
-        return array_values(array_unique($resultDependencies));
-    }
-
-    /**
-     * Retrieve declarative schema declaration.
-     *
-     * @return array
-     * @throws \Exception
-     */
-    private function getDeclarativeSchema(): array
-    {
-        if ($this->dbSchemaDeclaration) {
-            return $this->dbSchemaDeclaration;
-        }
-
-        $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
-        $declaration = [];
-        foreach (Files::init()->getDbSchemaFiles() as $filePath) {
-            $filePath = reset($filePath);
-            preg_match('#app/code/(\w+/\w+)#', $filePath, $result);
-            $moduleName = str_replace('/', '\\', $result[1]);
-            $moduleDeclaration = $this->getDbSchemaDeclaration($filePath);
-
-            foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
-                if (!isset($tableDeclaration['modules'])) {
-                    $tableDeclaration['modules'] = [];
-                }
-                array_push($tableDeclaration['modules'], $moduleName);
-                $moduleDeclaration = array_replace_recursive(
-                    $moduleDeclaration,
-                    [self::SCHEMA_ENTITY_TABLE =>
-                        [
-                            $tableName => $tableDeclaration,
-                        ]
-                    ]
-                );
-                foreach ($entityTypes as $entityType) {
-                    if (!isset($tableDeclaration[$entityType])) {
-                        continue;
-                    }
-                    $moduleDeclaration = array_replace_recursive(
-                        $moduleDeclaration,
-                        [self::SCHEMA_ENTITY_TABLE =>
-                            [
-                                $tableName =>
-                                    $this->addModuleAssigment($tableDeclaration, $entityType, $moduleName)
-                                ]
-                            ]
-                    );
-                }
-            }
-            $declaration = array_merge_recursive($declaration, $moduleDeclaration);
-        }
-        $this->dbSchemaDeclaration = $declaration;
-
-        return $this->dbSchemaDeclaration;
-    }
-
-    /**
-     * Get declared dependencies.
-     *
-     * @param string $tableName
-     * @param string $entityType
-     * @param null|string $entityName
-     * @return array
-     * @throws \Exception
-     */
-    private function resolveEntityDependencies(string $tableName, string $entityType, ?string $entityName = null): array
-    {
-        switch ($entityType) {
-            case self::SCHEMA_ENTITY_COLUMN:
-            case self::SCHEMA_ENTITY_CONSTRAINT:
-            case self::SCHEMA_ENTITY_INDEX:
-                return $this->getDeclarativeSchema()
-                    [self::SCHEMA_ENTITY_TABLE][$tableName][$entityType][$entityName]['modules'];
-                break;
-            case self::SCHEMA_ENTITY_TABLE:
-                return $this->getDeclarativeSchema()[self::SCHEMA_ENTITY_TABLE][$tableName]['modules'];
-                break;
-            default:
-                return [];
-        }
-    }
-
-    /**
-     * @param string $filePath
-     * @return array
-     */
-    private function getDbSchemaDeclaration(string $filePath): array
-    {
-        $dom = new \DOMDocument();
-        $dom->loadXML(file_get_contents($filePath));
-        return (new Converter())->convert($dom);
-    }
-
-    /**
-     * Add dependency on the current module.
-     *
-     * @param array $tableDeclaration
-     * @param string $entityType
-     * @param string $moduleName
-     * @return array
-     */
-    private function addModuleAssigment(
-        array $tableDeclaration,
-        string $entityType,
-        string $moduleName
-    ): array {
-        $declarationWithAssigment = [];
-        foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
-            if (!isset($entityDeclaration['modules'])) {
-                $entityDeclaration['modules'] = [];
-            }
-            if (!$this->isEntityDisabled($entityDeclaration)) {
-                array_push($entityDeclaration['modules'], $moduleName);
-            }
-
-            $declarationWithAssigment[$entityType][$entityName] = $entityDeclaration;
-        }
-
-        return $declarationWithAssigment;
-    }
-
-    /**
-     * Retrieve dependencies from files.
-     *
-     * @param string $file
-     * @return string[]
-     * @throws \Exception
-     */
-    private function getDependenciesFromFiles($file)
-    {
-        $moduleDbSchema = $this->getDbSchemaDeclaration($file);
-        $dependencies = array_merge_recursive(
-            $this->getDisabledDependencies($moduleDbSchema),
-            $this->getConstraintDependencies($moduleDbSchema),
-            $this->getIndexDependencies($moduleDbSchema)
-        );
-        return $dependencies;
-    }
-
-    /**
-     * Retrieve dependencies for disabled entities.
-     *
-     * @param array $moduleDeclaration
-     * @return array
-     * @throws \Exception
-     */
-    private function getDisabledDependencies(array $moduleDeclaration): array
-    {
-        $disabledDependencies = [];
-        $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
-        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
-            foreach ($entityTypes as $entityType) {
-                if (!isset($tableDeclaration[$entityType])) {
-                    continue;
-                }
-                foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
-                    if ($this->isEntityDisabled($entityDeclaration)) {
-                        $dependencyIdentifier = $this->getDependencyId($tableName, $entityType, $entityName);
-                        $disabledDependencies[$dependencyIdentifier] =
-                            $this->resolveEntityDependencies($tableName, $entityType, $entityName);
-                    }
-                }
-            }
-            if ($this->isEntityDisabled($tableDeclaration)) {
-                $disabledDependencies[$this->getDependencyId($tableName)] =
-                    $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_TABLE);
-            }
-        }
-
-        return $disabledDependencies;
-    }
-
-    /**
-     * Retrieve dependencies for foreign entities.
-     *
-     * @param array $constraintDeclaration
-     * @return array
-     * @throws \Exception
-     */
-    private function getFKDependencies(array $constraintDeclaration): array
-    {
-        $referenceDependencyIdentifier =
-            $this->getDependencyId(
-                $constraintDeclaration['referenceTable'],
-                self::SCHEMA_ENTITY_CONSTRAINT,
-                $constraintDeclaration['referenceId']
-            );
-        $dependencyIdentifier =
-            $this->getDependencyId(
-                $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
-                self::SCHEMA_ENTITY_CONSTRAINT,
-                $constraintDeclaration['referenceId']
-            );
-
-        $constraintDependencies = [];
-        $constraintDependencies[$referenceDependencyIdentifier] =
-            $this->resolveEntityDependencies(
-                $constraintDeclaration['referenceTable'],
-                self::SCHEMA_ENTITY_COLUMN,
-                $constraintDeclaration['referenceColumn']
-            );
-        $constraintDependencies[$dependencyIdentifier] =
-            $this->resolveEntityDependencies(
-                $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
-                self::SCHEMA_ENTITY_COLUMN,
-                $constraintDeclaration[self::SCHEMA_ENTITY_COLUMN]
-            );
-
-        return $constraintDependencies;
-    }
-
-    /**
-     * Retrieve dependencies for constraint entities.
-     *
-     * @param array $moduleDeclaration
-     * @return array
-     * @throws \Exception
-     */
-    private function getConstraintDependencies(array $moduleDeclaration): array
-    {
-        $constraintDependencies = [];
-        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
-            if (empty($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT])) {
-                continue;
-            }
-            foreach ($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT] as $constraintName => $constraintDeclaration) {
-                if ($this->isEntityDisabled($constraintDeclaration)) {
-                    continue;
-                }
-                $dependencyIdentifier =
-                    $this->getDependencyId($tableName, self::SCHEMA_ENTITY_CONSTRAINT, $constraintName);
-                switch ($constraintDeclaration['type']) {
-                    case 'foreign':
-                        $constraintDependencies = array_merge(
-                            $constraintDependencies,
-                            $this->getFKDependencies($constraintDeclaration)
-                        );
-                        break;
-                    case 'primary':
-                    case 'unique':
-                        $constraintDependencies[$dependencyIdentifier] = $this->getComplexDependency(
-                            $tableName,
-                            $constraintDeclaration
-                        );
-                }
-            }
-        }
-        return $constraintDependencies;
-    }
-
-    /**
-     * Calculate complex dependency.
-     *
-     * @param string $tableName
-     * @param array $entityDeclaration
-     * @return array
-     * @throws \Exception
-     */
-    private function getComplexDependency(string $tableName, array $entityDeclaration): array
-    {
-        $complexDependency = [];
-        if (empty($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
-            return $complexDependency;
-        }
-
-        if (!is_array($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
-            $entityDeclaration[self::SCHEMA_ENTITY_COLUMN] = [$entityDeclaration[self::SCHEMA_ENTITY_COLUMN]];
-        }
-
-        foreach (array_keys($entityDeclaration[self::SCHEMA_ENTITY_COLUMN]) as $columnName) {
-            $complexDependency[] =
-                $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_COLUMN, $columnName);
-        }
-
-        return array_values($complexDependency);
-    }
-
-    /**
-     * Retrieve dependencies for index entities.
+     * Convert file list to data provider structure.
      *
-     * @param array $moduleDeclaration
+     * @param string[] $files
      * @return array
-     * @throws \Exception
      */
-    private function getIndexDependencies(array $moduleDeclaration): array
+    private function prepareFiles(array $files): array
     {
-        $indexDependencies = [];
-        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
-            if (empty($tableDeclaration[self::SCHEMA_ENTITY_INDEX])) {
-                continue;
-            }
-            foreach ($tableDeclaration[self::SCHEMA_ENTITY_INDEX] as $indexName => $indexDeclaration) {
-                if ($this->isEntityDisabled($indexDeclaration)) {
-                    continue;
-                }
-                $dependencyIdentifier =
-                    $this->getDependencyId($tableName, self::SCHEMA_ENTITY_INDEX, $indexName);
-                $indexDependencies[$dependencyIdentifier] =
-                    $this->getComplexDependency($tableName, $indexDeclaration);
-            }
+        $result = [];
+        foreach ($files as $relativePath => $file) {
+            $absolutePath = reset($file);
+            $result[$relativePath] = [$absolutePath];
         }
-
-        return $indexDependencies;
-    }
-
-    /**
-     * Check status of the entity declaration.
-     *
-     * @param array $entityDeclaration
-     * @return bool
-     */
-    private function isEntityDisabled(array $entityDeclaration): bool
-    {
-        return isset($entityDeclaration['disabled']) && $entityDeclaration['disabled'] == true;
-    }
-
-    /**
-     * Retrive dependency id.
-     *
-     * @param string $tableName
-     * @param string $entityType
-     * @param null|string $entityName
-     * @return string
-     */
-    private function getDependencyId(
-        string $tableName,
-        string $entityType = self::SCHEMA_ENTITY_TABLE,
-        ?string $entityName = null
-    ) {
-        return implode('___', [$tableName, $entityType, $entityName ?: $tableName]);
-    }
-
-    /**
-     * Retrieve dependency parameters from dependency id.
-     *
-     * @param string $id
-     * @return array
-     */
-    private function decodeDependencyId(string $id): array
-    {
-        $decodedValues = explode('___', $id);
-        $result = [
-            'tableName' => $decodedValues[0],
-            'entityType' => $decodedValues[1],
-            'entityName' => $decodedValues[2],
-        ];
         return $result;
     }
 
@@ -573,9 +107,9 @@ private function decodeDependencyId(string $id): array
      */
     private function getErrorMessage(string $id): string
     {
-        $decodedId = $this->decodeDependencyId($id);
+        $decodedId = $this->dependencyProvider->decodeDependencyId($id);
         $entityType = $decodedId['entityType'];
-        if ($entityType === self::SCHEMA_ENTITY_TABLE) {
+        if ($entityType === DeclarativeSchemaDependencyProvider::SCHEMA_ENTITY_TABLE) {
             $message = sprintf(
                 'Table %s has undeclared dependency on one of the next modules.',
                 $decodedId['tableName']
@@ -593,192 +127,19 @@ private function getErrorMessage(string $id): string
     }
 
     /**
-     * Collect module dependencies.
-     *
-     * @param string $currentModuleName
-     * @param array $dependencies
-     * @return array
-     */
-    private function collectDependencies($currentModuleName, $dependencies = [])
-    {
-        if (!count($dependencies)) {
-            return [];
-        }
-        foreach ($dependencies as $dependencyName => $dependency) {
-            $this->collectDependency($dependencyName, $dependency, $currentModuleName);
-        }
-
-        return $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_FOUND);
-    }
-
-    /**
-     * Collect a module dependency.
-     *
-     * @param string $dependencyName
-     * @param array $dependency
-     * @param string $currentModule
-     */
-    private function collectDependency(
-        string $dependencyName,
-        array $dependency,
-        string $currentModule
-    ) {
-        $declared = $this->getDeclaredDependencies($currentModule, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
-        $checkResult = array_intersect($declared, $dependency);
-
-        if (empty($checkResult)) {
-            $this->addDependencies(
-                $currentModule,
-                self::TYPE_HARD,
-                self::MAP_TYPE_FOUND,
-                [
-                    $dependencyName => $dependency,
-                ]
-            );
-        }
-    }
-
-    /**
-     * Convert file list to data provider structure.
-     *
-     * @param string[] $files
-     * @return array
-     */
-    private function prepareFiles(array $files): array
-    {
-        $result = [];
-        foreach ($files as $relativePath => $file) {
-            $absolutePath = reset($file);
-            $result[$relativePath] = [$absolutePath];
-        }
-        return $result;
-    }
-
-    /**
-     * Add dependencies to dependency list.
-     *
-     * @param string $moduleName
-     * @param array $packageNames
-     * @param string $type
-     *
-     * @return void
-     * @throws \Exception
-     */
-    private function presetDependencies(
-        string $moduleName,
-        array $packageNames,
-        string $type
-    ): void {
-        $packageNames = array_filter($packageNames, function ($packageName) {
-            return $this->getModuleName($packageName) ||
-                0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
-        });
-
-        foreach ($packageNames as $packageName) {
-            $this->addDependencies(
-                $moduleName,
-                $type,
-                self::MAP_TYPE_DECLARED,
-                [$this->convertModuleName($packageName)]
-            );
-        }
-    }
-
-    /**
-     * Converts a composer json component name into the Magento Module form.
-     *
-     * @param string $jsonName The name of a composer json component or dependency e.g. 'magento/module-theme'
-     * @return string The corresponding Magento Module e.g. 'Magento\Theme'
-     * @throws \Exception
-     */
-    private function convertModuleName(string $jsonName): string
-    {
-        $moduleName = $this->getModuleName($jsonName);
-        if ($moduleName) {
-            return $moduleName;
-        }
-
-        if (
-            strpos($jsonName, 'magento/magento') !== false
-            || strpos($jsonName, 'magento/framework') !== false
-        ) {
-            $moduleName = str_replace('/', "\t", $jsonName);
-            $moduleName = str_replace('framework-', "Framework\t", $moduleName);
-            $moduleName = str_replace('-', ' ', $moduleName);
-            $moduleName = ucwords($moduleName);
-            $moduleName = str_replace("\t", '\\', $moduleName);
-            $moduleName = str_replace(' ', '', $moduleName);
-        } else {
-            $moduleName = $jsonName;
-        }
-
-        return $moduleName;
-    }
-
-    /**
-     * Returns package name on module name mapping.
+     * Read data from json file.
      *
-     * @return array
+     * @param string $file
+     * @return mixed
      * @throws \Exception
      */
-    private function getPackageModuleMapping(): array
+    private function readJsonFile(string $file, bool $asArray = false)
     {
-        if (!$this->packageModuleMapping) {
-            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
-
-            $packageModuleMapping = [];
-            foreach ($jsonFiles as $file) {
-                $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
-                $moduleName = str_replace('_', '\\', (string)$moduleXml->module->attributes()->name);
-                $composerJson = $this->readJsonFile($file);
-                $packageName = $composerJson->name;
-                $packageModuleMapping[$packageName] = $moduleName;
-            }
-
-            $this->packageModuleMapping = $packageModuleMapping;
+        $decodedJson = json_decode(file_get_contents($file), $asArray);
+        if (null == $decodedJson) {
+            throw new \Exception("Invalid Json: $file");
         }
 
-        return $this->packageModuleMapping;
-    }
-
-    /**
-     * Retrive Magento style module name.
-     *
-     * @param string $packageName
-     * @return null|string
-     * @throws \Exception
-     */
-    private function getModuleName(string $packageName): ?string
-    {
-        return $this->getPackageModuleMapping()[$packageName] ?? null;
-    }
-
-    /**
-     * Retrieve array of dependency items.
-     *
-     * @param $module
-     * @param $type
-     * @param $mapType
-     * @return array
-     */
-    private function getDeclaredDependencies(string $module, string $type, string $mapType)
-    {
-        return $this->mapDependencies[$module][$type][$mapType] ?? [];
-    }
-
-    /**
-     * Add dependency map items.
-     *
-     * @param $module
-     * @param $type
-     * @param $mapType
-     * @param $dependencies
-     */
-    protected function addDependencies(string $module, string $type, string $mapType, array $dependencies)
-    {
-        $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
-            $this->getDeclaredDependencies($module, $type, $mapType),
-            $dependencies
-        );
+        return $decodedJson;
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
new file mode 100644
index 0000000000000..b9050721c6910
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -0,0 +1,759 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Test\Integrity\Dependency;
+
+use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Setup\Declaration\Schema\Config\Converter;
+
+/**
+ * Provide information on the dependency between the modules according to the declarative schema.
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
+class DeclarativeSchemaDependencyProvider
+{
+    /**
+     * Types of dependency between modules.
+     */
+    const TYPE_HARD = 'hard';
+
+    /**
+     * The identifier of dependency for mapping.
+     */
+    const MAP_TYPE_DECLARED = 'declared';
+
+    /**
+     * The identifier of dependency for mapping.
+     */
+    const MAP_TYPE_FOUND = 'found';
+
+    /**
+     * Declarative name for table entity of the declarative schema.
+     */
+    const SCHEMA_ENTITY_TABLE = 'table';
+
+    /**
+     * Declarative name for column entity of the declarative schema.
+     */
+    const SCHEMA_ENTITY_COLUMN = 'column';
+
+    /**
+     * Declarative name for constraint entity of the declarative schema.
+     */
+    const SCHEMA_ENTITY_CONSTRAINT = 'constraint';
+
+    /**
+     * Declarative name for index entity of the declarative schema.
+     */
+    const SCHEMA_ENTITY_INDEX = 'index';
+
+    /**
+     * @var array
+     */
+    private $mapDependencies = [];
+
+    /**
+     * @var array
+     */
+    private $dbSchemaDeclaration = [];
+
+    /**
+     * @var array
+     */
+    private $packageModuleMapping = [];
+
+    /**
+     * @var array
+     */
+    private $moduleSchemaFileMapping = [];
+
+    /**
+     * Provide declared dependencies between modules based on the declarative schema configuration.
+     *
+     * @param string $moduleName
+     * @return array
+     * @throws \Exception
+     */
+    public function getDeclaredExistingModuleDependencies(string $moduleName): array
+    {
+        $this->initDeclaredDependencies();
+        $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
+        $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
+        $declared = $this->getDeclaredDependencies($moduleName, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+
+        $existingDeclared = [];
+        foreach ($dependencies as $dependency) {
+            $checkResult = array_intersect($declared, $dependency);
+            if ($checkResult) {
+                $existingDeclared = array_merge(array_values($checkResult));
+            }
+        }
+
+        return array_unique($existingDeclared);
+    }
+
+    /**
+     * Provide undeclared dependencies between modules based on the declarative schema configuration.
+     *
+     * [
+     *     $dependencyId => [$module1, $module2, $module3 ...],
+     *     ...
+     * ]
+     *
+     * @param string $moduleName
+     * @return array
+     * @throws \Exception
+     */
+    public function getUndeclaredModuleDependencies(string $moduleName): array
+    {
+        $this->initDeclaredDependencies();
+        $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
+        $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
+        return $this->collectDependencies($moduleName, $dependencies);
+    }
+
+    /**
+     * Provide schema file name by module name.
+     *
+     * @param string $module
+     * @return string
+     * @throws \Exception
+     */
+    private function getSchemaFileNameByModuleName(string $module): string
+    {
+        if (empty($this->moduleSchemaFileMapping)) {
+            $componentRegistrar = new ComponentRegistrar();
+            foreach (array_values(Files::init()->getDbSchemaFiles()) as $filePath) {
+                $filePath = reset($filePath);
+                foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
+                    if (strpos($filePath, $moduleDir . '/') !== false) {
+                        $foundModuleName = str_replace('_', '\\', $moduleName);
+                        $this->moduleSchemaFileMapping[$foundModuleName] = $filePath;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $this->moduleSchemaFileMapping[$module] ?? '';
+    }
+
+    /**
+     * Initialise map of dependencies.
+     *
+     * @throws \Exception
+     */
+    private function initDeclaredDependencies()
+    {
+        if (empty($this->mapDependencies)) {
+            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+            foreach ($jsonFiles as $file) {
+                $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
+                $moduleName = $this->convertModuleName($json->get('name'));
+                $require = array_keys((array)$json->get('require'));
+                $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
+            }
+        }
+    }
+
+    /**
+     * Read data from json file.
+     *
+     * @param string $file
+     * @return mixed
+     * @throws \Exception
+     */
+    private function readJsonFile(string $file, bool $asArray = false)
+    {
+        $decodedJson = json_decode(file_get_contents($file), $asArray);
+        if (null == $decodedJson) {
+            throw new \Exception("Invalid Json: $file");
+        }
+
+        return $decodedJson;
+    }
+
+    /**
+     * Remove self dependencies.
+     *
+     * @param string $moduleName
+     * @param array $dependencies
+     * @return array
+     */
+    private function filterSelfDependency(string $moduleName, array $dependencies):array
+    {
+        foreach ($dependencies as $id => $modules) {
+            $decodedId = $this->decodeDependencyId($id);
+            $entityType = $decodedId['entityType'];
+            if ($entityType === self::SCHEMA_ENTITY_TABLE || $entityType === "column") {
+                if (array_search($moduleName, $modules) !== false) {
+                    unset($dependencies[$id]);
+                }
+            } else {
+                $dependencies[$id] = $this->filterComplexDependency($moduleName, $modules);
+            }
+        }
+
+        return array_filter($dependencies);
+    }
+
+    /**
+     * Remove already declared dependencies.
+     *
+     * @param string $moduleName
+     * @param array $modules
+     * @return array
+     */
+    private function filterComplexDependency(string $moduleName, array $modules): array
+    {
+        $resultDependencies = [];
+        if (!is_array(reset($modules))) {
+            if (array_search($moduleName, $modules) === false) {
+                $resultDependencies = $modules;
+            }
+        } else {
+            foreach ($modules as $dependencySet) {
+                if (array_search($moduleName, $dependencySet) === false) {
+                    $resultDependencies = array_merge(
+                        $resultDependencies,
+                        $dependencySet
+                    );
+                }
+            }
+        }
+
+        return array_values(array_unique($resultDependencies));
+    }
+
+    /**
+     * Retrieve declarative schema declaration.
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function getDeclarativeSchema(): array
+    {
+        if ($this->dbSchemaDeclaration) {
+            return $this->dbSchemaDeclaration;
+        }
+
+        $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
+        $declaration = [];
+        foreach (Files::init()->getDbSchemaFiles() as $filePath) {
+            $filePath = reset($filePath);
+            preg_match('#app/code/(\w+/\w+)#', $filePath, $result);
+            $moduleName = str_replace('/', '\\', $result[1]);
+            $moduleDeclaration = $this->getDbSchemaDeclaration($filePath);
+
+            foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+                if (!isset($tableDeclaration['modules'])) {
+                    $tableDeclaration['modules'] = [];
+                }
+                array_push($tableDeclaration['modules'], $moduleName);
+                $moduleDeclaration = array_replace_recursive(
+                    $moduleDeclaration,
+                    [self::SCHEMA_ENTITY_TABLE =>
+                        [
+                            $tableName => $tableDeclaration,
+                        ]
+                    ]
+                );
+                foreach ($entityTypes as $entityType) {
+                    if (!isset($tableDeclaration[$entityType])) {
+                        continue;
+                    }
+                    $moduleDeclaration = array_replace_recursive(
+                        $moduleDeclaration,
+                        [self::SCHEMA_ENTITY_TABLE =>
+                            [
+                                $tableName =>
+                                    $this->addModuleAssigment($tableDeclaration, $entityType, $moduleName)
+                            ]
+                        ]
+                    );
+                }
+            }
+            $declaration = array_merge_recursive($declaration, $moduleDeclaration);
+        }
+        $this->dbSchemaDeclaration = $declaration;
+
+        return $this->dbSchemaDeclaration;
+    }
+
+    /**
+     * Get declared dependencies.
+     *
+     * @param string $tableName
+     * @param string $entityType
+     * @param null|string $entityName
+     * @return array
+     * @throws \Exception
+     */
+    private function resolveEntityDependencies(string $tableName, string $entityType, ?string $entityName = null): array
+    {
+        switch ($entityType) {
+            case self::SCHEMA_ENTITY_COLUMN:
+            case self::SCHEMA_ENTITY_CONSTRAINT:
+            case self::SCHEMA_ENTITY_INDEX:
+                return $this->getDeclarativeSchema()
+                [self::SCHEMA_ENTITY_TABLE][$tableName][$entityType][$entityName]['modules'];
+                break;
+            case self::SCHEMA_ENTITY_TABLE:
+                return $this->getDeclarativeSchema()[self::SCHEMA_ENTITY_TABLE][$tableName]['modules'];
+                break;
+            default:
+                return [];
+        }
+    }
+
+    /**
+     * @param string $filePath
+     * @return array
+     */
+    private function getDbSchemaDeclaration(string $filePath): array
+    {
+        $dom = new \DOMDocument();
+        $dom->loadXML(file_get_contents($filePath));
+        return (new Converter())->convert($dom);
+    }
+
+    /**
+     * Add dependency on the current module.
+     *
+     * @param array $tableDeclaration
+     * @param string $entityType
+     * @param string $moduleName
+     * @return array
+     */
+    private function addModuleAssigment(
+        array $tableDeclaration,
+        string $entityType,
+        string $moduleName
+    ): array {
+        $declarationWithAssigment = [];
+        foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
+            if (!isset($entityDeclaration['modules'])) {
+                $entityDeclaration['modules'] = [];
+            }
+            if (!$this->isEntityDisabled($entityDeclaration)) {
+                array_push($entityDeclaration['modules'], $moduleName);
+            }
+
+            $declarationWithAssigment[$entityType][$entityName] = $entityDeclaration;
+        }
+
+        return $declarationWithAssigment;
+    }
+
+    /**
+     * Retrieve dependencies from files.
+     *
+     * @param string $file
+     * @return string[]
+     * @throws \Exception
+     */
+    private function getDependenciesFromFiles($file)
+    {
+        if (!$file) {
+            return [];
+        }
+
+        $moduleDbSchema = $this->getDbSchemaDeclaration($file);
+        $dependencies = array_merge_recursive(
+            $this->getDisabledDependencies($moduleDbSchema),
+            $this->getConstraintDependencies($moduleDbSchema),
+            $this->getIndexDependencies($moduleDbSchema)
+        );
+        return $dependencies;
+    }
+
+    /**
+     * Retrieve dependencies for disabled entities.
+     *
+     * @param array $moduleDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getDisabledDependencies(array $moduleDeclaration): array
+    {
+        $disabledDependencies = [];
+        $entityTypes = [self::SCHEMA_ENTITY_COLUMN, self::SCHEMA_ENTITY_CONSTRAINT, self::SCHEMA_ENTITY_INDEX];
+        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+            foreach ($entityTypes as $entityType) {
+                if (!isset($tableDeclaration[$entityType])) {
+                    continue;
+                }
+                foreach ($tableDeclaration[$entityType] as $entityName => $entityDeclaration) {
+                    if ($this->isEntityDisabled($entityDeclaration)) {
+                        $dependencyIdentifier = $this->getDependencyId($tableName, $entityType, $entityName);
+                        $disabledDependencies[$dependencyIdentifier] =
+                            $this->resolveEntityDependencies($tableName, $entityType, $entityName);
+                    }
+                }
+            }
+            if ($this->isEntityDisabled($tableDeclaration)) {
+                $disabledDependencies[$this->getDependencyId($tableName)] =
+                    $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_TABLE);
+            }
+        }
+
+        return $disabledDependencies;
+    }
+
+    /**
+     * Retrieve dependencies for foreign entities.
+     *
+     * @param array $constraintDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getFKDependencies(array $constraintDeclaration): array
+    {
+        $referenceDependencyIdentifier =
+            $this->getDependencyId(
+                $constraintDeclaration['referenceTable'],
+                self::SCHEMA_ENTITY_CONSTRAINT,
+                $constraintDeclaration['referenceId']
+            );
+        $dependencyIdentifier =
+            $this->getDependencyId(
+                $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
+                self::SCHEMA_ENTITY_CONSTRAINT,
+                $constraintDeclaration['referenceId']
+            );
+
+        $constraintDependencies = [];
+        $constraintDependencies[$referenceDependencyIdentifier] =
+            $this->resolveEntityDependencies(
+                $constraintDeclaration['referenceTable'],
+                self::SCHEMA_ENTITY_COLUMN,
+                $constraintDeclaration['referenceColumn']
+            );
+        $constraintDependencies[$dependencyIdentifier] =
+            $this->resolveEntityDependencies(
+                $constraintDeclaration[self::SCHEMA_ENTITY_TABLE],
+                self::SCHEMA_ENTITY_COLUMN,
+                $constraintDeclaration[self::SCHEMA_ENTITY_COLUMN]
+            );
+
+        return $constraintDependencies;
+    }
+
+    /**
+     * Retrieve dependencies for constraint entities.
+     *
+     * @param array $moduleDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getConstraintDependencies(array $moduleDeclaration): array
+    {
+        $constraintDependencies = [];
+        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+            if (empty($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT])) {
+                continue;
+            }
+            foreach ($tableDeclaration[self::SCHEMA_ENTITY_CONSTRAINT] as $constraintName => $constraintDeclaration) {
+                if ($this->isEntityDisabled($constraintDeclaration)) {
+                    continue;
+                }
+                $dependencyIdentifier =
+                    $this->getDependencyId($tableName, self::SCHEMA_ENTITY_CONSTRAINT, $constraintName);
+                switch ($constraintDeclaration['type']) {
+                    case 'foreign':
+                        $constraintDependencies = array_merge(
+                            $constraintDependencies,
+                            $this->getFKDependencies($constraintDeclaration)
+                        );
+                        break;
+                    case 'primary':
+                    case 'unique':
+                        $constraintDependencies[$dependencyIdentifier] = $this->getComplexDependency(
+                            $tableName,
+                            $constraintDeclaration
+                        );
+                }
+            }
+        }
+        return $constraintDependencies;
+    }
+
+    /**
+     * Calculate complex dependency.
+     *
+     * @param string $tableName
+     * @param array $entityDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getComplexDependency(string $tableName, array $entityDeclaration): array
+    {
+        $complexDependency = [];
+        if (empty($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
+            return $complexDependency;
+        }
+
+        if (!is_array($entityDeclaration[self::SCHEMA_ENTITY_COLUMN])) {
+            $entityDeclaration[self::SCHEMA_ENTITY_COLUMN] = [$entityDeclaration[self::SCHEMA_ENTITY_COLUMN]];
+        }
+
+        foreach (array_keys($entityDeclaration[self::SCHEMA_ENTITY_COLUMN]) as $columnName) {
+            $complexDependency[] =
+                $this->resolveEntityDependencies($tableName, self::SCHEMA_ENTITY_COLUMN, $columnName);
+        }
+
+        return array_values($complexDependency);
+    }
+
+    /**
+     * Retrieve dependencies for index entities.
+     *
+     * @param array $moduleDeclaration
+     * @return array
+     * @throws \Exception
+     */
+    private function getIndexDependencies(array $moduleDeclaration): array
+    {
+        $indexDependencies = [];
+        foreach ($moduleDeclaration[self::SCHEMA_ENTITY_TABLE] as $tableName => $tableDeclaration) {
+            if (empty($tableDeclaration[self::SCHEMA_ENTITY_INDEX])) {
+                continue;
+            }
+            foreach ($tableDeclaration[self::SCHEMA_ENTITY_INDEX] as $indexName => $indexDeclaration) {
+                if ($this->isEntityDisabled($indexDeclaration)) {
+                    continue;
+                }
+                $dependencyIdentifier =
+                    $this->getDependencyId($tableName, self::SCHEMA_ENTITY_INDEX, $indexName);
+                $indexDependencies[$dependencyIdentifier] =
+                    $this->getComplexDependency($tableName, $indexDeclaration);
+            }
+        }
+
+        return $indexDependencies;
+    }
+
+    /**
+     * Check status of the entity declaration.
+     *
+     * @param array $entityDeclaration
+     * @return bool
+     */
+    private function isEntityDisabled(array $entityDeclaration): bool
+    {
+        return isset($entityDeclaration['disabled']) && $entityDeclaration['disabled'] == true;
+    }
+
+    /**
+     * Retrieve dependency id.
+     *
+     * @param string $tableName
+     * @param string $entityType
+     * @param null|string $entityName
+     * @return string
+     */
+    private function getDependencyId(
+        string $tableName,
+        string $entityType = self::SCHEMA_ENTITY_TABLE,
+        ?string $entityName = null
+    ) {
+        return implode('___', [$tableName, $entityType, $entityName ?: $tableName]);
+    }
+
+    /**
+     * Retrieve dependency parameters from dependency id.
+     *
+     * @param string $id
+     * @return array
+     */
+    public static function decodeDependencyId(string $id): array
+    {
+        $decodedValues = explode('___', $id);
+        $result = [
+            'tableName' => $decodedValues[0],
+            'entityType' => $decodedValues[1],
+            'entityName' => $decodedValues[2],
+        ];
+        return $result;
+    }
+
+    /**
+     * Collect module dependencies.
+     *
+     * @param string $currentModuleName
+     * @param array $dependencies
+     * @return array
+     */
+    private function collectDependencies($currentModuleName, $dependencies = [])
+    {
+        if (!count($dependencies)) {
+            return [];
+        }
+        foreach ($dependencies as $dependencyName => $dependency) {
+            $this->collectDependency($dependencyName, $dependency, $currentModuleName);
+        }
+
+        return $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_FOUND);
+    }
+
+    /**
+     * Collect a module dependency.
+     *
+     * @param string $dependencyName
+     * @param array $dependency
+     * @param string $currentModule
+     */
+    private function collectDependency(
+        string $dependencyName,
+        array $dependency,
+        string $currentModule
+    ) {
+        $declared = $this->getDeclaredDependencies($currentModule, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+        $checkResult = array_intersect($declared, $dependency);
+
+        if (empty($checkResult)) {
+            $this->addDependencies(
+                $currentModule,
+                self::TYPE_HARD,
+                self::MAP_TYPE_FOUND,
+                [
+                    $dependencyName => $dependency,
+                ]
+            );
+        }
+    }
+
+    /**
+     * Add dependencies to dependency list.
+     *
+     * @param string $moduleName
+     * @param array $packageNames
+     * @param string $type
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function presetDependencies(
+        string $moduleName,
+        array $packageNames,
+        string $type
+    ): void {
+        $packageNames = array_filter($packageNames, function ($packageName) {
+            return $this->getModuleName($packageName) ||
+                0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
+        });
+
+        foreach ($packageNames as $packageName) {
+            $this->addDependencies(
+                $moduleName,
+                $type,
+                self::MAP_TYPE_DECLARED,
+                [$this->convertModuleName($packageName)]
+            );
+        }
+    }
+
+    /**
+     * Returns package name on module name mapping.
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function getPackageModuleMapping(): array
+    {
+        if (!$this->packageModuleMapping) {
+            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+
+            $packageModuleMapping = [];
+            foreach ($jsonFiles as $file) {
+                $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
+                $moduleName = str_replace('_', '\\', (string)$moduleXml->module->attributes()->name);
+                $composerJson = $this->readJsonFile($file);
+                $packageName = $composerJson->name;
+                $packageModuleMapping[$packageName] = $moduleName;
+            }
+
+            $this->packageModuleMapping = $packageModuleMapping;
+        }
+
+        return $this->packageModuleMapping;
+    }
+
+    /**
+     * Retrieve Magento style module name.
+     *
+     * @param string $packageName
+     * @return null|string
+     * @throws \Exception
+     */
+    private function getModuleName(string $packageName): ?string
+    {
+        return $this->getPackageModuleMapping()[$packageName] ?? null;
+    }
+
+    /**
+     * Retrieve array of dependency items.
+     *
+     * @param $module
+     * @param $type
+     * @param $mapType
+     * @return array
+     */
+    private function getDeclaredDependencies(string $module, string $type, string $mapType)
+    {
+        return $this->mapDependencies[$module][$type][$mapType] ?? [];
+    }
+
+    /**
+     * Add dependency map items.
+     *
+     * @param $module
+     * @param $type
+     * @param $mapType
+     * @param $dependencies
+     */
+    protected function addDependencies(string $module, string $type, string $mapType, array $dependencies)
+    {
+        $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
+            $this->getDeclaredDependencies($module, $type, $mapType),
+            $dependencies
+        );
+    }
+
+    /**
+     * Converts a composer json component name into the Magento Module form.
+     *
+     * @param string $jsonName The name of a composer json component or dependency e.g. 'magento/module-theme'
+     * @return string The corresponding Magento Module e.g. 'Magento\Theme'
+     * @throws \Exception
+     */
+    private function convertModuleName(string $jsonName): string
+    {
+        $moduleName = $this->getModuleName($jsonName);
+        if ($moduleName) {
+            return $moduleName;
+        }
+
+        if (strpos($jsonName, 'magento/magento') !== false
+            || strpos($jsonName, 'magento/framework') !== false
+        ) {
+            $moduleName = str_replace('/', "\t", $jsonName);
+            $moduleName = str_replace('framework-', "Framework\t", $moduleName);
+            $moduleName = str_replace('-', ' ', $moduleName);
+            $moduleName = ucwords($moduleName);
+            $moduleName = str_replace("\t", '\\', $moduleName);
+            $moduleName = str_replace(' ', '', $moduleName);
+        } else {
+            $moduleName = $jsonName;
+        }
+
+        return $moduleName;
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index a4113abed8030..83dd58ce45bdd 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -10,8 +10,8 @@
 
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
 use Magento\TestFramework\Dependency\DbRule;
-use Magento\TestFramework\Dependency\DeclarativeSchemaRule;
 use Magento\TestFramework\Dependency\DiRule;
 use Magento\TestFramework\Dependency\LayoutRule;
 use Magento\TestFramework\Dependency\PhpRule;
@@ -25,19 +25,28 @@
 class DependencyTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * Types of dependencies between modules
+     * Soft dependency between modules
      */
     const TYPE_SOFT = 'soft';
 
+    /**
+     * Hard dependency between modules
+     */
     const TYPE_HARD = 'hard';
 
     /**
-     * Types of dependencies map arrays
+     * The identifier of dependency for mapping.
      */
     const MAP_TYPE_DECLARED = 'declared';
 
+    /**
+     * The identifier of dependency for mapping.
+     */
     const MAP_TYPE_FOUND = 'found';
 
+    /**
+     * The identifier of dependency for mapping.
+     */
     const MAP_TYPE_REDUNDANT = 'redundant';
 
     /**
@@ -56,17 +65,6 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
      */
     protected static $_listConfigXml = [];
 
-    /**
-     * List of db_schema.xml files by modules
-     *
-     * Format: array(
-     *  '{Module_Name}' => '{Filename}'
-     * )
-     *
-     * @var array
-     */
-    protected static $_listDbSchemaXml = [];
-
     /**
      * List of routes.xml files by modules
      *
@@ -174,7 +172,6 @@ public static function setUpBeforeClass()
         self::$_namespaces = implode('|', Files::init()->getNamespaces());
 
         self::_prepareListConfigXml();
-        self::_prepareListDbSchemaXml();
         self::_prepareListRoutesXml();
 
         self::_prepareMapRouters();
@@ -230,7 +227,6 @@ protected static function _initRules()
             $dbRuleTables = array_merge($dbRuleTables, @include $fileName);
         }
         self::$_rulesInstances = [
-            new DeclarativeSchemaRule($dbRuleTables),
             new PhpRule(self::$_mapRouters, self::$_mapLayoutBlocks),
             new DbRule($dbRuleTables),
             new LayoutRule(
@@ -261,7 +257,6 @@ protected function _getCleanedFileContents($fileType, $file)
                 break;
             case 'layout':
             case 'config':
-            case 'db_schema':
                 //Removing xml comments
                 $contents = preg_replace('~\<!\-\-/.*?\-\-\>~s', '', $contents);
                 break;
@@ -285,6 +280,9 @@ function ($matches) use ($contents, &$contentsWithoutHtml) {
         return $contents;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function testUndeclared()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
@@ -416,17 +414,21 @@ private function collectDependency($dependency, $currentModule, &$undeclared)
 
     /**
      * Collect redundant dependencies
+     *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @test
      * @depends testUndeclared
+     * @throws \Exception
      */
     public function collectRedundant()
     {
+        $schemaDependencyProvider = new DeclarativeSchemaDependencyProvider();
         foreach (array_keys(self::$mapDependencies) as $module) {
             $declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
             $found = array_merge(
                 $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND),
-                $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND)
+                $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND),
+                $schemaDependencyProvider->getDeclaredExistingModuleDependencies($module)
             );
             $found['Magento\Framework'] = 'Magento\Framework';
             $this->_setDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT, array_diff($declared, $found));
@@ -487,6 +489,7 @@ protected function _prepareFiles($fileType, $files, $skip = null)
      * Return all files
      *
      * @return array
+     * @throws \Exception
      */
     public function getAllFiles()
     {
@@ -508,12 +511,6 @@ public function getAllFiles()
             $this->_prepareFiles('config', Files::init()->getConfigFiles())
         );
 
-        // Get all configuration files
-        $files = array_merge(
-            $files,
-            $this->_prepareFiles('db_schema', Files::init()->getDbSchemaFiles())
-        );
-
         //Get all layout updates files
         $files = array_merge(
             $files,
@@ -543,20 +540,6 @@ protected static function _prepareListConfigXml()
         }
     }
 
-    /**
-     * Prepare list of db_schema.xml files (by modules)
-     */
-    protected static function _prepareListDbSchemaXml()
-    {
-        $files = Files::init()->getDbSchemaFiles('db_schema.xml', [], false);
-        foreach ($files as $file) {
-            if (preg_match('/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
-                $module = $matches['namespace'] . '\\' . $matches['module'];
-                self::$_listDbSchemaXml[$module] = $file;
-            }
-        }
-    }
-
     /**
      * Prepare list of routes.xml files (by modules)
      */

From 22bd9b2ab045067886855553d0393ee6c847b57d Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Mon, 12 Nov 2018 09:16:41 -0600
Subject: [PATCH 0072/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../Dependency/DeclarativeSchemaRuleTest.php  | 98 -------------------
 1 file changed, 98 deletions(-)
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php

diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
deleted file mode 100644
index 269eff8087a91..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DeclarativeSchemaRuleTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestFramework\Dependency;
-
-/**
- * Test for declarative schema integrity rule.
- *
- * @package Magento\TestFramework\Dependency
- */
-class DeclarativeSchemaRuleTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var DeclarativeSchemaRule
-     */
-    protected $model;
-
-    protected function setUp()
-    {
-        $this->model = new DeclarativeSchemaRule(['some_table' => 'SomeModule']);
-    }
-
-    /**
-     * @param string $module
-     * @param string $file
-     * @param string $contents
-     * @param array $expected
-     * @dataProvider getDependencyInfoDataProvider
-     */
-    public function testGetDependencyInfo($module, $file, $contents, array $expected)
-    {
-        $actualDependencies = $this->model->getDependencyInfo($module, 'db_schema', $file, $contents);
-        $this->assertEquals(
-            $expected,
-            $actualDependencies
-        );
-    }
-
-    public function getDependencyInfoDataProvider()
-    {
-        return [
-            ['any', 'non-db-schema-file.php', 'any', []],
-            [
-                'any',
-                '/app/Magento/Module/etc/db_schema.xml',
-                '<table name="unknown_table"></table>',
-                [['module' => 'Unknown', 'source' => 'unknown_table']]
-            ],
-            [
-                'SomeModule',
-                '/app/some/path/etc/db_schema.xml',
-                '<table name="some_table"></table>',
-                []
-            ],
-            [
-                'any',
-                '/app/some/path/etc/db_schema.xml',
-                '<table name="some_table"></table>',
-                [
-                    [
-                        'module' => 'SomeModule',
-                        'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
-                        'source' => 'some_table',
-                    ]
-                ]
-            ],
-            [
-                'any',
-                '/app/some/path/etc/db_schema.xml',
-                '<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-                    <table name="some_table">
-                        <constraint xsi:type="foreign" 
-                        name="FK_NAME" 
-                        table="some_table" 
-                        column="some_col" 
-                        referenceTable="ref_table" 
-                        referenceColumn="ref_col"
-                        onDelete="CASCADE"/>
-                    </table>
-                </schema>',
-                [
-                    [
-                        'module' => 'SomeModule',
-                        'type' => \Magento\TestFramework\Dependency\RuleInterface::TYPE_HARD,
-                        'source' => 'some_table',
-                    ],
-                    [
-                        'module' => 'Unknown',
-                        'source' => 'ref_table',
-                    ]
-                ]
-            ]
-        ];
-    }
-}

From e27f09f987f289b0a2d3f1e0552f67c63e2e302d Mon Sep 17 00:00:00 2001
From: Erik Pellikka <erik@pellikka.org>
Date: Sat, 17 Nov 2018 23:54:53 +0200
Subject: [PATCH 0073/1055] add missing fields to quote_address

---
 app/code/Magento/Quote/etc/db_schema.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 7dd215b87e8cc..ec06077cbe43b 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -202,6 +202,8 @@
         <column xsi:type="text" name="vat_request_date" nullable="true" comment="Vat Request Date"/>
         <column xsi:type="smallint" name="vat_request_success" padding="6" unsigned="false" nullable="true"
                 identity="false" comment="Vat Request Success"/>
+        <column xsi:type="text" name="validated_country_code" nullable="true" comment="Validated Country Code"/>
+        <column xsi:type="text" name="validated_vat_number" nullable="true" comment="Validated Vat Number"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="address_id"/>
         </constraint>

From 7f15bd86241bace94cdc77b5487bc7f593482a69 Mon Sep 17 00:00:00 2001
From: Erik Pellikka <erik@pellikka.org>
Date: Mon, 19 Nov 2018 17:49:14 +0200
Subject: [PATCH 0074/1055] add translations for the new columns

---
 app/code/Magento/Quote/i18n/en_US.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Quote/i18n/en_US.csv b/app/code/Magento/Quote/i18n/en_US.csv
index ae7453aa0d0cc..b24179297493a 100644
--- a/app/code/Magento/Quote/i18n/en_US.csv
+++ b/app/code/Magento/Quote/i18n/en_US.csv
@@ -65,3 +65,5 @@ error345,error345
 Carts,Carts
 "Manage carts","Manage carts"
 "Invalid state change requested","Invalid state change requested"
+"Validated Country Code","Validated Country Code"
+"Validated Vat Number","Validated Vat Number"

From 84279f77ea2618ff98ec418155979c2dcee95ae5 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Thu, 29 Nov 2018 11:40:23 +0100
Subject: [PATCH 0075/1055] GET requests support for queries

---
 app/code/Magento/GraphQl/Controller/GraphQl.php           | 7 ++++++-
 .../HttpHeaderProcessor/ContentTypeProcessor.php          | 5 +++--
 .../Controller/HttpHeaderProcessor/StoreProcessor.php     | 8 ++++----
 .../GraphQl/Controller/HttpHeaderProcessorInterface.php   | 5 ++++-
 .../Magento/GraphQl/Controller/HttpRequestProcessor.php   | 2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index c4a0b55de9bfc..bf48d821eb429 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -108,7 +108,12 @@ public function dispatch(RequestInterface $request) : ResponseInterface
         try {
             /** @var Http $request */
             $this->requestProcessor->processHeaders($request);
-            $data = $this->jsonSerializer->unserialize($request->getContent());
+            if ($request->isPost()) {
+                $data = $this->jsonSerializer->unserialize($request->getContent());
+            } else {
+                $data = $request->getParams();
+                $data['variables'] = $this->jsonSerializer->unserialize($data['variables']);
+            }
 
             $query = isset($data['query']) ? $data['query'] : '';
 
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
index 2270f2616e67b..7e3e34ad79c02 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Controller\HttpHeaderProcessor;
 
+use Magento\Framework\App\HttpRequestInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
 
@@ -18,10 +19,10 @@ class ContentTypeProcessor implements HttpHeaderProcessorInterface
     /**
      * Handle the mandatory application/json header
      *
-     * {@inheritDoc}
+     * @inheritDoc
      * @throws LocalizedException
      */
-    public function processHeaderValue(string $headerValue) : void
+    public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void
     {
         if (!$headerValue || strpos($headerValue, 'application/json') === false) {
             throw new LocalizedException(
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
index be359eafdf246..e92ff374eb355 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
@@ -7,7 +7,7 @@
 
 namespace Magento\GraphQl\Controller\HttpHeaderProcessor;
 
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\App\HttpRequestInterface;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -35,10 +35,10 @@ public function __construct(StoreManagerInterface $storeManager)
     /**
      * Handle the value of the store and set the scope
      *
-     * {@inheritDoc}
-     * @throws NoSuchEntityException
+     * @inheritDoc
+     * @throws GraphQlInputException
      */
-    public function processHeaderValue(string $headerValue) : void
+    public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void
     {
         if ($headerValue) {
             $storeCode = ltrim(rtrim($headerValue));
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php
index a20f88a4ef995..b38b96714eab2 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php
@@ -7,6 +7,8 @@
 
 namespace Magento\GraphQl\Controller;
 
+use Magento\Framework\App\HttpRequestInterface;
+
 /**
  * Use this interface to implement a processor for each entry of a header in an HTTP GraphQL request.
  */
@@ -19,7 +21,8 @@ interface HttpHeaderProcessorInterface
      * to enforce required headers like "application/json"
      *
      * @param string $headerValue
+     * @param HttpRequestInterface $request
      * @return void
      */
-    public function processHeaderValue(string $headerValue) : void;
+    public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void;
 }
diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php b/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
index 5e42b81a61981..5d1c970a358a3 100644
--- a/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
@@ -36,7 +36,7 @@ public function __construct(array $graphQlHeaders = [])
     public function processHeaders(Http $request) : void
     {
         foreach ($this->headerProcessors as $headerName => $headerClass) {
-            $headerClass->processHeaderValue((string)$request->getHeader($headerName));
+            $headerClass->processHeaderValue((string)$request->getHeader($headerName), $request);
         }
     }
 }

From 6c5dd94b88bcb34f620c7e84d5aa458bd2132307 Mon Sep 17 00:00:00 2001
From: Sarfaraz Bheda <sarfaraz.bheda@krishtechnolabs.com>
Date: Sat, 24 Nov 2018 16:16:25 +0530
Subject: [PATCH 0076/1055] 19276 - Fixed price renderer issue

---
 .../Swatches/view/frontend/web/js/swatch-renderer.js  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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 63dbd31751e85..0f8677cb5d1a2 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
@@ -902,7 +902,8 @@ define([
                 $productPrice = $product.find(this.options.selectorProductPrice),
                 options = _.object(_.keys($widget.optionsMap), {}),
                 result,
-                tierPriceHtml;
+                tierPriceHtml,
+                isShow;
 
             $widget.element.find('.' + $widget.options.classes.attributeClass + '[option-selected]').each(function () {
                 var attributeId = $(this).attr('attribute-id');
@@ -919,11 +920,9 @@ define([
                 }
             );
 
-            if (typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount) {
-                $(this.options.slyOldPriceSelector).show();
-            } else {
-                $(this.options.slyOldPriceSelector).hide();
-            }
+            isShow = typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount;
+
+            $product.find(this.options.slyOldPriceSelector)[isShow ? 'show' : 'hide']();
 
             if (typeof result != 'undefined' && result.tierPrices.length) {
                 if (this.options.tierPriceTemplate) {

From 2c92422b0e5ff6336a4eadbfe3127acd73a7a8a5 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Fri, 30 Nov 2018 11:21:04 -0600
Subject: [PATCH 0077/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../TestFramework/Dependency/DiRule.php       | 30 ++++++++++++++-----
 .../DeclarativeSchemaDependencyProvider.php   |  4 +--
 .../_files/dependency_test/tables_ce.php      |  2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
index cdaa49e8d37fb..8eda14dd28165 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
@@ -7,11 +7,13 @@
  */
 namespace Magento\TestFramework\Dependency;
 
-use DOMDocument;
-use DOMXPath;
+use Magento\Framework\App\Utility\Classes;
 use Magento\Framework\App\Utility\Files;
 use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
 
+/**
+ * Class provide dependency rule for di.xml config files.
+ */
 class DiRule implements RuleInterface
 {
     /**
@@ -33,6 +35,8 @@ public function __construct(VirtualTypeMapper $mapper)
     }
 
     /**
+     * Get class name pattern.
+     *
      * @return string
      * @throws \Exception
      */
@@ -99,12 +103,14 @@ public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
     }
 
     /**
+     * Fetch all possible dependencies.
+     *
      * @param string $contents
      * @return array
      */
     private function fetchPossibleDependencies($contents)
     {
-        $doc = new DOMDocument();
+        $doc = new \DOMDocument();
         $doc->loadXML($contents);
         return [
             RuleInterface::TYPE_SOFT => $this->getSoftDependencies($doc),
@@ -113,16 +119,22 @@ private function fetchPossibleDependencies($contents)
     }
 
     /**
-     * @param DOMDocument $doc
+     * Collect soft dependencies.
+     *
+     * @param \DOMDocument $doc
      * @return array
      */
-    private function getSoftDependencies(DOMDocument $doc)
+    private function getSoftDependencies(\DOMDocument $doc)
     {
         $result = [];
         foreach (self::$tagNameMap as $tagName => $attributeNames) {
             $nodes = $doc->getElementsByTagName($tagName);
         /** @var \DOMElement $node */
             foreach ($nodes as $node) {
+                if ($tagName === 'virtualType' && !$node->getAttribute('type')) {
+                    $result[] = Classes::resolveVirtualType($node->getAttribute('name'));
+                    continue;
+                }
                 foreach ($attributeNames as $attributeName) {
                     $result[] = $node->getAttribute($attributeName);
                 }
@@ -133,13 +145,15 @@ private function getSoftDependencies(DOMDocument $doc)
     }
 
     /**
-     * @param DOMDocument $doc
+     * Collect hard dependencies.
+     *
+     * @param \DOMDocument $doc
      * @return array
      */
-    private function getHardDependencies(DOMDocument $doc)
+    private function getHardDependencies(\DOMDocument $doc)
     {
         $result = [];
-        $xpath = new DOMXPath($doc);
+        $xpath = new \DOMXPath($doc);
         $textNodes = $xpath->query('//*[@xsi:type="object"]');
         /** @var \DOMElement $node */
         foreach ($textNodes as $node) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
index b9050721c6910..f406291603757 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -92,7 +92,7 @@ public function getDeclaredExistingModuleDependencies(string $moduleName): array
         foreach ($dependencies as $dependency) {
             $checkResult = array_intersect($declared, $dependency);
             if ($checkResult) {
-                $existingDeclared = array_merge(array_values($checkResult));
+                $existingDeclared = array_merge($existingDeclared, array_values($checkResult));
             }
         }
 
@@ -756,4 +756,4 @@ private function convertModuleName(string $jsonName): string
 
         return $moduleName;
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
index 530f55504d009..3fb53be2ec400 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
@@ -96,7 +96,7 @@
     'catalogrule_website'                         => 'Magento\CatalogRule',
     'catalogsearch_fulltext'                      => 'Magento\CatalogSearch',
     'catalogsearch_result'                        => 'Magento\CatalogSearch',
-    'search_query'                                => 'Magento\CatalogSearch',
+    'search_query'                                => 'Magento\Search',
     'checkout_agreement'                          => 'Magento\Checkout',
     'checkout_agreement_store'                    => 'Magento\Checkout',
     'cms_block'                                   => 'Magento\Cms',

From 8485985b61ac4633943fe6911f4af68f90cce05f Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Sun, 2 Dec 2018 01:29:42 -0600
Subject: [PATCH 0078/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../Magento/Test/Integrity/DependencyTest.php     | 15 ++++++++++++++-
 .../undetected_dependencies_ce.php                | 10 ++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/undetected_dependencies_ce.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index 83dd58ce45bdd..3b1e4aecedb54 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -221,7 +221,7 @@ protected static function _initThemes()
      */
     protected static function _initRules()
     {
-        $replaceFilePattern = str_replace('\\', '/', realpath(__DIR__)) . '/_files/dependency_test/*.php';
+        $replaceFilePattern = str_replace('\\', '/', realpath(__DIR__)) . '/_files/dependency_test/tables_*.php';
         $dbRuleTables = [];
         foreach (glob($replaceFilePattern) as $fileName) {
             $dbRuleTables = array_merge($dbRuleTables, @include $fileName);
@@ -423,6 +423,14 @@ private function collectDependency($dependency, $currentModule, &$undeclared)
     public function collectRedundant()
     {
         $schemaDependencyProvider = new DeclarativeSchemaDependencyProvider();
+
+        /** TODO: Remove this temporary solution after MC-5806 is closed */
+        $filePattern = __DIR__ . '/_files/dependency_test/undetected_dependencies_*.php';
+        $undetectedDependencies = [];
+        foreach (glob($filePattern) as $fileName) {
+            $undetectedDependencies = array_merge($undetectedDependencies, require $fileName);
+        }
+
         foreach (array_keys(self::$mapDependencies) as $module) {
             $declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
             $found = array_merge(
@@ -430,6 +438,11 @@ public function collectRedundant()
                 $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND),
                 $schemaDependencyProvider->getDeclaredExistingModuleDependencies($module)
             );
+            /** TODO: Remove this temporary solution after MC-5806 is closed */
+            if (!empty($undetectedDependencies[$module])) {
+                $found = array_merge($found, $undetectedDependencies[$module]);
+            }
+
             $found['Magento\Framework'] = 'Magento\Framework';
             $this->_setDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT, array_diff($declared, $found));
         }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/undetected_dependencies_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/undetected_dependencies_ce.php
new file mode 100644
index 0000000000000..407f57ee51257
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/undetected_dependencies_ce.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+return [
+    "Magento\Search" => ["Magento\CatalogSearch"]
+];

From eb05687374d1c1189d2b7233ba2f86a66201418d Mon Sep 17 00:00:00 2001
From: Suneet <suneet64@gmail.com>
Date: Mon, 3 Dec 2018 21:07:21 +0530
Subject: [PATCH 0079/1055] Fixed fatal error if upgrading from Magento 2.0.0
 to 2.3 and manufacturer and color attribute missing

---
 .../InstallInitialConfigurableAttributes.php  | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
index f69d8529fb801..6e608b172b6b1 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
@@ -64,18 +64,21 @@ public function apply()
             'color'
         ];
         foreach ($attributes as $attributeCode) {
-            $relatedProductTypes = explode(
-                ',',
-                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to')
-            );
-            if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
-                $relatedProductTypes[] = Configurable::TYPE_CODE;
-                $eavSetup->updateAttribute(
-                    \Magento\Catalog\Model\Product::ENTITY,
-                    $attributeCode,
-                    'apply_to',
-                    implode(',', $relatedProductTypes)
+            $attribute = $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to');
+            if ($attribute) {
+                $relatedProductTypes = explode(
+                    ',',
+                    $attribute
                 );
+                if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
+                    $relatedProductTypes[] = Configurable::TYPE_CODE;
+                    $eavSetup->updateAttribute(
+                        \Magento\Catalog\Model\Product::ENTITY,
+                        $attributeCode,
+                        'apply_to',
+                        implode(',', $relatedProductTypes)
+                    );
+                }
             }
         }
     }

From b5115c2340d8ae9b71851c795b1529027d9fc402 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 4 Dec 2018 12:30:52 +0200
Subject: [PATCH 0080/1055] MAGETWO-96505: Fixed incorrect stacktrace
 displaying

---
 .../NewRelicReporting/Model/NewRelicWrapper.php     |  6 +++++-
 app/code/Magento/User/Model/User.php                | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
index ec21e06976b8b..1407a64e0f660 100644
--- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
+++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
@@ -37,7 +37,11 @@ public function addCustomParameter($param, $value)
     public function reportError($exception)
     {
         if (extension_loaded('newrelic')) {
-            newrelic_notice_error($exception->getMessage(), $exception);
+            if ($exception instanceof \Zend_Db_Statement_Exception || $exception instanceof \PDOException) {
+                newrelic_notice_error($exception->getMessage());
+            } else {
+                newrelic_notice_error($exception->getMessage(), $exception);
+            }
         }
     }
 
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 4050d79e593ee..d7aa9d76546fd 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -7,6 +7,7 @@
 namespace Magento\User\Model;
 
 use Magento\Backend\Model\Auth\Credential\StorageInterface;
+use Magento\Checkout\Exception;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Exception\AuthenticationException;
@@ -629,8 +630,18 @@ public function verifyIdentity($password)
     public function login($username, $password)
     {
         if ($this->authenticate($username, $password)) {
-            $this->getResource()->recordLogin($this);
+            try {
+                $this->getResource()->recordLogin($this);
+            } catch (\Exception $exception) {
+                if ($exception instanceof \Zend_Db_Statement_Exception
+                    || $exception instanceof \PDOException) {
+                    $this->_logger->critical($exception);
+
+                    throw new \Exception($exception->getMessage());
+                }
+            }
         }
+
         return $this;
     }
 

From 8ff351ce7de4301fcb232074654afa9a7f6683d9 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Tue, 4 Dec 2018 20:03:08 +0300
Subject: [PATCH 0081/1055] MAGETWO-96127: Catalog grid page number resets
 after Save and Close action

- Change behavior for calculating current page
---
 .../Ui/view/base/web/js/grid/paging/paging.js        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
index abd79e797e413..432a0a214a439 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
@@ -43,10 +43,14 @@ define([
                 current: '${ $.provider }:params.paging.current'
             },
 
+            statefull: {
+                current: true
+            },
+
             listens: {
-                'pages': 'onPagesChange',
-                'pageSize': 'onPageSizeChange',
                 'totalRecords': 'updateCounter',
+                'pages': 'updateCounter',
+                'pageSize': 'onPageSizeChange',
                 '${ $.provider }:params.filters': 'goFirst'
             },
 
@@ -236,7 +240,9 @@ define([
 
             this.previousSize = size;
 
-            this.setPage(cursor);
+            if (!isNaN(delta)) {
+                this.setPage(cursor);
+            }
 
             return this;
         },

From 55c0662fe5c2d053d1d2dd11f674a1265d6b57ea Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Fri, 7 Dec 2018 18:00:54 +0300
Subject: [PATCH 0082/1055] MAGETWO-96127: Catalog grid page number resets
 after Save and Close action

- Track current value of page number when you first start
---
 app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
index 432a0a214a439..5db420685f718 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
@@ -43,6 +43,10 @@ define([
                 current: '${ $.provider }:params.paging.current'
             },
 
+            tracks: {
+                current: true
+            },
+
             statefull: {
                 current: true
             },

From 03d6b01998af379e7449ba07fe51547117fe2d49 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 7 Dec 2018 14:47:19 -0600
Subject: [PATCH 0083/1055] MC-5899: Incorrect Rss Wishlist response

---
 .../Magento/Wishlist/Model/Rss/Wishlist.php   | 14 ++-
 .../Magento/Rss/Controller/Feed/IndexTest.php | 89 +++++++++++++++++++
 .../two_wishlists_for_two_diff_customers.php  | 25 ++++++
 ...hlists_for_two_diff_customers_rollback.php | 19 ++++
 4 files changed, 139 insertions(+), 8 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php

diff --git a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
index 9ccbf80f99a0c..ff59e0cdd7b91 100644
--- a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
@@ -118,10 +118,8 @@ public function __construct(
      */
     public function isAllowed()
     {
-        return $this->scopeConfig->isSetFlag(
-            'rss/wishlist/active',
-            ScopeInterface::SCOPE_STORE
-        );
+        return $this->scopeConfig->isSetFlag('rss/wishlist/active', ScopeInterface::SCOPE_STORE)
+            && $this->getWishlist()->getCustomerId() === $this->wishlistHelper->getCustomer()->getId();
     }
 
     /**
@@ -185,8 +183,8 @@ public function getRssData()
             }
         } else {
             $data = [
-                'title' => __('We cannot retrieve the Wish List.'),
-                'description' => __('We cannot retrieve the Wish List.'),
+                'title' => __('We cannot retrieve the Wish List.')->render(),
+                'description' => __('We cannot retrieve the Wish List.')->render(),
                 'link' => $this->urlBuilder->getUrl(),
                 'charset' => 'UTF-8',
             ];
@@ -202,7 +200,7 @@ public function getRssData()
      */
     public function getCacheKey()
     {
-        return 'rss_wishlist_data';
+        return 'rss_wishlist_data_' . $this->getWishlist()->getId();
     }
 
     /**
@@ -224,7 +222,7 @@ public function getHeader()
     {
         $customerId = $this->getWishlist()->getCustomerId();
         $customer = $this->customerFactory->create()->load($customerId);
-        $title = __('%1\'s Wishlist', $customer->getName());
+        $title = __('%1\'s Wishlist', $customer->getName())->render();
         $newUrl = $this->urlBuilder->getUrl(
             'wishlist/shared/index',
             ['code' => $this->getWishlist()->getSharingCode()]
diff --git a/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
new file mode 100644
index 0000000000000..26d989d655ade
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Rss\Controller\Feed;
+
+class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @var \Magento\Rss\Model\UrlBuilder
+     */
+    private $urlBuilder;
+
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var \Magento\Wishlist\Model\Wishlist
+     */
+    private $wishlist;
+
+    /**
+     * @var
+     */
+    private $customerSession;
+
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->urlBuilder = $this->_objectManager->get(\Magento\Rss\Model\UrlBuilder::class);
+        $this->customerRepository = $this->_objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $this->wishlist = $this->_objectManager->get(\Magento\Wishlist\Model\Wishlist::class);
+        $this->customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
+    }
+
+    /**
+     * Check Rss response.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
+     * @magentoConfigFixture current_store rss/wishlist/active 1
+     * @magentoConfigFixture current_store rss/config/active 1
+     */
+    public function testRssResponse()
+    {
+        $firstCustomerId = 1;
+        $this->customerSession->setCustomerId($firstCustomerId);
+        $customer = $this->customerRepository->getById($firstCustomerId);
+        $customerEmail = $customer->getEmail();
+        $wishlistId = $this->wishlist->loadByCustomerId($firstCustomerId)->getId();
+        $this->dispatch($this->getLink($firstCustomerId, $customerEmail, $wishlistId));
+        $body = $this->getResponse()->getBody();
+        $this->assertContains('<title>John Smith\'s Wishlist</title>', $body);
+    }
+
+    /**
+     * Check Rss with incorrect wishlist id.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
+     * @magentoConfigFixture current_store rss/wishlist/active 1
+     * @magentoConfigFixture current_store rss/config/active 1
+     */
+    public function testRssResponseWithIncorrectWishlistId()
+    {
+        $firstCustomerId = 1;
+        $secondCustomerId = 2;
+        $this->customerSession->setCustomerId($firstCustomerId);
+        $customer = $this->customerRepository->getById($firstCustomerId);
+        $customerEmail = $customer->getEmail();
+        $wishlistId = $this->wishlist->loadByCustomerId($secondCustomerId, true)->getId();
+        $this->dispatch($this->getLink($firstCustomerId, $customerEmail, $wishlistId));
+        $body = $this->getResponse()->getBody();
+        $this->assertContains('<title>404 Not Found</title>', $body);
+    }
+
+    private function getLink($customerId, $customerEmail, $wishlistId)
+    {
+
+        return 'rss/feed/index/type/wishlist/data/'
+            . base64_encode($customerId . ',' . $customerEmail)
+            . '/wishlist_id/' . $wishlistId;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
new file mode 100644
index 0000000000000..a71c9c9ba3c6f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Customer/_files/two_customers.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+
+$firstCustomerIdFromFixture = 1;
+$wishlistForFirstCustomer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Wishlist\Model\Wishlist::class
+);
+$wishlistForFirstCustomer->loadByCustomerId($firstCustomerIdFromFixture, true);
+$item = $wishlistForFirstCustomer->addNewItem($product, new \Magento\Framework\DataObject([]));
+$wishlistForFirstCustomer->save();
+
+$secondCustomerIdFromFixture = 2;
+$wishlistForSecondCustomer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Wishlist\Model\Wishlist::class
+);
+$wishlistForSecondCustomer->loadByCustomerId($secondCustomerIdFromFixture, true);
+$item = $wishlistForSecondCustomer->addNewItem($product, new \Magento\Framework\DataObject([]));
+$wishlistForSecondCustomer->save();
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php
new file mode 100644
index 0000000000000..4baba3b9f77c8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
+$wishlist->loadByCustomerId(1);
+$wishlist->delete();
+$wishlist->loadByCustomerId(2);
+$wishlist->delete();
+
+require __DIR__ . '/../../../Magento/Customer/_files/two_customers_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';

From b92bbc41c6f76e50b02922067d3df208501a56f6 Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Sat, 8 Dec 2018 12:00:48 +0530
Subject: [PATCH 0084/1055] Fixed-#18017 magento 2.3

---
 .../Swatches/view/frontend/web/js/swatch-renderer.js   | 10 +++++++++-
 1 file changed, 9 insertions(+), 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 0a8675067ea5d..cfb29b27bdef4 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
@@ -1223,7 +1223,15 @@ define([
                 }
 
                 imagesToUpdate = this._setImageIndex(imagesToUpdate);
-                gallery.updateData(imagesToUpdate);
+                
+                if (gallery === undefined) {
+                    context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
+                        loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
+                        loadedGallery.updateData(imagesToUpdate);
+                    }.bind(this));
+                } else {
+                    gallery.updateData(imagesToUpdate);
+                }
 
                 if (isInitial) {
                     $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();

From 95d5f44f6654a3db1ad6eb2b0b17b007f67bc3de Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Sat, 8 Dec 2018 18:06:04 +0530
Subject: [PATCH 0085/1055] Fixed Code Improovement

---
 .../Swatches/view/frontend/web/js/swatch-renderer.js   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 cfb29b27bdef4..77c1f208f68c9 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
@@ -1223,7 +1223,6 @@ define([
                 }
 
                 imagesToUpdate = this._setImageIndex(imagesToUpdate);
-                
                 if (gallery === undefined) {
                     context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
                         loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
@@ -1242,7 +1241,14 @@ define([
                     });
                 }
 
-                gallery.first();
+                if (gallery === undefined) {
+                    context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
+                        loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
+                        loadedGallery.first();
+                    }.bind(this));
+                } else {
+                    gallery.first();
+                }
 
             } else if (justAnImage && justAnImage.img) {
                 context.find('.product-image-photo').attr('src', justAnImage.img);

From 30c3eac83641969f6a38fdf1f52eac903520ea52 Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Mon, 10 Dec 2018 10:02:27 +0530
Subject: [PATCH 0086/1055] Code Improovement and changes as suggested

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

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 77c1f208f68c9..45cd85b32d579 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
@@ -1223,7 +1223,7 @@ define([
                 }
 
                 imagesToUpdate = this._setImageIndex(imagesToUpdate);
-                if (gallery === undefined) {
+                if (typeof gallery === undefined) {
                     context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
                         loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
                         loadedGallery.updateData(imagesToUpdate);
@@ -1241,7 +1241,7 @@ define([
                     });
                 }
 
-                if (gallery === undefined) {
+                if (typeof gallery === undefined) {
                     context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
                         loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
                         loadedGallery.first();

From ee64ecdf5e03deae2aa8734892cd51aff398543c Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Mon, 10 Dec 2018 10:35:24 +0530
Subject: [PATCH 0087/1055] code changes as per PSR4

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

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 45cd85b32d579..8b8b76accd12f 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
@@ -1223,6 +1223,7 @@ define([
                 }
 
                 imagesToUpdate = this._setImageIndex(imagesToUpdate);
+
                 if (typeof gallery === undefined) {
                     context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
                         loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');

From db29b1f92d434f6346baf53490129cf4e516e5c7 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Mon, 10 Dec 2018 09:44:01 -0600
Subject: [PATCH 0088/1055] MC-5899: Incorrect Rss Wishlist response - fix
 tests

---
 .../Test/Unit/Model/Rss/WishlistTest.php      | 22 ++++++++++++++++++-
 .../Magento/Rss/Controller/Feed/IndexTest.php |  4 +++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
index 85f6c504457d3..fc43baa0a67de 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
@@ -278,15 +278,35 @@ protected function processWishlistItemDescription($wishlistModelMock, $staticArg
 
     public function testIsAllowed()
     {
+        $customerId = 1;
+        $customerServiceMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $wishlist = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)->setMethods(
+            ['getId', '__wakeup', 'getCustomerId', 'getItemCollection', 'getSharingCode']
+        )->disableOriginalConstructor()->getMock();
+        $wishlist->expects($this->once())->method('getCustomerId')->willReturn($customerId);
+        $this->wishlistHelperMock->expects($this->any())->method('getWishlist')
+            ->will($this->returnValue($wishlist));
+        $this->wishlistHelperMock->expects($this->any())
+            ->method('getCustomer')
+            ->will($this->returnValue($customerServiceMock));
+        $customerServiceMock->expects($this->once())->method('getId')->willReturn($customerId);
         $this->scopeConfig->expects($this->once())->method('isSetFlag')
             ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
+
         $this->assertTrue($this->model->isAllowed());
     }
 
     public function testGetCacheKey()
     {
-        $this->assertEquals('rss_wishlist_data', $this->model->getCacheKey());
+        $wishlistId = 1;
+        $wishlist = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)->setMethods(
+            ['getId', '__wakeup', 'getCustomerId', 'getItemCollection', 'getSharingCode']
+        )->disableOriginalConstructor()->getMock();
+        $wishlist->expects($this->once())->method('getId')->willReturn($wishlistId);
+        $this->wishlistHelperMock->expects($this->any())->method('getWishlist')
+            ->will($this->returnValue($wishlist));
+        $this->assertEquals('rss_wishlist_data_1', $this->model->getCacheKey());
     }
 
     public function testGetCacheLifetime()
diff --git a/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
index 26d989d655ade..9a611b8f2b9ea 100644
--- a/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
@@ -33,7 +33,9 @@ protected function setUp()
     {
         parent::setUp();
         $this->urlBuilder = $this->_objectManager->get(\Magento\Rss\Model\UrlBuilder::class);
-        $this->customerRepository = $this->_objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $this->customerRepository = $this->_objectManager->get(
+            \Magento\Customer\Api\CustomerRepositoryInterface::class
+        );
         $this->wishlist = $this->_objectManager->get(\Magento\Wishlist\Model\Wishlist::class);
         $this->customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
     }

From af0a57d164fcd8e36af211719405af5321710d0f Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Wed, 12 Dec 2018 12:37:19 +0400
Subject: [PATCH 0089/1055] MAGETWO-96127: Catalog grid page number resets
 after Save and Close action

- Added automation test
---
 ...dPageNumberAfterSaveAndCloseActionTest.xml | 59 +++++++++++++++++++
 .../AdminDataGridPaginationActionGroup.xml    | 10 ++++
 .../AdminDataGridPaginationSection.xml        |  2 +
 3 files changed, 71 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
new file mode 100644
index 0000000000000..5e6fb4c989c7d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
@@ -0,0 +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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminGridPageNumberAfterSaveAndCloseActionTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Checking Catalog grid page number after Save and Close action"/>
+            <description value="Checking Catalog grid page number after Save and Close action"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96164"/>
+            <useCaseId value="MAGETWO-96127"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData stepKey="category1" entity="SimpleSubCategory"/>
+            <createData stepKey="product1" entity="SimpleProduct">
+                <requiredEntity createDataKey="category1"/>
+            </createData>
+            <createData stepKey="category2" entity="SimpleSubCategory"/>
+            <createData stepKey="product2" entity="SimpleProduct">
+                <requiredEntity createDataKey="category2"/>
+            </createData>
+        </before>
+        <after>
+            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
+            <waitForPageLoad stepKey="waitForProductIndexPage"/>
+            <actionGroup ref="adminDataGridDeleteCustomPerPage" stepKey="deleteCustomAddedPerPage">
+                <argument name="perPage" value="Const.one"/>
+            </actionGroup>
+            <deleteData stepKey="deleteCategory1" createDataKey="category1"/>
+            <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
+            <deleteData stepKey="deleteCategory2" createDataKey="category2"/>
+            <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="adminDataGridSelectCustomPerPage" stepKey="select1OrderPerPage">
+            <argument name="perPage" value="Const.one"/>
+        </actionGroup>
+        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="1" stepKey="seeOnFirstPageOrderGrid"/>
+        <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid" after="seeOnFirstPageOrderGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
+            <argument name="product" value="$$product2$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminFormSaveAndClose" stepKey="saveAndCloseProduct"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondPageOrderGrid"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
index 9148c22976c19..46417a842c9c2 100644
--- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
@@ -27,4 +27,14 @@
         <click selector="{{AdminDataGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
     </actionGroup>
+
+    <actionGroup name="adminDataGridDeleteCustomPerPage">
+        <arguments>
+            <argument name="perPage"/>
+        </arguments>
+        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown1"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageEditCustomValue(perPage)}}" stepKey="clickToEditCustomPerPage"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageDeleteCustomValue(perPage)}}" stepKey="clickToDeleteCustomPerPage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
index 0f54f51549e7a..17d20305233b4 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
@@ -13,6 +13,8 @@
         <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{var1}}']" parameterized="true"/>
         <element name="perPageInput" type="input" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//input"/>
         <element name="perPageApplyInput" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//button"/>
+        <element name="perPageEditCustomValue" type="button" selector="//div[@class='selectmenu-items _active']//div[@class='selectmenu-item']//button[text()='{{var1}}']/following-sibling::button[@class='action-edit']" parameterized="true"/>
+        <element name="perPageDeleteCustomValue" type="button" selector="//div[@class='selectmenu-items _active']//div[@class='selectmenu-item']//button[text()='{{var2}}']/parent::div/preceding-sibling::div/button[@class='action-delete']" parameterized="true"/>
         <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>
         <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous" timeout="30"/>
         <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>

From 6b9aa47cc9bb2574360858802444e546b091dbf9 Mon Sep 17 00:00:00 2001
From: Jaimin Sutariya <jaimin.sutariya@krishtechnolabs.com>
Date: Fri, 14 Dec 2018 11:27:43 +0530
Subject: [PATCH 0090/1055] Resolved undefined index issue for import adapter

---
 .../ImportExport/Model/Import/Entity/AbstractEntity.php       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index 1fc3257ff2c1e..2a861be1fe97b 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -408,7 +408,9 @@ protected function _saveValidatedBunches()
             if ($source->valid()) {
                 try {
                     $rowData = $source->current();
-                    $skuSet[$rowData['sku']] = true;
+                    if (array_key_exists('sku', $rowData)) {
+                        $skuSet[$rowData['sku']] = true;
+                    }
                 } catch (\InvalidArgumentException $e) {
                     $this->addRowError($e->getMessage(), $this->_processedRowsCount);
                     $this->_processedRowsCount++;

From a3f022e9667747f58aec6d81d366b097149af66b Mon Sep 17 00:00:00 2001
From: Wouter Samaey <wouter.samaey@storefront.be>
Date: Tue, 18 Dec 2018 11:21:15 +0100
Subject: [PATCH 0091/1055] MUI controller lacks JSON return, instead returns
 status 200 with empty body

---
 app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index b983e56b8aee2..25c916550a850 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -86,6 +86,14 @@ public function execute()
 
                 $contentType = $this->contentTypeResolver->resolve($component->getContext());
                 $this->getResponse()->setHeader('Content-Type', $contentType, true);
+            }else {
+                /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+                $resultJson = $this->resultJsonFactory->create();
+                $resultJson->setStatusHeader(
+                    \Zend\Http\Response::STATUS_CODE_403,
+                    \Zend\Http\AbstractMessage::VERSION_11,
+                    'Forbidden'
+                );
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->logger->critical($e);

From 0a0d65ea78edde0206b819b6131aa91a94374292 Mon Sep 17 00:00:00 2001
From: Wouter Samaey <wouter.samaey@storefront.be>
Date: Tue, 18 Dec 2018 11:21:15 +0100
Subject: [PATCH 0092/1055] MUI controller lacks JSON return, instead returns
 status 200 with empty body

---
 .../Magento/Ui/Controller/Adminhtml/Index/Render.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index b983e56b8aee2..ebca3aef7ddf3 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -86,6 +86,18 @@ public function execute()
 
                 $contentType = $this->contentTypeResolver->resolve($component->getContext());
                 $this->getResponse()->setHeader('Content-Type', $contentType, true);
+            }else {
+                /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+                $resultJson = $this->resultJsonFactory->create();
+                $resultJson->setStatusHeader(
+                    \Zend\Http\Response::STATUS_CODE_403,
+                    \Zend\Http\AbstractMessage::VERSION_11,
+                    'Forbidden'
+                );
+                return $resultJson->setData([
+                        'error' => $this->escaper->escapeHtml('Forbidden'),
+                        'errorcode' => 403]
+                );
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->logger->critical($e);

From 2c4173e2dbe331ac7f97163083efd652cb3fc0bb Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 18 Dec 2018 13:05:14 +0200
Subject: [PATCH 0093/1055] MAGETWO-96757: Fixed incorrect displaying of the
 sales rule conditions

---
 app/code/Magento/Rule/Block/Editable.php           |  6 ++++--
 .../Adminhtml/Promo/Quote/NewConditionHtml.php     |  2 +-
 .../Data/Form/Element/AbstractElement.php          | 14 +++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Rule/Block/Editable.php b/app/code/Magento/Rule/Block/Editable.php
index 67e4671236ea0..d53213a7df876 100644
--- a/app/code/Magento/Rule/Block/Editable.php
+++ b/app/code/Magento/Rule/Block/Editable.php
@@ -9,6 +9,8 @@
 use Magento\Framework\View\Element\AbstractBlock;
 
 /**
+ * Renderer for Editable sales rules
+ *
  * @api
  * @since 100.0.2
  */
@@ -52,9 +54,9 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
 
         if ($element->getShowAsText()) {
             $html = ' <input type="hidden" class="hidden" id="' .
-                $element->getHtmlId() .
+                $this->escapeHtmlAttr($element->getHtmlId()) .
                 '" name="' .
-                $element->getName() .
+                $this->escapeHtmlAttr($element->getName()) .
                 '" value="' .
                 $element->getValue() .
                 '" data-form-part="' .
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
index a0238890d98af..715f5a3630a6a 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
@@ -44,4 +44,4 @@ public function execute()
         }
         $this->getResponse()->setBody($html);
     }
-}
+}
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index a8451e43ade20..dcaf3eaa70736 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -170,7 +170,11 @@ public function setId($id)
      */
     public function getHtmlId()
     {
-        return $this->getForm()->getHtmlIdPrefix() . $this->getData('html_id') . $this->getForm()->getHtmlIdSuffix();
+        return $this->_escaper->escapeHtml(
+            $this->getForm()->getHtmlIdPrefix() .
+            $this->getData('html_id') .
+            $this->getForm()->getHtmlIdSuffix()
+        );
     }
 
     /**
@@ -180,7 +184,7 @@ public function getHtmlId()
      */
     public function getName()
     {
-        $name = $this->getData('name');
+        $name = $this->_escaper->escapeHtml($this->getData('name'));
         if ($suffix = $this->getForm()->getFieldNameSuffix()) {
             $name = $this->getForm()->addSuffixToName($name, $suffix);
         }
@@ -201,6 +205,8 @@ public function setType($type)
     }
 
     /**
+     * Set the form
+     *
      * @param AbstractForm $form
      * @return $this
      */
@@ -326,6 +332,8 @@ public function getRenderer()
     }
 
     /**
+     * Returns ui identifier
+     *
      * @param null|string $suffix
      * @return string
      */
@@ -334,7 +342,7 @@ protected function _getUiId($suffix = null)
         if ($this->_renderer instanceof \Magento\Framework\View\Element\AbstractBlock) {
             return $this->_renderer->getUiId($this->getType(), $this->getName(), $suffix);
         } else {
-            return ' data-ui-id="form-element-' . $this->getName() . ($suffix ?: '') . '"';
+            return ' data-ui-id="form-element-' . $this->_escaper->escapeHtml($this->getName()) . ($suffix ?: '') . '"';
         }
     }
 

From 36f81368ec1e452cbd5910231f517265666e27a1 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 18 Dec 2018 16:47:45 +0200
Subject: [PATCH 0094/1055] MC-5964: Fixed incorrect behaviour of sync actions

---
 .../ProductFrontendAction/Synchronizer.php    | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
index 3ec8e968aa245..331c6673a555c 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
@@ -138,7 +138,9 @@ private function getProductIdsByActions(array $actions)
         $productIds = [];
 
         foreach ($actions as $action) {
-            $productIds[] = $action['product_id'];
+            if (isset($action['product_id']) && is_int($action['product_id'])) {
+                $productIds[] = $action['product_id'];
+            }
         }
 
         return $productIds;
@@ -159,33 +161,37 @@ public function syncActions(array $productsData, $typeId)
         $customerId = $this->session->getCustomerId();
         $visitorId = $this->visitor->getId();
         $collection = $this->getActionsByType($typeId);
-        $collection->addFieldToFilter('product_id', $this->getProductIdsByActions($productsData));
-
-        /**
-         * Note that collection is also filtered by visitor id and customer id
-         * This collection shouldn't be flushed when visitor has products and then login
-         * It can remove only products for visitor, or only products for customer
-         *
-         * ['product_id' => 'added_at']
-         * @var ProductFrontendActionInterface $item
-         */
-        foreach ($collection as $item) {
-            $this->entityManager->delete($item);
-        }
-
-        foreach ($productsData as $productId => $productData) {
-            /** @var ProductFrontendActionInterface $action */
-            $action = $this->productFrontendActionFactory->create([
-                'data' => [
-                    'visitor_id' => $customerId ? null : $visitorId,
-                    'customer_id' => $this->session->getCustomerId(),
-                    'added_at' => $productData['added_at'],
-                    'product_id' => $productId,
-                    'type_id' => $typeId
-                ]
-            ]);
-
-            $this->entityManager->save($action);
+        $productIds = $this->getProductIdsByActions($productsData);
+
+        if ($productIds) {
+            $collection->addFieldToFilter('product_id', $productIds);
+
+            /**
+             * Note that collection is also filtered by visitor id and customer id
+             * This collection shouldn't be flushed when visitor has products and then login
+             * It can remove only products for visitor, or only products for customer
+             *
+             * ['product_id' => 'added_at']
+             * @var ProductFrontendActionInterface $item
+             */
+            foreach ($collection as $item) {
+                $this->entityManager->delete($item);
+            }
+
+            foreach ($productsData as $productId => $productData) {
+                /** @var ProductFrontendActionInterface $action */
+                $action = $this->productFrontendActionFactory->create([
+                    'data' => [
+                        'visitor_id' => $customerId ? null : $visitorId,
+                        'customer_id' => $this->session->getCustomerId(),
+                        'added_at' => $productData['added_at'],
+                        'product_id' => $productId,
+                        'type_id' => $typeId
+                    ]
+                ]);
+
+                $this->entityManager->save($action);
+            }
         }
     }
 

From ff38049ef042b00ef700b4c7708738128b4dda00 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 18 Dec 2018 18:27:37 +0100
Subject: [PATCH 0095/1055] Check for application type only for POST requests

---
 .../Controller/HttpHeaderProcessor/ContentTypeProcessor.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
index 7e3e34ad79c02..69201f93ab4ea 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
@@ -24,7 +24,9 @@ class ContentTypeProcessor implements HttpHeaderProcessorInterface
      */
     public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void
     {
-        if (!$headerValue || strpos($headerValue, 'application/json') === false) {
+        if ($request->isPost()
+            && (!$headerValue || strpos($headerValue, 'application/json') === false)
+        ) {
             throw new LocalizedException(
                 new \Magento\Framework\Phrase('Request content type must be application/json')
             );

From 7c372885ac853f9ed524da48a7fd3034d9332378 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 18 Dec 2018 18:54:24 +0100
Subject: [PATCH 0096/1055] Allow mutations only via POST requests

---
 app/code/Magento/GraphQl/Controller/GraphQl.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index bf48d821eb429..1d0625effb790 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\ExceptionFormatter;
 use Magento\Framework\GraphQl\Query\QueryProcessor;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -113,6 +114,13 @@ public function dispatch(RequestInterface $request) : ResponseInterface
             } else {
                 $data = $request->getParams();
                 $data['variables'] = $this->jsonSerializer->unserialize($data['variables']);
+
+                // The easiest way to determine mutations without additional parsing
+                if (strpos(trim($data['query']), 'mutation') === 0) {
+                    throw new LocalizedException(
+                        __('Mutation requests allowed only for POST requests')
+                    );
+                }
             }
 
             $query = isset($data['query']) ? $data['query'] : '';

From 6906cde2341ac46897192e9f7e9837eb9b1c6ec8 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 18 Dec 2018 19:47:29 +0100
Subject: [PATCH 0097/1055] Possibility to perform GET requests via test
 framework

---
 .../Magento/GraphQl/Controller/GraphQl.php    |  3 +-
 .../TestFramework/TestCase/GraphQl/Client.php | 35 +++++++++++++++++++
 .../TestCase/GraphQlAbstract.php              | 29 +++++++++++----
 .../TestModule/GraphQlMutationTest.php        | 19 ++++++++++
 .../GraphQl/TestModule/GraphQlQueryTest.php   | 19 ++++++++++
 5 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index 1d0625effb790..01d5058427ca6 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -113,7 +113,8 @@ public function dispatch(RequestInterface $request) : ResponseInterface
                 $data = $this->jsonSerializer->unserialize($request->getContent());
             } else {
                 $data = $request->getParams();
-                $data['variables'] = $this->jsonSerializer->unserialize($data['variables']);
+                $data['variables'] = isset($data['variables']) ?
+                    $this->jsonSerializer->unserialize($data['variables']) : null;
 
                 // The easiest way to determine mutations without additional parsing
                 if (strpos(trim($data['query']), 'mutation') === 0) {
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 5458b5cfbb731..ab2d094c5e890 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
@@ -78,6 +78,41 @@ public function postQuery(string $query, array $variables = [], string $operatio
         }
     }
 
+    /**
+     * Perform HTTP GET request for query
+     *
+     * @param string $query
+     * @param array $variables
+     * @param string $operationName
+     * @param array $headers
+     * @return mixed
+     * @throws \Exception
+     */
+    public function getQuery(string $query, array $variables = [], string $operationName = '', array $headers = [])
+    {
+        $url = $this->getEndpointUrl();
+        $requestArray = [
+            'query' => $query,
+            'variables' => empty($variables) ? $variables : null,
+            'operationName' => empty($operationName) ? $operationName : null
+        ];
+
+        $responseBody = $this->curlClient->get($url, $requestArray, $headers);
+        $responseBodyArray = $this->json->jsonDecode($responseBody);
+
+        if (!is_array($responseBodyArray)) {
+            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
+        }
+
+        $this->processErrors($responseBodyArray);
+
+        if (!isset($responseBodyArray['data'])) {
+            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
+        } else {
+            return $responseBodyArray['data'];
+        }
+    }
+
     /**
      * Process errors
      *
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
index 790581c476da1..f55b981a04a94 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -34,6 +34,7 @@ abstract class GraphQlAbstract extends WebapiAbstract
      * @param array $variables
      * @param string $operationName
      * @param array $headers
+     * @param string $requestType
      * @return array|int|string|float|bool GraphQL call results
      * @throws \Exception
      */
@@ -41,14 +42,28 @@ public function graphQlQuery(
         string $query,
         array $variables = [],
         string $operationName = '',
-        array $headers = []
+        array $headers = [],
+        string $requestType = 'POST'
     ) {
-        return $this->getGraphQlClient()->postQuery(
-            $query,
-            $variables,
-            $operationName,
-            $this->composeHeaders($headers)
-        );
+        if ($requestType === 'POST') {
+            $response = $this->getGraphQlClient()->postQuery(
+                $query,
+                $variables,
+                $operationName,
+                $this->composeHeaders($headers)
+            );
+        } elseif ($requestType === 'GET') {
+            $response = $this->getGraphQlClient()->getQuery(
+                $query,
+                $variables,
+                $operationName,
+                $this->composeHeaders($headers)
+            );
+        } else {
+            throw new \Exception("Unsupported request type");
+        }
+
+        return $response;
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
index b6e1a61f0357c..fc63525ff6759 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
@@ -34,4 +34,23 @@ public function testMutation()
         $this->assertArrayHasKey('integer_list', $testItem);
         $this->assertEquals([4, 5, 6], $testItem['integer_list']);
     }
+
+    public function testMutationIsNotAllowedViaGetRequest()
+    {
+        $id = 3;
+
+        $query = <<<MUTATION
+mutation {
+  testItem(id: {$id}) {
+    item_id,
+    name,
+    integer_list
+  }
+}
+MUTATION;
+
+        self::expectExceptionMessage('Mutation requests allowed only for POST requests');
+
+        $this->graphQlQuery($query, [], '', [], 'GET');
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
index d59e255daa109..690844222929f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
@@ -58,4 +58,23 @@ public function testQueryTestModuleExtensionAttribute()
         $this->assertArrayHasKey('integer_list', $testItem);
         $this->assertEquals([3, 4, 5], $testItem['integer_list']);
     }
+
+    public function testQueryViaGetRequestReturnsResults()
+    {
+        $id = 1;
+
+        $query = <<<QUERY
+{
+    testItem(id: {$id})
+    {
+        item_id
+        name
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query, [], '', [], 'GET');
+
+        $this->assertArrayHasKey('testItem', $response);
+    }
 }

From 648dcf43278863acf5c029bbd7cb94e569ea54e6 Mon Sep 17 00:00:00 2001
From: Erfan <erfan@speqs.com>
Date: Wed, 19 Dec 2018 16:36:15 +0800
Subject: [PATCH 0098/1055] Added custom_options file upload directory to
 .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 68d38d9ca7817..8a15fbacaf638 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ atlassian*
 /pub/media/import/*
 !/pub/media/import/.htaccess
 /pub/media/logo/*
+/pub/media/custom_options/*
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess

From 427ba17a4b334f5f5d8c0d9102d82ae774e87923 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 20 Dec 2018 12:58:09 +0200
Subject: [PATCH 0099/1055] MC-5964: Fixed incorrect behaviour of sync actions

---
 lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 86266ec23fe47..c2693d9d0fb8d 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2965,7 +2965,7 @@ public function prepareSqlCondition($fieldName, $condition)
                 if (isset($condition['to'])) {
                     $query .= empty($query) ? '' : ' AND ';
                     $to     = $this->_prepareSqlDateCondition($condition, 'to');
-                    $query = $this->_prepareQuotedSqlCondition($query . $conditionKeyMap['to'], $to, $fieldName);
+                    $query = $this->_prepareQuotedSqlCondition($conditionKeyMap['to'], $to, $fieldName);
                 }
             } elseif (array_key_exists($key, $conditionKeyMap)) {
                 $value = $condition[$key];

From d3bc83dbed34680467c41c36951db1979750f5e8 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 20 Dec 2018 14:50:21 +0100
Subject: [PATCH 0100/1055] Update
 app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

Co-Authored-By: woutersamaey <wouter.samaey@storefront.be>
---
 app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index ebca3aef7ddf3..84bfa56f25655 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -86,7 +86,7 @@ public function execute()
 
                 $contentType = $this->contentTypeResolver->resolve($component->getContext());
                 $this->getResponse()->setHeader('Content-Type', $contentType, true);
-            }else {
+            } else {
                 /** @var \Magento\Framework\Controller\Result\Json $resultJson */
                 $resultJson = $this->resultJsonFactory->create();
                 $resultJson->setStatusHeader(

From 3c9c884e157157550131ca6008e21bc475a1acc7 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 20 Dec 2018 14:50:31 +0100
Subject: [PATCH 0101/1055] Update
 app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

Co-Authored-By: woutersamaey <wouter.samaey@storefront.be>
---
 app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index 84bfa56f25655..e620222a642b7 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -96,7 +96,7 @@ public function execute()
                 );
                 return $resultJson->setData([
                         'error' => $this->escaper->escapeHtml('Forbidden'),
-                        'errorcode' => 403]
+                        'errorcode' => 403
                 );
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {

From f9911bdb77283cd670d25e4ace8b89668d153225 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 20 Dec 2018 14:50:44 +0100
Subject: [PATCH 0102/1055] Update
 app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

Co-Authored-By: woutersamaey <wouter.samaey@storefront.be>
---
 app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index e620222a642b7..b06c655939b1c 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -97,7 +97,7 @@ public function execute()
                 return $resultJson->setData([
                         'error' => $this->escaper->escapeHtml('Forbidden'),
                         'errorcode' => 403
-                );
+                ]);
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->logger->critical($e);

From 60ae26d9fbff50e247b9803e0a247bfd51f4332a Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 20 Dec 2018 15:52:56 +0200
Subject: [PATCH 0103/1055] MC-5964: Fixed incorrect behaviour of sync actions

---
 lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index c2693d9d0fb8d..fc656987963fb 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2965,7 +2965,7 @@ public function prepareSqlCondition($fieldName, $condition)
                 if (isset($condition['to'])) {
                     $query .= empty($query) ? '' : ' AND ';
                     $to     = $this->_prepareSqlDateCondition($condition, 'to');
-                    $query = $this->_prepareQuotedSqlCondition($conditionKeyMap['to'], $to, $fieldName);
+                    $query = $query . $this->_prepareQuotedSqlCondition($conditionKeyMap['to'], $to, $fieldName);
                 }
             } elseif (array_key_exists($key, $conditionKeyMap)) {
                 $value = $condition[$key];

From 82970b8c9bd9b7edbdfe77b05f6a73927d2bda6b Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 20 Dec 2018 17:10:17 -0600
Subject: [PATCH 0104/1055] MQE-1069: Migrate Sample Data tests from MTF to
 MFTF

---
 ...tProductImagesOnProductPageActionGroup.xml | 20 +++++++++++++++++++
 ...ertProductNameOnProductPageActionGroup.xml | 15 ++++++++++++++
 ...rtProductPriceOnProductPageActionGroup.xml | 15 ++++++++++++++
 ...sertProductSkuOnProductPageActionGroup.xml | 15 ++++++++++++++
 .../StorefrontOpenProductPageActionGroup.xml  | 16 +++++++++++++++
 .../StorefrontProductInfoMainSection.xml      |  1 +
 .../Section/StorefrontProductMediaSection.xml |  4 ++++
 ...ertCustomerAccountPageTitleActionGroup.xml | 16 +++++++++++++++
 .../LoginToStorefrontActionGroup.xml          |  1 +
 ...NavigateThroughCustomerTabsActionGroup.xml | 17 ++++++++++++++++
 .../OpenMyAccountPageActionGroup.xml          | 15 ++++++++++++++
 .../LoggedInCustomerHeaderLinksSection.xml    | 17 ++++++++++++++++
 .../StorefrontCustomerAccountMainSection.xml  | 14 +++++++++++++
 .../StorefrontCustomerSidebarSection.xml      |  2 +-
 14 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..e049c7430871f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertProductImagesOnProductPageActionGroup">
+        <arguments>
+            <argument name="productImage" type="string" defaultValue="Magento_Catalog/images/product/placeholder/image.jpg" />
+        </arguments>
+        <seeElement selector="{{StorefrontProductMediaSection.gallery}}" stepKey="seeProductGallery" />
+        <seeElement selector="{{StorefrontProductMediaSection.productImage(productImage)}}" stepKey="seeProductImage" />
+        <click selector="{{StorefrontProductMediaSection.productImage(productImage)}}" stepKey="openFullscreenImage" />
+        <waitForPageLoad stepKey="waitForGalleryLoaded" />
+        <seeElement selector="{{StorefrontProductMediaSection.productImageFullscreen(productImage)}}" stepKey="seeFullscreenProductImage" />
+        <click selector="{{StorefrontProductMediaSection.closeFullscreenImage}}" stepKey="closeFullScreenImage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..6cb156723b286
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductNameOnProductPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontAssertProductNameOnProductPageActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productName}}" stepKey="seeProductName" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..3c62ef89e584b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductPriceOnProductPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontAssertProductPriceOnProductPageActionGroup">
+        <arguments>
+            <argument name="productPrice" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontProductInfoMainSection.price}}" userInput="{{productPrice}}" stepKey="seeProductPrice" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml
new file mode 100644
index 0000000000000..85d3927a6d6d0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSkuOnProductPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontAssertProductSkuOnProductPageActionGroup">
+        <arguments>
+            <argument name="productSku" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{productSku}}" stepKey="seeProductSku" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml
new file mode 100644
index 0000000000000..f5fabae5fc4ce
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontOpenProductPageActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="StorefrontOpenProductPageActionGroup">
+        <arguments>
+            <argument name="productUrl" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontProductPage.url(productUrl)}}" stepKey="openProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoaded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index b93a70559fc4a..63b08b58af6ca 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -13,6 +13,7 @@
         <element name="productName" type="text" selector=".base"/>
         <element name="productSku" type="text" selector=".product.attribute.sku>.value"/>
         <element name="productPriceLabel" type="text" selector=".price-label"/>
+        <element name="price" type="text" selector=".product-info-main [data-price-type='finalPrice']"/>
         <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"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
index 83c3ca5348606..a90525e40b695 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
@@ -9,6 +9,10 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontProductMediaSection">
+        <element name="gallery" type="block" selector="[data-gallery-role='gallery']" />
+        <element name="productImage" type="text" selector="//*[@data-gallery-role='gallery' and not(contains(@class, 'fullscreen'))]//img[contains(@src, '{{filename}}') and not(contains(@class, 'full'))]" parameterized="true" />
+        <element name="productImageFullscreen" type="text" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//img[contains(@src, '{{filename}}') and contains(@class, 'full')]" parameterized="true" />
+        <element name="closeFullscreenImage" type="button" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//*[@data-gallery-role='fotorama__fullscreen-icon']" />
         <element name="imageFile" type="text" selector="//*[@class='product media']//img[contains(@src, '{{filename}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml
new file mode 100644
index 0000000000000..132b5ca81886f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerAccountPageTitleActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="AssertCustomerAccountPageTitleActionGroup">
+        <arguments>
+            <argument name="pageTitle" type="string" />
+        </arguments>
+        <see selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="{{pageTitle}}" stepKey="assertPageTitle" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
index 7be36ffbd9bc4..2704f0af38165 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
@@ -15,5 +15,6 @@
         <fillField  stepKey="fillEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
         <fillField  stepKey="fillPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
         <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <waitForPageLoad stepKey="waitForCustomerLoggedIn" />
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml
new file mode 100644
index 0000000000000..5591bee529690
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateThroughCustomerTabsActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="NavigateThroughCustomerTabsActionGroup">
+        <arguments>
+            <argument name="navigationItemName" type="string" />
+        </arguments>
+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab(navigationItemName)}}" stepKey="clickOnDesiredNavItem" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml
new file mode 100644
index 0000000000000..6ca0f612deeaa
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenMyAccountPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="OpenMyAccountPageActionGroup">
+        <click selector="{{LoggedInCustomerHeaderLinksSection.customerDropdownMenu}}" stepKey="openCustomerDropdownMenu"/>
+        <click selector="{{LoggedInCustomerHeaderLinksSection.myAccount}}" stepKey="clickOnMyAccount"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.xml
new file mode 100644
index 0000000000000..907551e932fcf
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/LoggedInCustomerHeaderLinksSection.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="LoggedInCustomerHeaderLinksSection">
+        <element name="customerDropdownMenu" type="button" selector=".customer-name"/>
+        <element name="myAccount" type="button" selector="//*[contains(@class, 'page-header')]//*[contains(@class, 'customer-menu')]//a[contains(., 'My Account')]"/>
+        <element name="myWishList" type="button" selector=".page-header .customer-menu .wishlist"/>
+        <element name="signOut" type="button" selector=".page-header .customer-menu .authorization-link"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml
new file mode 100644
index 0000000000000..3a4329969ae2b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.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="StorefrontCustomerAccountMainSection">
+        <element name="pageTitle" type="text" selector="#maincontent .column.main [data-ui-id='page-title-wrapper']" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
index 7482193031091..56be7a12d7de7 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml
@@ -9,6 +9,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSidebarSection">
-        <element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{var1}}']" parameterized="true"/>
+        <element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{tabName}}']" parameterized="true"/>
     </section>
 </sections>

From eeb40d82fab691bd4ed817ff9728696efcb8d472 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 21 Dec 2018 16:36:29 +0200
Subject: [PATCH 0105/1055] ENGCOM-3725: Unit test fix.

---
 .../Controller/Adminhtml/Index/RenderTest.php | 49 +++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
index 05b35fb017b4b..2bba8686490b6 100644
--- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
@@ -3,12 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Test\Unit\Controller\Adminhtml\Index;
 
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Escaper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Controller\Adminhtml\Index\Render;
 use Magento\Ui\Model\UiComponentTypeResolver;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Zend\Http\AbstractMessage;
+use Zend\Http\Response;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -97,6 +102,11 @@ class RenderTest extends \PHPUnit\Framework\TestCase
      */
     private $loggerMock;
 
+    /**
+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     protected function setUp()
     {
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
@@ -170,6 +180,10 @@ protected function setUp()
         $this->uiComponentTypeResolverMock = $this->getMockBuilder(UiComponentTypeResolver::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->escaperMock = $this->createMock(Escaper::class);
+        $this->escaperMock->expects($this->any())
+            ->method('escapeHtml')
+            ->willReturnArgument(0);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
@@ -181,6 +195,7 @@ protected function setUp()
                 'contentTypeResolver' => $this->uiComponentTypeResolverMock,
                 'resultJsonFactory' => $this->resultJsonFactoryMock,
                 'logger' => $this->loggerMock,
+                'escaper' => $this->escaperMock,
             ]
         );
     }
@@ -201,7 +216,7 @@ public function testExecuteAjaxRequestException()
             ->method('appendBody')
             ->willThrowException(new \Exception('exception'));
 
-        $jsonResultMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
+        $jsonResultMock = $this->getMockBuilder(Json::class)
             ->disableOriginalConstructor()
             ->setMethods(['setData'])
             ->getMock();
@@ -290,6 +305,34 @@ public function testExecuteAjaxRequestWithoutPermissions(array $dataProviderConf
         $name = 'test-name';
         $renderedData = '<html>data</html>';
 
+        if (false === $isAllowed) {
+            $jsonResultMock = $this->getMockBuilder(Json::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['setStatusHeader', 'setData'])
+                ->getMock();
+
+            $jsonResultMock->expects($this->at(0))
+                ->method('setStatusHeader')
+                ->with(
+                    Response::STATUS_CODE_403,
+                    AbstractMessage::VERSION_11,
+                    'Forbidden'
+                )
+                ->willReturnSelf();
+
+            $jsonResultMock->expects($this->at(1))
+                ->method('setData')
+                ->with([
+                    'error' => 'Forbidden',
+                    'errorcode' => 403
+                ])
+                ->willReturnSelf();
+
+            $this->resultJsonFactoryMock->expects($this->any())
+                ->method('create')
+                ->willReturn($jsonResultMock);
+        }
+
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->with('namespace')

From 939b665d3b2b8e0f717c61a8c746b6a602156724 Mon Sep 17 00:00:00 2001
From: Jaimin Sutariya <jaimin.sutariya@krishtechnolabs.com>
Date: Sat, 22 Dec 2018 11:06:42 +0530
Subject: [PATCH 0106/1055] Updated code to get Entity count for product import

---
 .../Magento/ImportExport/Model/Import/Entity/AbstractEntity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index 2a861be1fe97b..10b29a50a4064 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -438,7 +438,7 @@ protected function _saveValidatedBunches()
                 $source->next();
             }
         }
-        $this->_processedEntitiesCount = count($skuSet);
+        $this->_processedEntitiesCount = (count($skuSet)) ? : $this->_processedRowsCount;
 
         return $this;
     }

From b28830d8f6e770c28310503027b51dd906807bef Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Thu, 27 Dec 2018 11:08:58 +0200
Subject: [PATCH 0107/1055] Show widget image despite of 'type_name'
 availability. This commit fixes widget previews for widgets inserted in
 Magento < 2.3, when 'type_name' property doesn't exist

---
 .../wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
index 18d71aad2071a..bac083d7cdeaf 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
@@ -132,7 +132,7 @@ define([
                         attributes.type = attributes.type.replace(/\\\\/g, '\\');
                         imageSrc = config.placeholders[attributes.type];
 
-                        if (config.types.indexOf(attributes['type_name']) > -1) {
+                        if (imageSrc) {
                             imageHtml += '<span class="magento-placeholder magento-widget mceNonEditable" ' +
                                 'contenteditable="false">';
                         } else {

From 982d31cf3550490d46c02c230f3eb1d0aac6d7da Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Thu, 27 Dec 2018 11:12:43 +0200
Subject: [PATCH 0108/1055] Don't add additional parameter to the widget code.
 This commit makes cleaner widget code. Widget name can be taken from plugin
 options by 'type' property

---
 app/code/Magento/Widget/Model/Widget.php                      | 2 --
 app/code/Magento/Widget/Model/Widget/Config.php               | 2 +-
 .../wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js   | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index 5ba03d008ded0..5cfbfbf9cdf41 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -323,8 +323,6 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)
 
         $directive .= $this->getWidgetPageVarName($params);
 
-        $directive .= sprintf(' type_name="%s"', $widget['name']);
-
         $directive .= '}}';
 
         if ($asIs) {
diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
index 4f81ef33f47f7..5832a08f0df06 100644
--- a/app/code/Magento/Widget/Model/Widget/Config.php
+++ b/app/code/Magento/Widget/Model/Widget/Config.php
@@ -202,7 +202,7 @@ public function getAvailableWidgets($config)
                 if (is_array($skipped) && in_array($widget['type'], $skipped)) {
                     continue;
                 }
-                $result[] = $widget['name']->getText();
+                $result[$widget['type']] = $widget['name']->getText();
             }
         }
 
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
index bac083d7cdeaf..cfcdef0b701c9 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
@@ -147,8 +147,8 @@ define([
                         imageHtml += ' src="' + imageSrc + '"';
                         imageHtml += ' />';
 
-                        if (attributes['type_name']) {
-                            imageHtml += attributes['type_name'];
+                        if (config.types[attributes.type]) {
+                            imageHtml += config.types[attributes.type];
                         }
 
                         imageHtml += '</span>';

From 90b32ae7fb5fcfafb9f2f2c702a1b9615c6586d2 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 27 Dec 2018 13:14:47 +0200
Subject: [PATCH 0109/1055] MAGETWO-96505: Fixed incorrect stacktrace
 displaying

---
 lib/internal/Magento/Framework/App/Http.php   | 17 +++++++++++----
 .../Magento/Framework/App/StaticResource.php  | 13 ++++++++++--
 .../Magento/Framework/Message/Manager.php     | 21 ++++++++++++++-----
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index 3c6dee49f97b4..96d34b93fa741 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -6,6 +6,7 @@
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Debug;
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 use Magento\Framework\App\Request\Http as RequestHttp;
 use Magento\Framework\App\Response\Http as ResponseHttp;
@@ -79,7 +80,7 @@ class Http implements \Magento\Framework\AppInterface
      * @param ResponseHttp $response
      * @param ConfigLoaderInterface $configLoader
      * @param State $state
-     * @param Filesystem $filesystem,
+     * @param Filesystem $filesystem
      * @param \Magento\Framework\Registry $registry
      */
     public function __construct(
@@ -149,7 +150,7 @@ public function launch()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
@@ -214,7 +215,7 @@ private function buildContentFromException(\Exception $exception)
                 $index,
                 get_class($exception),
                 $exception->getMessage(),
-                $exception->getTraceAsString()
+                Debug::trace($exception->getTrace(), true, true, false)
             );
         }
 
@@ -312,7 +313,15 @@ private function handleInitException(\Exception $exception)
      */
     private function handleGenericReport(Bootstrap $bootstrap, \Exception $exception)
     {
-        $reportData = [$exception->getMessage(), $exception->getTraceAsString()];
+        $reportData = [
+            $exception->getMessage(),
+            Debug::trace(
+                $exception->getTrace(),
+                true,
+                true,
+                (bool)DEBUG_BACKTRACE_IGNORE_ARGS
+            )
+        ];
         $params = $bootstrap->getParams();
         if (isset($params['REQUEST_URI'])) {
             $reportData['url'] = $params['REQUEST_URI'];
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index 575074fdb58ac..6a753fee6eaf9 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -10,6 +10,7 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Debug;
 
 /**
  * Entry point for retrieving static resources like JS, CSS, images by requested public path
@@ -138,7 +139,7 @@ public function launch()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
@@ -146,7 +147,15 @@ public function catchException(Bootstrap $bootstrap, \Exception $exception)
         if ($bootstrap->isDeveloperMode()) {
             $this->response->setHttpResponseCode(404);
             $this->response->setHeader('Content-Type', 'text/plain');
-            $this->response->setBody($exception->getMessage() . "\n" . $exception->getTraceAsString());
+            $this->response->setBody(
+                $exception->getMessage() . "\n" .
+                Debug::trace(
+                    $exception->getTrace(),
+                    true,
+                    true,
+                    false
+                )
+            );
             $this->response->sendResponse();
         } else {
             require $this->getFilesystem()->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath('errors/404.php');
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index f31892a938fb1..1b39a777063ed 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -8,6 +8,7 @@
 use Magento\Framework\Event;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Debug;
 
 /**
  * Message manager model
@@ -67,7 +68,7 @@ class Manager implements ManagerInterface
      * @param Event\ManagerInterface $eventManager
      * @param LoggerInterface $logger
      * @param string $defaultGroup
-     * @param ExceptionMessageFactoryInterface|null exceptionMessageFactory
+     * @param ExceptionMessageFactoryInterface|null $exceptionMessageFactory
      */
     public function __construct(
         Session $session,
@@ -89,7 +90,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultGroup()
     {
@@ -110,8 +111,8 @@ protected function prepareGroup($group)
     /**
      * @inheritdoc
      *
-     * @param string|null $group
      * @param bool $clear
+     * @param string|null $group
      * @return Collection
      */
     public function getMessages($clear = false, $group = null)
@@ -248,7 +249,12 @@ public function addException(\Exception $exception, $alternativeText = null, $gr
             'Exception message: %s%sTrace: %s',
             $exception->getMessage(),
             "\n",
-            $exception->getTraceAsString()
+            Debug::trace(
+                $exception->getTrace(),
+                true,
+                true,
+                false
+            )
         );
 
         $this->logger->critical($message);
@@ -286,7 +292,12 @@ public function addExceptionMessage(\Exception $exception, $alternativeText = nu
             'Exception message: %s%sTrace: %s',
             $exception->getMessage(),
             "\n",
-            $exception->getTraceAsString()
+            Debug::trace(
+                $exception->getTrace(),
+                true,
+                true,
+                false
+            )
         );
 
         $this->logger->critical($message);

From fcfb66b6d34327fee57759e510bee8d415cce3cf Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Thu, 27 Dec 2018 14:50:20 +0200
Subject: [PATCH 0110/1055] Fixed failing tests

---
 app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
index 5c546d7e2435c..850a3fbe83211 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
@@ -224,7 +224,6 @@ public function testGetWidgetDeclaration()
         $this->assertContains('title="my &quot;widget&quot;"', $result);
         $this->assertContains('conditions_encoded="encoded-conditions-string"', $result);
         $this->assertContains('page_var_name="pasdf"', $result);
-        $this->assertContains('type_name=""}}', $result);
     }
 
     /**
@@ -275,7 +274,6 @@ public function testGetWidgetDeclarationWithZeroValueParam()
         );
         $this->assertContains('{{widget type="Magento\CatalogWidget\Block\Product\ProductsList"', $result);
         $this->assertContains('page_var_name="pasdf"', $result);
-        $this->assertContains('type_name=""}}', $result);
         $this->assertContains('products_count=""', $result);
     }
 }

From 7feaeddc33995e2a0abe121e24854e02d7bb83f7 Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Fri, 28 Dec 2018 13:03:55 +0530
Subject: [PATCH 0111/1055] Code Improvement suggested by orlangur

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

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 8b8b76accd12f..3261f8fcf96e6 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
@@ -1224,7 +1224,7 @@ define([
 
                 imagesToUpdate = this._setImageIndex(imagesToUpdate);
 
-                if (typeof gallery === undefined) {
+                if (typeof gallery == 'undefined') {
                     context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
                         loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
                         loadedGallery.updateData(imagesToUpdate);
@@ -1242,7 +1242,7 @@ define([
                     });
                 }
 
-                if (typeof gallery === undefined) {
+                if (typeof gallery == 'undefined') {
                     context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
                         loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
                         loadedGallery.first();

From 0df72432ecf611c8c0f54b0b88bbbca485d4046f Mon Sep 17 00:00:00 2001
From: Aditi Singh <36220507+aditisinghcedcoss@users.noreply.github.com>
Date: Fri, 28 Dec 2018 13:09:54 +0530
Subject: [PATCH 0112/1055] Update AbstactSource.php Issue #13612 fixed.

---
 .../Eav/Model/Entity/Attribute/Source/AbstractSource.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
index 0991b3f9f4b23..8d5b501654749 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
@@ -73,7 +73,7 @@ public function getOptionText($value)
             }
         }
         // End
-        if (isset($options[$value])) {
+        if (is_scalar($value) && isset($options[$value])) {
             return $options[$value];
         }
         return false;

From d41c407f62dffedd3e3be3f2dc27ed51084d0887 Mon Sep 17 00:00:00 2001
From: Dusan Lukic <ldusan84@gmail.com>
Date: Thu, 3 Jan 2019 15:28:01 +0100
Subject: [PATCH 0113/1055] Fixed non existant category with products issue

---
 .../Model/Resolver/CategoryTree.php               |  2 +-
 .../Magento/GraphQl/Catalog/CategoryTest.php      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
index 4e3a8403f3132..7e7b0db8240af 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
@@ -72,7 +72,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $rootCategoryId = $this->getCategoryId($args);
         $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
-        if (!empty($categoriesTree)) {
+        if (!empty($categoriesTree) && ($categoriesTree->count() > 0)) {
             $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
             return current($result);
         } else {
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 54e98367ab8ca..17a7bec180585 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,21 @@ public function testCategoriesTree()
         );
     }
 
+    public function testNonExistentCategoryWithProductCount()
+    {
+        $query = <<<QUERY
+{
+  category(id: 99) {
+      product_count
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $expectedResponse = ['category' => null];
+        $this->assertEquals($expectedResponse, $response);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)

From fd92e76855d60c05867071c3b98e6dc285e6c0de Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 4 Jan 2019 16:11:38 +0200
Subject: [PATCH 0114/1055] MAGETWO-96505: Fixed incorrect stacktrace
 displaying

---
 .../NewRelicReporting/Model/NewRelicWrapper.php     |  6 +-----
 app/code/Magento/User/Model/User.php                | 13 +------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
index 1407a64e0f660..ec21e06976b8b 100644
--- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
+++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
@@ -37,11 +37,7 @@ public function addCustomParameter($param, $value)
     public function reportError($exception)
     {
         if (extension_loaded('newrelic')) {
-            if ($exception instanceof \Zend_Db_Statement_Exception || $exception instanceof \PDOException) {
-                newrelic_notice_error($exception->getMessage());
-            } else {
-                newrelic_notice_error($exception->getMessage(), $exception);
-            }
+            newrelic_notice_error($exception->getMessage(), $exception);
         }
     }
 
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index d7aa9d76546fd..4050d79e593ee 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -7,7 +7,6 @@
 namespace Magento\User\Model;
 
 use Magento\Backend\Model\Auth\Credential\StorageInterface;
-use Magento\Checkout\Exception;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Exception\AuthenticationException;
@@ -630,18 +629,8 @@ public function verifyIdentity($password)
     public function login($username, $password)
     {
         if ($this->authenticate($username, $password)) {
-            try {
-                $this->getResource()->recordLogin($this);
-            } catch (\Exception $exception) {
-                if ($exception instanceof \Zend_Db_Statement_Exception
-                    || $exception instanceof \PDOException) {
-                    $this->_logger->critical($exception);
-
-                    throw new \Exception($exception->getMessage());
-                }
-            }
+            $this->getResource()->recordLogin($this);
         }
-
         return $this;
     }
 

From 3ee104d59b0dbe9f843bcca162ce24cef6ac09fa Mon Sep 17 00:00:00 2001
From: Jeroen van Leusden <jeroen@reachdigital.nl>
Date: Wed, 12 Dec 2018 15:29:34 +0100
Subject: [PATCH 0115/1055] Use repository to load order when manually creating
 an invoice

ENGCOM-3679: Static test fix.
ENGCOM-3679: Unit test fix.
---
 .../Adminhtml/Order/Invoice/NewAction.php     | 28 +++++++----
 .../Adminhtml/Order/Invoice/NewActionTest.php | 47 +++++++++----------
 2 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
index 3295b244f323e..ceb231248ef5e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php
@@ -1,18 +1,21 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Framework\Registry;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Service\InvoiceService;
 
+/**
+ * Create new invoice action.
+ */
 class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
@@ -37,22 +40,32 @@ class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInte
      */
     private $invoiceService;
 
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
     /**
      * @param Action\Context $context
      * @param Registry $registry
      * @param PageFactory $resultPageFactory
      * @param InvoiceService $invoiceService
+     * @param OrderRepositoryInterface|null $orderRepository
      */
     public function __construct(
         Action\Context $context,
         Registry $registry,
         PageFactory $resultPageFactory,
-        InvoiceService $invoiceService
+        InvoiceService $invoiceService,
+        OrderRepositoryInterface $orderRepository = null
     ) {
+        parent::__construct($context);
+
         $this->registry = $registry;
         $this->resultPageFactory = $resultPageFactory;
-        parent::__construct($context);
         $this->invoiceService = $invoiceService;
+        $this->orderRepository = $orderRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(OrderRepositoryInterface::class);
     }
 
     /**
@@ -78,14 +91,11 @@ public function execute()
     {
         $orderId = $this->getRequest()->getParam('order_id');
         $invoiceData = $this->getRequest()->getParam('invoice', []);
-        $invoiceItems = isset($invoiceData['items']) ? $invoiceData['items'] : [];
+        $invoiceItems = $invoiceData['items'] ?? [];
 
         try {
             /** @var \Magento\Sales\Model\Order $order */
-            $order = $this->_objectManager->create(\Magento\Sales\Model\Order::class)->load($orderId);
-            if (!$order->getId()) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('The order no longer exists.'));
-            }
+            $order = $this->orderRepository->get($orderId);
 
             if (!$order->canInvoice()) {
                 throw new \Magento\Framework\Exception\LocalizedException(
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
index 05c99c9f9ef98..87e27fdb2206b 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/NewActionTest.php
@@ -6,12 +6,14 @@
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Api\OrderRepositoryInterface;
 
 /**
  * Class NewActionTest
  * @package Magento\Sales\Controller\Adminhtml\Order\Invoice
  * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class NewActionTest extends \PHPUnit\Framework\TestCase
 {
@@ -90,6 +92,11 @@ class NewActionTest extends \PHPUnit\Framework\TestCase
      */
     protected $invoiceServiceMock;
 
+    /**
+     * @var OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderRepositoryMock;
+
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -215,12 +222,15 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->orderRepositoryMock = $this->createMock(OrderRepositoryInterface::class);
+
         $this->controller = $objectManager->getObject(
             \Magento\Sales\Controller\Adminhtml\Order\Invoice\NewAction::class,
             [
                 'context' => $contextMock,
                 'resultPageFactory' => $this->resultPageFactoryMock,
-                'invoiceService' => $this->invoiceServiceMock
+                'invoiceService' => $this->invoiceServiceMock,
+                'orderRepository' => $this->orderRepositoryMock
             ]
         );
     }
@@ -250,19 +260,17 @@ public function testExecute()
 
         $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
             ->disableOriginalConstructor()
-            ->setMethods(['load', 'getId', 'canInvoice'])
+            ->setMethods(['load', 'canInvoice'])
             ->getMock();
-        $orderMock->expects($this->once())
-            ->method('load')
-            ->with($orderId)
-            ->willReturnSelf();
-        $orderMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($orderId);
         $orderMock->expects($this->once())
             ->method('canInvoice')
             ->willReturn(true);
 
+        $this->orderRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($orderId)
+            ->willReturn($orderMock);
+
         $this->invoiceServiceMock->expects($this->once())
             ->method('prepareInvoice')
             ->with($orderMock, [])
@@ -285,11 +293,7 @@ public function testExecute()
             ->with(true)
             ->will($this->returnValue($commentText));
 
-        $this->objectManagerMock->expects($this->at(0))
-            ->method('create')
-            ->with(\Magento\Sales\Model\Order::class)
-            ->willReturn($orderMock);
-        $this->objectManagerMock->expects($this->at(1))
+        $this->objectManagerMock->expects($this->once())
             ->method('get')
             ->with(\Magento\Backend\Model\Session::class)
             ->will($this->returnValue($this->sessionMock));
@@ -318,19 +322,12 @@ public function testExecuteNoOrder()
 
         $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
             ->disableOriginalConstructor()
-            ->setMethods(['load', 'getId', 'canInvoice'])
+            ->setMethods(['canInvoice'])
             ->getMock();
-        $orderMock->expects($this->once())
-            ->method('load')
-            ->with($orderId)
-            ->willReturnSelf();
-        $orderMock->expects($this->once())
-            ->method('getId')
-            ->willReturn(null);
 
-        $this->objectManagerMock->expects($this->at(0))
-            ->method('create')
-            ->with(\Magento\Sales\Model\Order::class)
+        $this->orderRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($orderId)
             ->willReturn($orderMock);
 
         $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)

From bbceaab96e7f9440528944a41d141e78ee6c3b26 Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Tue, 8 Jan 2019 10:45:52 +0530
Subject: [PATCH 0116/1055] resolve conflicts

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

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 3261f8fcf96e6..3693f86984602 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
@@ -1224,7 +1224,7 @@ define([
 
                 imagesToUpdate = this._setImageIndex(imagesToUpdate);
 
-                if (typeof gallery == 'undefined') {
+                if (typeof gallery === 'undefined') {
                     context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
                         loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
                         loadedGallery.updateData(imagesToUpdate);
@@ -1242,7 +1242,7 @@ define([
                     });
                 }
 
-                if (typeof gallery == 'undefined') {
+                if (typeof gallery === 'undefined') {
                     context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
                         loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
                         loadedGallery.first();

From ceb1edd4307a6d7e1b9622bcfa85403de3e7213f Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Tue, 8 Jan 2019 14:37:08 +0200
Subject: [PATCH 0117/1055] MAGETWO-96505: Fixed incorrect stacktrace
 displaying

---
 lib/internal/Magento/Framework/App/Http.php   | 20 +++++++++++++++++--
 .../Magento/Framework/App/StaticResource.php  | 14 +++++++++++--
 .../Magento/Framework/Message/Manager.php     | 13 ++++++++++--
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index 96d34b93fa741..1b9db1d4069be 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Event;
 use Magento\Framework\Filesystem;
+use Zend\Http\PhpEnvironment\Request as Environment;
 
 /**
  * HTTP web application. Called from webroot index.php to serve web requests.
@@ -72,6 +73,11 @@ class Http implements \Magento\Framework\AppInterface
      */
     private $logger;
 
+    /**
+     * @var Environment
+     */
+    private $env;
+
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param Event\Manager $eventManager
@@ -82,6 +88,8 @@ class Http implements \Magento\Framework\AppInterface
      * @param State $state
      * @param Filesystem $filesystem
      * @param \Magento\Framework\Registry $registry
+     * @param Environment|null $env
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -92,7 +100,8 @@ public function __construct(
         ConfigLoaderInterface $configLoader,
         State $state,
         Filesystem $filesystem,
-        \Magento\Framework\Registry $registry
+        \Magento\Framework\Registry $registry,
+        ?Environment $env = null
     ) {
         $this->_objectManager = $objectManager;
         $this->_eventManager = $eventManager;
@@ -103,6 +112,7 @@ public function __construct(
         $this->_state = $state;
         $this->_filesystem = $filesystem;
         $this->registry = $registry;
+        $this->env = $env ?: ObjectManager::getInstance()->create(Environment::class);
     }
 
     /**
@@ -199,6 +209,7 @@ private function buildContentFromException(\Exception $exception)
     {
         /** @var \Exception[] $exceptions */
         $exceptions = [];
+
         do {
             $exceptions[] = $exception;
         } while ($exception = $exception->getPrevious());
@@ -215,7 +226,12 @@ private function buildContentFromException(\Exception $exception)
                 $index,
                 get_class($exception),
                 $exception->getMessage(),
-                Debug::trace($exception->getTrace(), true, true, false)
+                Debug::trace(
+                    $exception->getTrace(),
+                    true,
+                    true,
+                    boolval($this->env->getEnv('DEBUG_SHOW_ARGS', true))
+                )
             );
         }
 
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index 6a753fee6eaf9..bbb63d3dbe580 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\Debug;
+use Zend\Http\PhpEnvironment\Request as Environment;
 
 /**
  * Entry point for retrieving static resources like JS, CSS, images by requested public path
@@ -74,6 +75,11 @@ class StaticResource implements \Magento\Framework\AppInterface
      */
     private $logger;
 
+    /**
+     * @var Environment
+     */
+    private $env;
+
     /**
      * @param State $state
      * @param Response\FileInterface $response
@@ -84,6 +90,8 @@ class StaticResource implements \Magento\Framework\AppInterface
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ConfigLoaderInterface $configLoader
      * @param DeploymentConfig|null $deploymentConfig
+     * @param Environment|null $env
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         State $state,
@@ -94,7 +102,8 @@ public function __construct(
         \Magento\Framework\Module\ModuleList $moduleList,
         \Magento\Framework\ObjectManagerInterface $objectManager,
         ConfigLoaderInterface $configLoader,
-        DeploymentConfig $deploymentConfig = null
+        DeploymentConfig $deploymentConfig = null,
+        ?Environment $env = null
     ) {
         $this->state = $state;
         $this->response = $response;
@@ -105,6 +114,7 @@ public function __construct(
         $this->objectManager = $objectManager;
         $this->configLoader = $configLoader;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
+        $this->env = $env ?: ObjectManager::getInstance()->create(Environment::class);
     }
 
     /**
@@ -153,7 +163,7 @@ public function catchException(Bootstrap $bootstrap, \Exception $exception)
                     $exception->getTrace(),
                     true,
                     true,
-                    false
+                    boolval($this->env->getEnv('DEBUG_SHOW_ARGS', true))
                 )
             );
             $this->response->sendResponse();
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index 1b39a777063ed..f59003970750b 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -9,6 +9,7 @@
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Debug;
+use Zend\Http\PhpEnvironment\Request as Environment;
 
 /**
  * Message manager model
@@ -61,6 +62,11 @@ class Manager implements ManagerInterface
      */
     private $exceptionMessageFactory;
 
+    /**
+     * @var Environment
+     */
+    private $env;
+
     /**
      * @param Session $session
      * @param Factory $messageFactory
@@ -69,6 +75,7 @@ class Manager implements ManagerInterface
      * @param LoggerInterface $logger
      * @param string $defaultGroup
      * @param ExceptionMessageFactoryInterface|null $exceptionMessageFactory
+     * @param Environment|null $env
      */
     public function __construct(
         Session $session,
@@ -77,7 +84,8 @@ public function __construct(
         Event\ManagerInterface $eventManager,
         LoggerInterface $logger,
         $defaultGroup = self::DEFAULT_GROUP,
-        ExceptionMessageFactoryInterface $exceptionMessageFactory = null
+        ExceptionMessageFactoryInterface $exceptionMessageFactory = null,
+        ?Environment $env = null
     ) {
         $this->session = $session;
         $this->messageFactory = $messageFactory;
@@ -87,6 +95,7 @@ public function __construct(
         $this->defaultGroup = $defaultGroup;
         $this->exceptionMessageFactory = $exceptionMessageFactory ?: ObjectManager::getInstance()
             ->get(ExceptionMessageLookupFactory::class);
+        $this->env = $env ?: ObjectManager::getInstance()->create(Environment::class);
     }
 
     /**
@@ -253,7 +262,7 @@ public function addException(\Exception $exception, $alternativeText = null, $gr
                 $exception->getTrace(),
                 true,
                 true,
-                false
+                boolval($this->env->getEnv('DEBUG_SHOW_ARGS', true))
             )
         );
 

From 205be7f7a2ebbbaeb3a6710c71fa7c0c478b56d9 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 9 Jan 2019 12:35:28 +0200
Subject: [PATCH 0118/1055] MAGETWO-96505: Fixed incorrect stacktrace
 displaying

---
 lib/internal/Magento/Framework/App/Http.php      | 16 +++-------------
 .../Magento/Framework/App/StaticResource.php     | 14 ++------------
 .../Magento/Framework/Message/Manager.php        | 15 +++------------
 3 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index 1b9db1d4069be..745f1639c7efd 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -14,7 +14,6 @@
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Event;
 use Magento\Framework\Filesystem;
-use Zend\Http\PhpEnvironment\Request as Environment;
 
 /**
  * HTTP web application. Called from webroot index.php to serve web requests.
@@ -73,11 +72,6 @@ class Http implements \Magento\Framework\AppInterface
      */
     private $logger;
 
-    /**
-     * @var Environment
-     */
-    private $env;
-
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param Event\Manager $eventManager
@@ -88,8 +82,6 @@ class Http implements \Magento\Framework\AppInterface
      * @param State $state
      * @param Filesystem $filesystem
      * @param \Magento\Framework\Registry $registry
-     * @param Environment|null $env
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -100,8 +92,7 @@ public function __construct(
         ConfigLoaderInterface $configLoader,
         State $state,
         Filesystem $filesystem,
-        \Magento\Framework\Registry $registry,
-        ?Environment $env = null
+        \Magento\Framework\Registry $registry
     ) {
         $this->_objectManager = $objectManager;
         $this->_eventManager = $eventManager;
@@ -112,7 +103,6 @@ public function __construct(
         $this->_state = $state;
         $this->_filesystem = $filesystem;
         $this->registry = $registry;
-        $this->env = $env ?: ObjectManager::getInstance()->create(Environment::class);
     }
 
     /**
@@ -230,7 +220,7 @@ private function buildContentFromException(\Exception $exception)
                     $exception->getTrace(),
                     true,
                     true,
-                    boolval($this->env->getEnv('DEBUG_SHOW_ARGS', true))
+                    boolval(getenv('DEBUG_SHOW_ARGS'))
                 )
             );
         }
@@ -335,7 +325,7 @@ private function handleGenericReport(Bootstrap $bootstrap, \Exception $exception
                 $exception->getTrace(),
                 true,
                 true,
-                (bool)DEBUG_BACKTRACE_IGNORE_ARGS
+                boolval(getenv('DEBUG_SHOW_ARGS'))
             )
         ];
         $params = $bootstrap->getParams();
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index bbb63d3dbe580..2d9dbe2165a61 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -11,7 +11,6 @@
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\Debug;
-use Zend\Http\PhpEnvironment\Request as Environment;
 
 /**
  * Entry point for retrieving static resources like JS, CSS, images by requested public path
@@ -75,11 +74,6 @@ class StaticResource implements \Magento\Framework\AppInterface
      */
     private $logger;
 
-    /**
-     * @var Environment
-     */
-    private $env;
-
     /**
      * @param State $state
      * @param Response\FileInterface $response
@@ -90,8 +84,6 @@ class StaticResource implements \Magento\Framework\AppInterface
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ConfigLoaderInterface $configLoader
      * @param DeploymentConfig|null $deploymentConfig
-     * @param Environment|null $env
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         State $state,
@@ -102,8 +94,7 @@ public function __construct(
         \Magento\Framework\Module\ModuleList $moduleList,
         \Magento\Framework\ObjectManagerInterface $objectManager,
         ConfigLoaderInterface $configLoader,
-        DeploymentConfig $deploymentConfig = null,
-        ?Environment $env = null
+        DeploymentConfig $deploymentConfig = null
     ) {
         $this->state = $state;
         $this->response = $response;
@@ -114,7 +105,6 @@ public function __construct(
         $this->objectManager = $objectManager;
         $this->configLoader = $configLoader;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
-        $this->env = $env ?: ObjectManager::getInstance()->create(Environment::class);
     }
 
     /**
@@ -163,7 +153,7 @@ public function catchException(Bootstrap $bootstrap, \Exception $exception)
                     $exception->getTrace(),
                     true,
                     true,
-                    boolval($this->env->getEnv('DEBUG_SHOW_ARGS', true))
+                    boolval(getenv('DEBUG_SHOW_ARGS'))
                 )
             );
             $this->response->sendResponse();
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index f59003970750b..bae6be8e99bf3 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -9,7 +9,6 @@
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Debug;
-use Zend\Http\PhpEnvironment\Request as Environment;
 
 /**
  * Message manager model
@@ -62,11 +61,6 @@ class Manager implements ManagerInterface
      */
     private $exceptionMessageFactory;
 
-    /**
-     * @var Environment
-     */
-    private $env;
-
     /**
      * @param Session $session
      * @param Factory $messageFactory
@@ -75,7 +69,6 @@ class Manager implements ManagerInterface
      * @param LoggerInterface $logger
      * @param string $defaultGroup
      * @param ExceptionMessageFactoryInterface|null $exceptionMessageFactory
-     * @param Environment|null $env
      */
     public function __construct(
         Session $session,
@@ -84,8 +77,7 @@ public function __construct(
         Event\ManagerInterface $eventManager,
         LoggerInterface $logger,
         $defaultGroup = self::DEFAULT_GROUP,
-        ExceptionMessageFactoryInterface $exceptionMessageFactory = null,
-        ?Environment $env = null
+        ExceptionMessageFactoryInterface $exceptionMessageFactory = null
     ) {
         $this->session = $session;
         $this->messageFactory = $messageFactory;
@@ -95,7 +87,6 @@ public function __construct(
         $this->defaultGroup = $defaultGroup;
         $this->exceptionMessageFactory = $exceptionMessageFactory ?: ObjectManager::getInstance()
             ->get(ExceptionMessageLookupFactory::class);
-        $this->env = $env ?: ObjectManager::getInstance()->create(Environment::class);
     }
 
     /**
@@ -262,7 +253,7 @@ public function addException(\Exception $exception, $alternativeText = null, $gr
                 $exception->getTrace(),
                 true,
                 true,
-                boolval($this->env->getEnv('DEBUG_SHOW_ARGS', true))
+                boolval(getenv('DEBUG_SHOW_ARGS'))
             )
         );
 
@@ -305,7 +296,7 @@ public function addExceptionMessage(\Exception $exception, $alternativeText = nu
                 $exception->getTrace(),
                 true,
                 true,
-                false
+                boolval(getenv('DEBUG_SHOW_ARGS'))
             )
         );
 

From c351a34d9a58d1fba366439dc15d3a4f8914ff86 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 9 Jan 2019 13:35:41 +0200
Subject: [PATCH 0119/1055] MAGETWO-96505: Fixed incorrect stacktrace
 displaying

---
 .htaccess | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.htaccess b/.htaccess
index d22b5a1395cae..0d94ab76bab52 100644
--- a/.htaccess
+++ b/.htaccess
@@ -29,6 +29,8 @@
 
 ############################################
 ## default index file
+## Specifies option, to use methods arguments in backtrace or not
+    SetEnv DEBUG_SHOW_ARGS 0
 
     DirectoryIndex index.php
 

From ff46fc02ca1454a1f965a6ef3f5abf38b7aea997 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 9 Jan 2019 14:34:12 +0200
Subject: [PATCH 0120/1055] MAGETWO-96757: Fixed incorrect displaying of the
 sales rule conditions

---
 .../Adminhtml/Promo/Quote/NewConditionHtml.php         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
index 715f5a3630a6a..50545fd864866 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
@@ -1,12 +1,16 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-class NewConditionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Controller class NewConditionHtml. Returns condition html
+ */
+class NewConditionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
 {
     /**
      * New condition html action
@@ -44,4 +48,4 @@ public function execute()
         }
         $this->getResponse()->setBody($html);
     }
-}
\ No newline at end of file
+}

From d23af6e295b9aea9b643386f39ec1f07b5533371 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 10 Jan 2019 13:00:16 +0200
Subject: [PATCH 0121/1055] MAGETWO-96505: Fixed incorrect stacktrace
 displaying

---
 .htaccess                                             | 2 +-
 lib/internal/Magento/Framework/App/Http.php           | 4 ++--
 lib/internal/Magento/Framework/App/StaticResource.php | 2 +-
 lib/internal/Magento/Framework/Message/Manager.php    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.htaccess b/.htaccess
index 0d94ab76bab52..1fbef84693823 100644
--- a/.htaccess
+++ b/.htaccess
@@ -30,7 +30,7 @@
 ############################################
 ## default index file
 ## Specifies option, to use methods arguments in backtrace or not
-    SetEnv DEBUG_SHOW_ARGS 0
+    SetEnv MAGE_DEBUG_SHOW_ARGS 1
 
     DirectoryIndex index.php
 
diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index 745f1639c7efd..23024a44c2def 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -220,7 +220,7 @@ private function buildContentFromException(\Exception $exception)
                     $exception->getTrace(),
                     true,
                     true,
-                    boolval(getenv('DEBUG_SHOW_ARGS'))
+                    (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
                 )
             );
         }
@@ -325,7 +325,7 @@ private function handleGenericReport(Bootstrap $bootstrap, \Exception $exception
                 $exception->getTrace(),
                 true,
                 true,
-                boolval(getenv('DEBUG_SHOW_ARGS'))
+                (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
             )
         ];
         $params = $bootstrap->getParams();
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index 2d9dbe2165a61..86b2b15d3c446 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -153,7 +153,7 @@ public function catchException(Bootstrap $bootstrap, \Exception $exception)
                     $exception->getTrace(),
                     true,
                     true,
-                    boolval(getenv('DEBUG_SHOW_ARGS'))
+                    (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
                 )
             );
             $this->response->sendResponse();
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index bae6be8e99bf3..c70798bf0281f 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -253,7 +253,7 @@ public function addException(\Exception $exception, $alternativeText = null, $gr
                 $exception->getTrace(),
                 true,
                 true,
-                boolval(getenv('DEBUG_SHOW_ARGS'))
+                (bool)getenv('DEBUG_SHOW_ARGS')
             )
         );
 
@@ -296,7 +296,7 @@ public function addExceptionMessage(\Exception $exception, $alternativeText = nu
                 $exception->getTrace(),
                 true,
                 true,
-                boolval(getenv('DEBUG_SHOW_ARGS'))
+                (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
             )
         );
 

From c4e4487bade6c25d6625ec38e580ecabc88439c8 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 10 Jan 2019 13:28:29 +0200
Subject: [PATCH 0122/1055] MAGETWO-96505: Fixed incorrect stacktrace
 displaying

---
 lib/internal/Magento/Framework/Message/Manager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index c70798bf0281f..37ca1e7e2b725 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -253,7 +253,7 @@ public function addException(\Exception $exception, $alternativeText = null, $gr
                 $exception->getTrace(),
                 true,
                 true,
-                (bool)getenv('DEBUG_SHOW_ARGS')
+                (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
             )
         );
 

From 623dc1215f726afd0df18f7d703c7410d3096b2b Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Thu, 10 Jan 2019 16:50:09 +0300
Subject: [PATCH 0123/1055] MAGETWO-96127: Catalog grid page number resets
 after Save and Close action

- Fixing of random reproducing
---
 .../Ui/view/base/web/js/grid/paging/paging.js      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
index 5db420685f718..d90d13b1a0d09 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
@@ -32,8 +32,18 @@ define([
                 }
             },
 
+            currentConfig: {
+                component: 'Magento_Ui/js/grid/paging/paging',
+                name: '${ $.name }_current',
+                storageConfig: {
+                    provider: '${ $.storageConfig.provider }',
+                    namespace: '${ $.storageConfig.namespace }'
+                }
+            },
+
             imports: {
                 pageSize: '${ $.sizesConfig.name }:value',
+                current: '${ $.currentConfig.name }:value',
                 totalSelected: '${ $.selectProvider }:totalSelected',
                 totalRecords: '${ $.provider }:data.totalRecords'
             },
@@ -52,9 +62,9 @@ define([
             },
 
             listens: {
-                'totalRecords': 'updateCounter',
                 'pages': 'updateCounter',
                 'pageSize': 'onPageSizeChange',
+                'totalRecords': 'updateCounter',
                 '${ $.provider }:params.filters': 'goFirst'
             },
 
@@ -244,7 +254,7 @@ define([
 
             this.previousSize = size;
 
-            if (!isNaN(delta)) {
+            if (delta) {
                 this.setPage(cursor);
             }
 

From 8966f5f3a784085d53ee206b1492f708de672e55 Mon Sep 17 00:00:00 2001
From: Jeroen van Leusden <jeroen@reachdigital.nl>
Date: Thu, 10 Jan 2019 16:51:48 +0100
Subject: [PATCH 0124/1055] Use correct base path to check if setup folder
 exists

---
 .../Magento/Framework/App/DocRootLocator.php    | 17 ++++++++++++++---
 .../App/Test/Unit/DocRootLocatorTest.php        | 10 +++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/DocRootLocator.php b/lib/internal/Magento/Framework/App/DocRootLocator.php
index 6fb35c42f1330..d73baf8e4e742 100644
--- a/lib/internal/Magento/Framework/App/DocRootLocator.php
+++ b/lib/internal/Magento/Framework/App/DocRootLocator.php
@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 
 /**
@@ -20,18 +22,26 @@ class DocRootLocator
     private $request;
 
     /**
+     * @deprecated
      * @var ReadFactory
      */
     private $readFactory;
 
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
     /**
      * @param RequestInterface $request
      * @param ReadFactory $readFactory
+     * @param Filesystem|null $filesystem
      */
-    public function __construct(RequestInterface $request, ReadFactory $readFactory)
+    public function __construct(RequestInterface $request, ReadFactory $readFactory, Filesystem $filesystem = null)
     {
         $this->request = $request;
         $this->readFactory = $readFactory;
+        $this->filesystem = $filesystem ?: ObjectManager::getInstance()->get(Filesystem::class);
     }
 
     /**
@@ -42,7 +52,8 @@ public function __construct(RequestInterface $request, ReadFactory $readFactory)
     public function isPub()
     {
         $rootBasePath = $this->request->getServer('DOCUMENT_ROOT');
-        $readDirectory = $this->readFactory->create(DirectoryList::ROOT);
-        return (substr($rootBasePath, -strlen('/pub')) === '/pub') && !$readDirectory->isExist($rootBasePath . 'setup');
+        $readDirectory = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
+
+        return (substr($rootBasePath, -\strlen('/pub')) === '/pub') && ! $readDirectory->isExist('setup');
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
index 23afbbc73d2b9..fd6c1f208080a 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
@@ -21,11 +21,15 @@ public function testIsPub($path, $isExist, $result)
     {
         $request = $this->createMock(\Magento\Framework\App\Request\Http::class);
         $request->expects($this->once())->method('getServer')->willReturn($path);
+
+        $readFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class);
+
         $reader = $this->createMock(\Magento\Framework\Filesystem\Directory\Read::class);
+        $filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
+        $filesystem->expects($this->once())->method('getDirectoryRead')->willReturn($reader);
         $reader->expects($this->any())->method('isExist')->willReturn($isExist);
-        $readFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class);
-        $readFactory->expects($this->once())->method('create')->willReturn($reader);
-        $model = new DocRootLocator($request, $readFactory);
+
+        $model = new DocRootLocator($request, $readFactory, $filesystem);
         $this->assertSame($result, $model->isPub());
     }
 

From a0566abffe872cca0a7e06eb2b4d08093f15fbda Mon Sep 17 00:00:00 2001
From: Fabian Schmengler <fs@integer-net.de>
Date: Fri, 11 Jan 2019 11:18:28 +0100
Subject: [PATCH 0125/1055] Deny access to XML and PHTML files in pub/errors

For apache via .htaccess and in nginx sample configuration
---
 nginx.conf.sample    | 7 ++++++-
 pub/errors/.htaccess | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nginx.conf.sample b/nginx.conf.sample
index 90604808f6ec0..80cc88431eff8 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -159,6 +159,11 @@ location /media/downloadable/ {
 location /media/import/ {
     deny all;
 }
+location /errors/ {
+    location ~* \.xml$ {
+        deny all;
+    }
+}
 
 # PHP entry point for main application
 location ~ ^/(index|get|static|errors/report|errors/404|errors/503|health_check)\.php$ {
@@ -198,6 +203,6 @@ gzip_types
 gzip_vary on;
 
 # Banned locations (only reached if the earlier PHP entry point regexes don't match)
-location ~* (\.php$|\.htaccess$|\.git) {
+location ~* (\.php$|\.phtml$|\.htaccess$|\.git) {
     deny all;
 }
diff --git a/pub/errors/.htaccess b/pub/errors/.htaccess
index 3692dd439e2ff..a7b9cbda05893 100644
--- a/pub/errors/.htaccess
+++ b/pub/errors/.htaccess
@@ -1,4 +1,7 @@
 Options None
+<FilesMatch "\.(xml|phtml)$">
+    Deny from all
+</FilesMatch>
 <IfModule mod_rewrite.c>
     RewriteEngine Off
 </IfModule>

From d8e222f81c43464e0f8c91d669d83026f663fe02 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 16 Jan 2019 17:19:14 -0600
Subject: [PATCH 0126/1055] MC-10866: Cart's customer and address mismatch

---
 .../Quote/Address/BillingAddressPersister.php |   2 +-
 .../Quote/Model/QuoteAddressValidator.php     |  66 +++++++--
 .../Quote/Model/ShippingAddressManagement.php |   2 +-
 ...GuestShippingInformationManagementTest.php | 125 ++++++++++++++++++
 .../Api/ShippingInformationManagementTest.php | 104 +++++++++++++++
 .../_files/customer_with_addresses.php        |  75 +++++++++++
 .../customer_with_addresses_rollback.php      |  34 +++++
 7 files changed, 392 insertions(+), 16 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php

diff --git a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
index c5b8dc1c4b124..c0f90cb55e1f1 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
@@ -47,7 +47,7 @@ public function __construct(
     public function save(CartInterface $quote, AddressInterface $address, $useForShipping = false)
     {
         /** @var \Magento\Quote\Model\Quote $quote */
-        $this->addressValidator->validate($address);
+        $this->addressValidator->validateForCart($quote, $address);
         $customerAddressId = $address->getCustomerAddressId();
         $shippingAddress = null;
         $addressData = [];
diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
index 9a86829bfc4ce..8bfc97e9920b9 100644
--- a/app/code/Magento/Quote/Model/QuoteAddressValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
@@ -6,6 +6,8 @@
 namespace Magento\Quote\Model;
 
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\CartInterface;
 
 /**
  * Quote shipping/billing address validator service.
@@ -50,44 +52,80 @@ public function __construct(
     }
 
     /**
-     * Validates the fields in a specified address data object.
+     * Validate address.
      *
-     * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
-     * @return bool
+     * @param AddressInterface $address
+     * @param int|null $customerId Cart belongs to
+     * @return void
      * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
      */
-    public function validate(\Magento\Quote\Api\Data\AddressInterface $addressData)
+    private function doValidate(AddressInterface $address, ?int $customerId): void
     {
         //validate customer id
-        if ($addressData->getCustomerId()) {
-            $customer = $this->customerRepository->getById($addressData->getCustomerId());
+        if ($customerId) {
+            $customer = $this->customerRepository->getById($customerId);
             if (!$customer->getId()) {
                 throw new \Magento\Framework\Exception\NoSuchEntityException(
-                    __('Invalid customer id %1', $addressData->getCustomerId())
+                    __('Invalid customer id %1', $customerId)
                 );
             }
         }
 
-        if ($addressData->getCustomerAddressId()) {
+        if ($address->getCustomerAddressId()) {
+            //Existing address cannot belong to a guest
+            if (!$customerId) {
+                throw new \Magento\Framework\Exception\NoSuchEntityException(
+                    __('Invalid customer address id %1', $address->getCustomerAddressId())
+                );
+            }
+            //Validating address ID
             try {
-                $this->addressRepository->getById($addressData->getCustomerAddressId());
+                $this->addressRepository->getById($address->getCustomerAddressId());
             } catch (NoSuchEntityException $e) {
                 throw new \Magento\Framework\Exception\NoSuchEntityException(
-                    __('Invalid address id %1', $addressData->getId())
+                    __('Invalid address id %1', $address->getId())
                 );
             }
-
+            //Finding available customer's addresses
             $applicableAddressIds = array_map(function ($address) {
                 /** @var \Magento\Customer\Api\Data\AddressInterface $address */
                 return $address->getId();
-            }, $this->customerRepository->getById($addressData->getCustomerId())->getAddresses());
-            if (!in_array($addressData->getCustomerAddressId(), $applicableAddressIds)) {
+            }, $this->customerRepository->getById($customerId)->getAddresses());
+            if (!in_array($address->getCustomerAddressId(), $applicableAddressIds)) {
                 throw new \Magento\Framework\Exception\NoSuchEntityException(
-                    __('Invalid customer address id %1', $addressData->getCustomerAddressId())
+                    __('Invalid customer address id %1', $address->getCustomerAddressId())
                 );
             }
         }
+    }
+
+    /**
+     * Validates the fields in a specified address data object.
+     *
+     * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
+     * @return bool
+     * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
+     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+     */
+    public function validate(AddressInterface $addressData)
+    {
+        $this->doValidate($addressData, $addressData->getCustomerId());
+
         return true;
     }
+
+    /**
+     * Validate address to be used for cart.
+     *
+     * @param CartInterface $cart
+     * @param AddressInterface $address
+     * @return void
+     * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
+     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+     */
+    public function validateForCart(CartInterface $cart, AddressInterface $address): void
+    {
+        $this->doValidate($address, $cart->getCustomerIsGuest() ? null : $cart->getCustomer()->getId());
+    }
 }
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index d8e70c68ba33f..b006dcf7814d5 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -95,7 +95,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
         $saveInAddressBook = $address->getSaveInAddressBook() ? 1 : 0;
         $sameAsBilling = $address->getSameAsBilling() ? 1 : 0;
         $customerAddressId = $address->getCustomerAddressId();
-        $this->addressValidator->validate($address);
+        $this->addressValidator->validateForCart($quote, $address);
         $quote->setShippingAddress($address);
         $address = $quote->getShippingAddress();
 
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php
new file mode 100644
index 0000000000000..50b1256c0f124
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Api;
+
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+
+/**
+ * Test GuestShippingInformationManagement API.
+ */
+class GuestShippingInformationManagementTest extends TestCase
+{
+    /**
+     * @var GuestShippingInformationManagementInterface
+     */
+    private $management;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepo;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepo;
+
+    /**
+     * @var ShippingInformationInterfaceFactory
+     */
+    private $shippingFactory;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteria;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $maskFactory;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->management = $objectManager->get(GuestShippingInformationManagementInterface::class);
+        $this->cartRepo = $objectManager->get(CartRepositoryInterface::class);
+        $this->customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
+        $this->shippingFactory = $objectManager->get(ShippingInformationInterfaceFactory::class);
+        $this->searchCriteria = $objectManager->get(SearchCriteriaBuilder::class);
+        $this->maskFactory = $objectManager->get(QuoteIdMaskFactory::class);
+    }
+
+    /**
+     * Test using another address for quote.
+     *
+     * @param bool $swapShipping Whether to swap shipping or billing addresses.
+     * @return void
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/Customer/_files/customer_with_addresses.php
+     * @dataProvider getAddressesVariation
+     * @expectedException  \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage The shipping information was unable to be saved. Verify the input data and try again.
+     */
+    public function testDifferentAddresses(bool $swapShipping)
+    {
+        $carts = $this->cartRepo->getList(
+            $this->searchCriteria->addFilter('reserved_order_id', 'test01')->create()
+        )->getItems();
+        $cart = array_pop($carts);
+        $otherCustomer = $this->customerRepo->get('customer_with_addresses@test.com');
+        $otherAddresses = $otherCustomer->getAddresses();
+        $otherAddress = array_pop($otherAddresses);
+
+        //Setting invalid IDs.
+        /** @var ShippingAssignmentInterface $shippingAssignment */
+        $shippingAssignment = $cart->getExtensionAttributes()->getShippingAssignments()[0];
+        $shippingAddress = $shippingAssignment->getShipping()->getAddress();
+        $billingAddress = $cart->getBillingAddress();
+        if ($swapShipping) {
+            $address = $shippingAddress;
+        } else {
+            $address = $billingAddress;
+        }
+        $address->setCustomerAddressId($otherAddress->getId());
+        $address->setCustomerId($otherCustomer->getId());
+        $address->setId(null);
+        /** @var ShippingInformationInterface $shippingInformation */
+        $shippingInformation = $this->shippingFactory->create();
+        $shippingInformation->setBillingAddress($billingAddress);
+        $shippingInformation->setShippingAddress($shippingAddress);
+        $shippingInformation->setShippingMethodCode('flatrate');
+        /** @var QuoteIdMask $idMask */
+        $idMask = $this->maskFactory->create();
+        $idMask->load($cart->getId(), 'quote_id');
+        $this->management->saveAddressInformation($idMask->getMaskedId(), $shippingInformation);
+    }
+
+    /**
+     * Different variations for addresses test.
+     *
+     * @return array
+     */
+    public function getAddressesVariation(): array
+    {
+        return [
+            'Shipping address swap' => [true],
+            'Billing address swap' => [false]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php
new file mode 100644
index 0000000000000..7440fb7fd3d98
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Api;
+
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test ShippingInformationManagement API.
+ */
+class ShippingInformationManagementTest extends TestCase
+{
+    /**
+     * @var ShippingInformationManagementInterface
+     */
+    private $management;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepo;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepo;
+
+    /**
+     * @var ShippingInformationInterfaceFactory
+     */
+    private $shippingFactory;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->management = $objectManager->get(ShippingInformationManagementInterface::class);
+        $this->cartRepo = $objectManager->get(CartRepositoryInterface::class);
+        $this->customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
+        $this->shippingFactory = $objectManager->get(ShippingInformationInterfaceFactory::class);
+    }
+
+    /**
+     * Test using another address for quote.
+     *
+     * @param bool $swapShipping Whether to swap shipping or billing addresses.
+     * @return void
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_with_addresses.php
+     * @dataProvider getAddressesVariation
+     * @expectedException  \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage The shipping information was unable to be saved. Verify the input data and try again.
+     */
+    public function testDifferentAddresses(bool $swapShipping)
+    {
+        $cart = $this->cartRepo->getForCustomer(1);
+        $otherCustomer = $this->customerRepo->get('customer_with_addresses@test.com');
+        $otherAddresses = $otherCustomer->getAddresses();
+        $otherAddress = array_pop($otherAddresses);
+
+        //Setting invalid IDs.
+        /** @var ShippingAssignmentInterface $shippingAssignment */
+        $shippingAssignment = $cart->getExtensionAttributes()->getShippingAssignments()[0];
+        $shippingAddress = $shippingAssignment->getShipping()->getAddress();
+        $billingAddress = $cart->getBillingAddress();
+        if ($swapShipping) {
+            $address = $shippingAddress;
+        } else {
+            $address = $billingAddress;
+        }
+        $address->setCustomerAddressId($otherAddress->getId());
+        $address->setCustomerId($otherCustomer->getId());
+        $address->setId(null);
+        /** @var ShippingInformationInterface $shippingInformation */
+        $shippingInformation = $this->shippingFactory->create();
+        $shippingInformation->setBillingAddress($billingAddress);
+        $shippingInformation->setShippingAddress($shippingAddress);
+        $shippingInformation->setShippingMethodCode('flatrate');
+        $this->management->saveAddressInformation($cart->getId(), $shippingInformation);
+    }
+
+    /**
+     * Different variations for addresses test.
+     *
+     * @return array
+     */
+    public function getAddressesVariation(): array
+    {
+        return [
+            'Shipping address swap' => [true],
+            'Billing address swap' => [false]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php
new file mode 100644
index 0000000000000..60b570b9d13d1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\Address;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Model\AddressRegistry;
+
+$objectManager = Bootstrap::getObjectManager();
+//Creating customer
+/** @var $repository CustomerRepositoryInterface */
+$repository = $objectManager->create(CustomerRepositoryInterface::class);
+/** @var Customer $customer */
+$customer = $objectManager->create(Customer::class);
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->get(CustomerRegistry::class);
+$customer->setWebsiteId(1)
+    ->setEmail('customer_with_addresses@test.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0);
+
+$customer->isObjectNew(true);
+$customer->save();
+$customerRegistry->remove($customer->getId());
+
+//Creating address
+/** @var Address $customerAddress */
+$customerAddress = $objectManager->create(Address::class);
+$customerAddress->isObjectNew(true);
+$customerAddress->setData(
+    [
+        'attribute_set_id' => 2,
+        'telephone' => 3468676,
+        'postcode' => 75477,
+        'country_id' => 'US',
+        'city' => 'CityM',
+        'company' => 'CompanyName',
+        'street' => 'CustomerAddress1',
+        'lastname' => 'Smith',
+        'firstname' => 'John',
+        'parent_id' => $customer->getId(),
+        'region_id' => 1,
+    ]
+);
+$customerAddress->save();
+/** @var AddressRepositoryInterface $addressRepository */
+$addressRepository = $objectManager->get(AddressRepositoryInterface::class);
+$customerAddress = $addressRepository->getById($customerAddress->getId());
+$customerAddress->setCustomerId($customer->getId());
+$customerAddress->isDefaultBilling(true);
+$customerAddress->setIsDefaultShipping(true);
+$customerAddress = $addressRepository->save($customerAddress);
+$customerRegistry->remove($customerAddress->getCustomerId());
+/** @var AddressRegistry $addressRegistry */
+$addressRegistry = $objectManager->get(AddressRegistry::class);
+$addressRegistry->remove($customerAddress->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php
new file mode 100644
index 0000000000000..e0c62bffc70d2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_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\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var CustomerRepositoryInterface $customerRepo */
+$customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
+try {
+    $customer = $customerRepo->get('customer_with_addresses@test.com');
+    /** @var AddressRepositoryInterface $addressRepo */
+    $addressRepo = $objectManager->get(AddressRepositoryInterface::class);
+    foreach ($customer->getAddresses() as $address) {
+        $addressRepo->delete($address);
+    }
+    $customerRepo->delete($customer);
+} catch (NoSuchEntityException $exception) {
+    //Already deleted
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 6f81c9d5c63b136ce293e2ee84f262201c5b488d Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 17 Jan 2019 11:08:54 -0600
Subject: [PATCH 0127/1055] MC-10866: Cart's customer and address mismatch

---
 .../Quote/Address/BillingAddressPersister.php |   5 +
 .../Quote/Model/QuoteAddressValidator.php     |   1 -
 .../Quote/Model/ShippingAddressManagement.php |   4 +-
 .../Unit/Model/QuoteAddressValidatorTest.php  | 128 --------
 .../Model/ShippingAddressManagementTest.php   | 282 ------------------
 5 files changed, 7 insertions(+), 413 deletions(-)
 delete mode 100644 app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
 delete mode 100644 app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php

diff --git a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
index c0f90cb55e1f1..6fdb70350ed72 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
@@ -12,6 +12,9 @@
 use Magento\Quote\Model\QuoteAddressValidator;
 use Magento\Customer\Api\AddressRepositoryInterface;
 
+/**
+ * Saves billing address for quotes.
+ */
 class BillingAddressPersister
 {
     /**
@@ -37,6 +40,8 @@ public function __construct(
     }
 
     /**
+     * Save address for billing.
+     *
      * @param CartInterface $quote
      * @param AddressInterface $address
      * @param bool $useForShipping
diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
index 8bfc97e9920b9..50807f71a29d0 100644
--- a/app/code/Magento/Quote/Model/QuoteAddressValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
@@ -11,7 +11,6 @@
 
 /**
  * Quote shipping/billing address validator service.
- *
  */
 class QuoteAddressValidator
 {
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index b006dcf7814d5..b9edcc13d0077 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -79,7 +79,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)
@@ -123,7 +123,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function get($cartId)
     {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
deleted file mode 100644
index 08f5f6a808561..0000000000000
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Quote\Test\Unit\Model;
-
-class QuoteAddressValidatorTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Quote\Model\QuoteAddressValidator
-     */
-    protected $model;
-
-    /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    protected $objectManager;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $addressRepositoryMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerRepositoryMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $quoteAddressMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerSessionMock;
-
-    protected function setUp()
-    {
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
-        $this->addressRepositoryMock = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
-        $this->quoteAddressMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Address::class,
-            ['getCustomerId', 'load', 'getId', '__wakeup']
-        );
-        $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
-        $this->model = $this->objectManager->getObject(
-            \Magento\Quote\Model\QuoteAddressValidator::class,
-            [
-                'addressRepository' => $this->addressRepositoryMock,
-                'customerRepository' => $this->customerRepositoryMock,
-                'customerSession' => $this->customerSessionMock
-            ]
-        );
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Invalid customer id 100
-     */
-    public function testValidateInvalidCustomer()
-    {
-        $customerId = 100;
-        $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-
-        $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
-        $this->customerRepositoryMock->expects($this->once())->method('getById')->with($customerId)
-            ->willReturn($customerMock);
-        $this->model->validate($address);
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Invalid address id 101
-     */
-    public function testValidateInvalidAddress()
-    {
-        $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-        $this->customerRepositoryMock->expects($this->never())->method('getById');
-        $address->expects($this->atLeastOnce())->method('getCustomerAddressId')->willReturn(101);
-        $address->expects($this->once())->method('getId')->willReturn(101);
-
-        $this->addressRepositoryMock->expects($this->once())->method('getById')
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
-
-        $this->model->validate($address);
-    }
-
-    /**
-     * Neither customer id used nor address id exists
-     */
-    public function testValidateNewAddress()
-    {
-        $this->customerRepositoryMock->expects($this->never())->method('getById');
-        $this->addressRepositoryMock->expects($this->never())->method('getById');
-        $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-        $this->assertTrue($this->model->validate($address));
-    }
-
-    public function testValidateWithValidAddress()
-    {
-        $addressCustomer = 100;
-        $customerAddressId = 42;
-
-        $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-        $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($addressCustomer);
-        $address->expects($this->atLeastOnce())->method('getCustomerAddressId')->willReturn($customerAddressId);
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $customerAddress = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-
-        $this->customerRepositoryMock->expects($this->exactly(2))->method('getById')->willReturn($customerMock);
-        $customerMock->expects($this->once())->method('getId')->willReturn($addressCustomer);
-
-        $this->addressRepositoryMock->expects($this->once())->method('getById')->willReturn($this->quoteAddressMock);
-        $this->quoteAddressMock->expects($this->any())->method('getCustomerId')->willReturn($addressCustomer);
-
-        $customerMock->expects($this->once())->method('getAddresses')->willReturn([$customerAddress]);
-        $customerAddress->expects($this->once())->method('getId')->willReturn(42);
-
-        $this->assertTrue($this->model->validate($address));
-    }
-}
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
deleted file mode 100644
index 89fea2bec73a8..0000000000000
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Quote\Test\Unit\Model;
-
-use \Magento\Quote\Model\ShippingAddressManagement;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ShippingAddressManagementTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var ShippingAddressManagement
-     */
-    protected $service;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $quoteRepositoryMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $quoteAddressMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $validatorMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $scopeConfigMock;
-
-    /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    protected $objectManager;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $totalsCollectorMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $addressRepository;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $amountErrorMessageMock;
-
-    protected function setUp()
-    {
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->quoteRepositoryMock = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
-        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-
-        $this->quoteAddressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, [
-                'setSameAsBilling',
-                'setCollectShippingRates',
-                '__wakeup',
-                'collectTotals',
-                'save',
-                'getId',
-                'getCustomerAddressId',
-                'getSaveInAddressBook',
-                'getSameAsBilling',
-                'importCustomerAddressData',
-                'setSaveInAddressBook',
-            ]);
-        $this->validatorMock = $this->createMock(\Magento\Quote\Model\QuoteAddressValidator::class);
-        $this->totalsCollectorMock = $this->createMock(\Magento\Quote\Model\Quote\TotalsCollector::class);
-        $this->addressRepository = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
-
-        $this->amountErrorMessageMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage::class,
-            ['getMessage']
-        );
-
-        $this->service = $this->objectManager->getObject(
-            \Magento\Quote\Model\ShippingAddressManagement::class,
-            [
-                'quoteRepository' => $this->quoteRepositoryMock,
-                'addressValidator' => $this->validatorMock,
-                'logger' => $this->createMock(\Psr\Log\LoggerInterface::class),
-                'scopeConfig' => $this->scopeConfigMock,
-                'totalsCollector' => $this->totalsCollectorMock,
-                'addressRepository' => $this->addressRepository
-            ]
-        );
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage error345
-     */
-    public function testSetAddressValidationFailed()
-    {
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('getActive')
-            ->with('cart654')
-            ->will($this->returnValue($quoteMock));
-
-        $this->validatorMock->expects($this->once())->method('validate')
-            ->will($this->throwException(new \Magento\Framework\Exception\NoSuchEntityException(__('error345'))));
-
-        $this->service->assign('cart654', $this->quoteAddressMock);
-    }
-
-    public function testSetAddress()
-    {
-        $addressId = 1;
-        $customerAddressId = 150;
-
-        $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
-            ['getIsMultiShipping', 'isVirtual', 'validateMinimumAmount', 'setShippingAddress', 'getShippingAddress']
-        );
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('getActive')
-            ->with('cart867')
-            ->willReturn($quoteMock);
-        $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(false));
-        $quoteMock->expects($this->once())
-            ->method('setShippingAddress')
-            ->with($this->quoteAddressMock)
-            ->willReturnSelf();
-
-        $this->quoteAddressMock->expects($this->once())->method('getSaveInAddressBook')->willReturn(1);
-        $this->quoteAddressMock->expects($this->once())->method('getSameAsBilling')->willReturn(1);
-        $this->quoteAddressMock->expects($this->once())->method('getCustomerAddressId')->willReturn($customerAddressId);
-
-        $customerAddressMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
-
-        $this->addressRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerAddressId)
-            ->willReturn($customerAddressMock);
-
-        $this->validatorMock->expects($this->once())->method('validate')
-            ->with($this->quoteAddressMock)
-            ->willReturn(true);
-
-        $quoteMock->expects($this->exactly(3))->method('getShippingAddress')->willReturn($this->quoteAddressMock);
-        $this->quoteAddressMock->expects($this->once())
-            ->method('importCustomerAddressData')
-            ->with($customerAddressMock)
-            ->willReturnSelf();
-
-        $this->quoteAddressMock->expects($this->once())->method('setSameAsBilling')->with(1)->willReturnSelf();
-        $this->quoteAddressMock->expects($this->once())->method('setSaveInAddressBook')->with(1)->willReturnSelf();
-        $this->quoteAddressMock->expects($this->once())
-            ->method('setCollectShippingRates')
-            ->with(true)
-            ->willReturnSelf();
-
-        $this->quoteAddressMock->expects($this->once())->method('save')->willReturnSelf();
-        $this->quoteAddressMock->expects($this->once())->method('getId')->will($this->returnValue($addressId));
-
-        $this->assertEquals($addressId, $this->service->assign('cart867', $this->quoteAddressMock));
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
-     */
-    public function testSetAddressForVirtualProduct()
-    {
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('getActive')
-            ->with('cart867')
-            ->will($this->returnValue($quoteMock));
-        $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(true));
-        $quoteMock->expects($this->never())->method('setShippingAddress');
-
-        $this->quoteAddressMock->expects($this->never())->method('getCustomerAddressId');
-        $this->quoteAddressMock->expects($this->never())->method('setSaveInAddressBook');
-
-        $quoteMock->expects($this->never())->method('save');
-
-        $this->service->assign('cart867', $this->quoteAddressMock);
-    }
-
-    /**
-     * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage The address failed to save. Verify the address and try again.
-     */
-    public function testSetAddressWithInabilityToSaveQuote()
-    {
-        $this->quoteAddressMock->expects($this->once())->method('save')->willThrowException(
-            new \Exception('The address failed to save. Verify the address and try again.')
-        );
-
-        $customerAddressId = 150;
-
-        $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
-            ['getIsMultiShipping', 'isVirtual', 'validateMinimumAmount', 'setShippingAddress', 'getShippingAddress']
-        );
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('getActive')
-            ->with('cart867')
-            ->willReturn($quoteMock);
-        $quoteMock->expects($this->once())->method('isVirtual')->will($this->returnValue(false));
-        $quoteMock->expects($this->once())
-            ->method('setShippingAddress')
-            ->with($this->quoteAddressMock)
-            ->willReturnSelf();
-
-        $customerAddressMock = $this->createMock(\Magento\Customer\Api\Data\AddressInterface::class);
-
-        $this->addressRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerAddressId)
-            ->willReturn($customerAddressMock);
-
-        $this->validatorMock->expects($this->once())->method('validate')
-            ->with($this->quoteAddressMock)
-            ->willReturn(true);
-
-        $this->quoteAddressMock->expects($this->once())->method('getSaveInAddressBook')->willReturn(1);
-        $this->quoteAddressMock->expects($this->once())->method('getSameAsBilling')->willReturn(1);
-        $this->quoteAddressMock->expects($this->once())->method('getCustomerAddressId')->willReturn($customerAddressId);
-
-        $quoteMock->expects($this->exactly(2))->method('getShippingAddress')->willReturn($this->quoteAddressMock);
-        $this->quoteAddressMock->expects($this->once())
-            ->method('importCustomerAddressData')
-            ->with($customerAddressMock)
-            ->willReturnSelf();
-
-        $this->quoteAddressMock->expects($this->once())->method('setSameAsBilling')->with(1)->willReturnSelf();
-        $this->quoteAddressMock->expects($this->once())->method('setSaveInAddressBook')->with(1)->willReturnSelf();
-        $this->quoteAddressMock->expects($this->once())
-            ->method('setCollectShippingRates')
-            ->with(true)
-            ->willReturnSelf();
-
-        $this->service->assign('cart867', $this->quoteAddressMock);
-    }
-
-    public function testGetAddress()
-    {
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with('cartId')->will(
-            $this->returnValue($quoteMock)
-        );
-
-        $addressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
-        $quoteMock->expects($this->any())->method('getShippingAddress')->will($this->returnValue($addressMock));
-        $quoteMock->expects($this->any())->method('isVirtual')->will($this->returnValue(false));
-        $this->assertEquals($addressMock, $this->service->get('cartId'));
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
-     */
-    public function testGetAddressOfQuoteWithVirtualProducts()
-    {
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with('cartId')->will(
-            $this->returnValue($quoteMock)
-        );
-
-        $quoteMock->expects($this->any())->method('isVirtual')->will($this->returnValue(true));
-        $quoteMock->expects($this->never())->method('getShippingAddress');
-
-        $this->service->get('cartId');
-    }
-}

From 5955ded71ff1367fee224278a1069e09ef711efb Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 17 Jan 2019 11:57:51 -0600
Subject: [PATCH 0128/1055] MQE-1069: Migrate Sample Data tests from MTF to
 MFTF

---
 .../StorefrontAssertProductImagesOnProductPageActionGroup.xml    | 1 +
 .../Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
index e049c7430871f..41bfbe608a31d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
@@ -10,6 +10,7 @@
         <arguments>
             <argument name="productImage" type="string" defaultValue="Magento_Catalog/images/product/placeholder/image.jpg" />
         </arguments>
+        <waitForElementNotVisible selector="{{StorefrontProductMediaSection.gallerySpinner}}" stepKey="waitGallerySpinnerDisappear" />
         <seeElement selector="{{StorefrontProductMediaSection.gallery}}" stepKey="seeProductGallery" />
         <seeElement selector="{{StorefrontProductMediaSection.productImage(productImage)}}" stepKey="seeProductImage" />
         <click selector="{{StorefrontProductMediaSection.productImage(productImage)}}" stepKey="openFullscreenImage" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
index a90525e40b695..28f0c1bbf8890 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.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="StorefrontProductMediaSection">
+        <element name="gallerySpinner" type="block" selector="[data-gallery-role='gallery-placeholder'] div.loader>img" />
         <element name="gallery" type="block" selector="[data-gallery-role='gallery']" />
         <element name="productImage" type="text" selector="//*[@data-gallery-role='gallery' and not(contains(@class, 'fullscreen'))]//img[contains(@src, '{{filename}}') and not(contains(@class, 'full'))]" parameterized="true" />
         <element name="productImageFullscreen" type="text" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//img[contains(@src, '{{filename}}') and contains(@class, 'full')]" parameterized="true" />

From 1f921080c66b7c8392140dc1991c464abe5c10da Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 17 Jan 2019 12:53:21 -0600
Subject: [PATCH 0129/1055] MQE-1069: Migrate Sample Data tests from MTF to
 MFTF

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

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
index 28f0c1bbf8890..3bf1273f05cc2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.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="StorefrontProductMediaSection">
-        <element name="gallerySpinner" type="block" selector="[data-gallery-role='gallery-placeholder'] div.loader>img" />
+        <element name="gallerySpinner" type="block" selector="#maincontent .fotorama__spinner--show" />
         <element name="gallery" type="block" selector="[data-gallery-role='gallery']" />
         <element name="productImage" type="text" selector="//*[@data-gallery-role='gallery' and not(contains(@class, 'fullscreen'))]//img[contains(@src, '{{filename}}') and not(contains(@class, 'full'))]" parameterized="true" />
         <element name="productImageFullscreen" type="text" selector="//*[@data-gallery-role='gallery' and contains(@class, 'fullscreen')]//img[contains(@src, '{{filename}}') and contains(@class, 'full')]" parameterized="true" />

From 3b2bc5b5db0b98cc1a6327cce92daf5318ba79f7 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 17 Jan 2019 14:50:29 -0600
Subject: [PATCH 0130/1055] MQE-1069: Migrate Sample Data tests from MTF to
 MFTF

 - Update test case ids
---
 .../StorefrontAssertProductImagesOnProductPageActionGroup.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
index 41bfbe608a31d..1bb7c179dfca8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductImagesOnProductPageActionGroup.xml
@@ -17,5 +17,6 @@
         <waitForPageLoad stepKey="waitForGalleryLoaded" />
         <seeElement selector="{{StorefrontProductMediaSection.productImageFullscreen(productImage)}}" stepKey="seeFullscreenProductImage" />
         <click selector="{{StorefrontProductMediaSection.closeFullscreenImage}}" stepKey="closeFullScreenImage" />
+        <waitForPageLoad stepKey="waitForGalleryDisappear" />
     </actionGroup>
 </actionGroups>

From 7b81627e2be1da1db25b2e44d3d0fe0ab59b9e67 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Mon, 17 Dec 2018 16:36:28 +0200
Subject: [PATCH 0131/1055] MAGETWO-95439: Fixed incorrect request flow for
 sitemaps

---
 .../Sitemap/Controller/Adminhtml/Sitemap/Delete.php      | 6 +++++-
 .../Sitemap/Controller/Adminhtml/Sitemap/Edit.php        | 9 +++++++--
 .../Sitemap/Controller/Adminhtml/Sitemap/Generate.php    | 8 ++++++--
 .../Sitemap/Controller/Adminhtml/Sitemap/Save.php        | 6 +++++-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
index 29d50ea8408fd..1c807cbfc194e 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
@@ -5,10 +5,14 @@
  */
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 
-class Delete extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
+/**
+ * Controller class Delete. Represents adminhtml request flow for a sitemap deletion
+ */
+class Delete extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Filesystem
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
index 111353550b9cd..14771e7f03a3b 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
@@ -1,12 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
-class Edit extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Controller class Edit. Responsible for rendering of a sitemap edit page
+ */
+class Edit extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpGetActionInterface
 {
     /**
      * Core registry
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
index 9592ab6f57c55..ec55cdca8f21b 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
@@ -1,16 +1,20 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Store\Model\App\Emulation;
 use Magento\Framework\App\ObjectManager;
 
-class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
+/**
+ * Controller class Generate. Represents requests flow logic for sitemap generation
+ */
+class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpGetActionInterface
 {
     /** @var \Magento\Store\Model\App\Emulation $appEmulation */
     private $appEmulation;
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
index 1e0d1cb248f00..698ed8e7ce3a1 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
@@ -6,10 +6,14 @@
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Controller;
 
-class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
+/**
+ * Controller class Save. Represents requests flow logic for save action
+ */
+class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpPostActionInterface
 {
     /**
      * Validate path for generation

From 32f0eb73748b00c919385f2bff57087192082921 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Fri, 18 Jan 2019 09:49:23 +0200
Subject: [PATCH 0132/1055] magento:magento2 - Success message is not showing
 when creating invoice & shipment simultaniously #19942

---
 .../Sales/view/frontend/email/shipment_new.html     |  2 +-
 .../view/frontend/email/shipment_new_guest.html     |  2 +-
 .../layout/sales_email_order_shipment_track.xml     | 13 +++++++++++++
 .../luma/Magento_Sales/email/shipment_new.html      |  2 +-
 .../Magento_Sales/email/shipment_new_guest.html     |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml

diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new.html b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
index 8af49f322c682..84f5acb29ea3b 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
@@ -53,7 +53,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
index df1677f56a500..bb181126724da 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
@@ -51,7 +51,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
new file mode 100644
index 0000000000000..91414663951d3
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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">
+    <update handle="sales_email_order_shipment_renderers"/>
+    <body>
+        <block class="Magento\Framework\View\Element\Template" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml"/>
+    </body>
+</page>
\ No newline at end of file
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
index 8c4084fcaf496..e467aa843e2f4 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
@@ -51,7 +51,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
index 68f1886986c5b..385110f8f037e 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
@@ -49,7 +49,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">

From 6a006df1c67cabb3ed9b2f7631cff8383f51ce6f Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Mon, 21 Jan 2019 17:52:17 +0100
Subject: [PATCH 0133/1055] Changed exception message assertion for production
 mode

---
 .../Magento/GraphQl/TestModule/GraphQlMutationTest.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
index fc63525ff6759..d60281a6cf413 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
@@ -49,7 +49,7 @@ public function testMutationIsNotAllowedViaGetRequest()
 }
 MUTATION;
 
-        self::expectExceptionMessage('Mutation requests allowed only for POST requests');
+        self::expectException(\Exception::class);
 
         $this->graphQlQuery($query, [], '', [], 'GET');
     }

From dabe23a69660b8d465756a676b0da88c009a824c Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Tue, 22 Jan 2019 09:18:22 +0200
Subject: [PATCH 0134/1055] MC-5845: Wrong behavior of Delete button on backend

---
 app/code/Magento/Backend/Block/Widget/Form/Container.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index 97116de6db79b..aa8613310689d 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -83,7 +83,7 @@ protected function _construct()
             -1
         );
 
-        $objId = $this->getRequest()->getParam($this->_objectId);
+        $objId = (int)$this->getRequest()->getParam($this->_objectId);
 
         if (!empty($objId)) {
             $this->addButton(
@@ -155,7 +155,7 @@ public function getBackUrl()
      */
     public function getDeleteUrl()
     {
-        return $this->getUrl('*/*/delete', [$this->_objectId => $this->getRequest()->getParam($this->_objectId)]);
+        return $this->getUrl('*/*/delete', [$this->_objectId => (int)$this->getRequest()->getParam($this->_objectId)]);
     }
 
     /**

From 10162447a958cc2e2ec653e6ddbf856413aefb11 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Tue, 22 Jan 2019 11:55:44 +0200
Subject: [PATCH 0135/1055] MC-5845: Wrong behavior of Delete button on backend

---
 .../Backend/Block/Widget/Form/Container.php      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index aa8613310689d..febaae3861688 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -56,6 +56,8 @@ class Container extends \Magento\Backend\Block\Widget\Container
     protected $_template = 'Magento_Backend::widget/form/container.phtml';
 
     /**
+     * Initialize form.
+     *
      * @return void
      */
     protected function _construct()
@@ -151,6 +153,8 @@ public function getBackUrl()
     }
 
     /**
+     * Get URL for delete button.
+     *
      * @return string
      */
     public function getDeleteUrl()
@@ -183,6 +187,8 @@ public function getFormActionUrl()
     }
 
     /**
+     * Get form HTML.
+     *
      * @return string
      */
     public function getFormHtml()
@@ -192,6 +198,8 @@ public function getFormHtml()
     }
 
     /**
+     * Get form init scripts.
+     *
      * @return string
      */
     public function getFormInitScripts()
@@ -203,6 +211,8 @@ public function getFormInitScripts()
     }
 
     /**
+     * Get form scripts.
+     *
      * @return string
      */
     public function getFormScripts()
@@ -214,6 +224,8 @@ public function getFormScripts()
     }
 
     /**
+     * Get header width.
+     *
      * @return string
      */
     public function getHeaderWidth()
@@ -222,6 +234,8 @@ public function getHeaderWidth()
     }
 
     /**
+     * Get header css class.
+     *
      * @return string
      */
     public function getHeaderCssClass()
@@ -230,6 +244,8 @@ public function getHeaderCssClass()
     }
 
     /**
+     * Get header HTML.
+     *
      * @return string
      */
     public function getHeaderHtml()

From 3149789b28c38488b2da7b98188718de7a3f4499 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 22 Jan 2019 14:01:13 -0600
Subject: [PATCH 0136/1055] MC-10866: Cart's customer and address mismatch

---
 app/code/Magento/Quote/Model/QuoteAddressValidator.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
index 50807f71a29d0..e7750f5879de5 100644
--- a/app/code/Magento/Quote/Model/QuoteAddressValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
@@ -11,6 +11,8 @@
 
 /**
  * Quote shipping/billing address validator service.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class QuoteAddressValidator
 {
@@ -29,7 +31,7 @@ class QuoteAddressValidator
     protected $customerRepository;
 
     /**
-     * @var \Magento\Customer\Model\Session
+     * @deprecated This class is not a part of HTML presentation layer and should not use sessions.
      */
     protected $customerSession;
 

From a9e69f7ba86aebd0c483eab045748f83b4f92235 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 22 Jan 2019 18:08:08 -0600
Subject: [PATCH 0137/1055] MC-11058: Empty results when using methods in
 templates

---
 lib/internal/Magento/Framework/Filter/Template.php   |  5 ++++-
 .../Framework/Filter/Test/Unit/TemplateTest.php      | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 3e5f9bcf0bd27..9d3449e79c254 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -412,7 +412,10 @@ protected function getVariable($value, $default = '{no_value_defined}')
                     }
                 }
                 $last = $i;
-            } elseif (isset($stackVars[$i - 1]['variable']) && $stackVars[$i]['type'] == 'method') {
+            } elseif (isset($stackVars[$i - 1]['variable'])
+                && is_object($stackVars[$i - 1]['variable'])
+                && $stackVars[$i]['type'] == 'method'
+            ) {
                 // Calling object methods
                 if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])) {
                     $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
index 4883dc5fbe33b..6fd48fa951d09 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
@@ -380,4 +380,16 @@ private function getObjectData()
         $dataObject->setAllVisibleItems($visibleItems);
         return $dataObject;
     }
+
+    /**
+     * Check that if calling a method of an object fails expected result is returned.
+     */
+    public function testInvalidMethodCall()
+    {
+        $this->templateFilter->setVariables(['dateTime' => '\DateTime']);
+        $this->assertEquals(
+            '\DateTime',
+            $this->templateFilter->filter('{{var dateTime.createFromFormat(\'d\',\'1548201468\')}}')
+        );
+    }
 }

From 0626c9de27c32f8d8a2efe2d0943d38dfcc595f5 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Wed, 23 Jan 2019 10:16:54 +0200
Subject: [PATCH 0138/1055] MC-10864: Media attributes changes

---
 .../Model/Config/CatalogClone/Media/Image.php | 18 +++-
 .../Config/CatalogClone/Media/ImageTest.php   | 84 ++++++++++++++-----
 2 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
index e2b0a91574021..10675a7b7c7e2 100644
--- a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
+++ b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\Config\CatalogClone\Media;
 
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Clone model for media images related config fields
  *
@@ -26,6 +29,11 @@ class Image extends \Magento\Framework\App\Config\Value
      */
     protected $_attributeCollectionFactory;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -36,6 +44,9 @@ class Image extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param Escaper|null $escaper
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -46,8 +57,10 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        Escaper $escaper = null
     ) {
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(Escaper::class);
         $this->_attributeCollectionFactory = $attributeCollectionFactory;
         $this->_eavConfig = $eavConfig;
         parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
@@ -71,10 +84,9 @@ public function getPrefixes()
         $prefixes = [];
 
         foreach ($collection as $attribute) {
-            /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
             $prefixes[] = [
                 'field' => $attribute->getAttributeCode() . '_',
-                'label' => $attribute->getFrontend()->getLabel(),
+                'label' => $this->escaper->escapeHtml($attribute->getFrontend()->getLabel()),
             ];
         }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php
index 5b1d3bf7943fc..23f0aec5b69a2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php
@@ -9,6 +9,11 @@
 use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * Tests \Magento\Catalog\Model\Config\CatalogClone\Media\Image.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -36,6 +41,14 @@ class ImageTest extends \PHPUnit\Framework\TestCase
      */
     private $attribute;
 
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
@@ -62,54 +75,79 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->escaperMock = $this->getMockBuilder(
+            \Magento\Framework\Escaper::class
+        )
+            ->disableOriginalConstructor()
+            ->setMethods(['escapeHtml'])
+            ->getMock();
+
         $helper = new ObjectManager($this);
         $this->model = $helper->getObject(
             \Magento\Catalog\Model\Config\CatalogClone\Media\Image::class,
             [
                 'eavConfig' => $this->eavConfig,
-                'attributeCollectionFactory' => $this->attributeCollectionFactory
+                'attributeCollectionFactory' => $this->attributeCollectionFactory,
+                'escaper' => $this->escaperMock,
             ]
         );
     }
 
-    public function testGetPrefixes()
+    /**
+     * @param string $actualLabel
+     * @param string $expectedLabel
+     * @return void
+     *
+     * @dataProvider getPrefixesDataProvider
+     */
+    public function testGetPrefixes(string $actualLabel, string $expectedLabel): void
     {
         $entityTypeId = 3;
         /** @var \Magento\Eav\Model\Entity\Type|\PHPUnit_Framework_MockObject_MockObject $entityType */
         $entityType = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $entityType->expects($this->once())->method('getId')->will($this->returnValue($entityTypeId));
+        $entityType->expects($this->once())->method('getId')->willReturn($entityTypeId);
 
         /** @var AbstractFrontend|\PHPUnit_Framework_MockObject_MockObject $frontend */
         $frontend = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend::class)
             ->setMethods(['getLabel'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $frontend->expects($this->once())->method('getLabel')->will($this->returnValue('testLabel'));
+        $frontend->expects($this->once())->method('getLabel')->willReturn($actualLabel);
 
-        $this->attributeCollection->expects($this->once())->method('setEntityTypeFilter')->with(
-            $this->equalTo($entityTypeId)
-        );
-        $this->attributeCollection->expects($this->once())->method('setFrontendInputTypeFilter')->with(
-            $this->equalTo('media_image')
-        );
+        $this->attributeCollection->expects($this->once())->method('setEntityTypeFilter')->with($entityTypeId);
+        $this->attributeCollection->expects($this->once())->method('setFrontendInputTypeFilter')->with('media_image');
 
-        $this->attribute->expects($this->once())->method('getAttributeCode')->will(
-            $this->returnValue('attributeCode')
-        );
-        $this->attribute->expects($this->once())->method('getFrontend')->will(
-            $this->returnValue($frontend)
-        );
+        $this->attribute->expects($this->once())->method('getAttributeCode')->willReturn('attributeCode');
+        $this->attribute->expects($this->once())->method('getFrontend')->willReturn($frontend);
 
-        $this->attributeCollection->expects($this->any())->method('getIterator')->will(
-            $this->returnValue(new \ArrayIterator([$this->attribute]))
-        );
+        $this->attributeCollection->expects($this->any())->method('getIterator')
+            ->willReturn(new \ArrayIterator([$this->attribute]));
+
+        $this->eavConfig->expects($this->any())->method('getEntityType')->with(Product::ENTITY)
+            ->willReturn($entityType);
 
-        $this->eavConfig->expects($this->any())->method('getEntityType')->with(
-            $this->equalTo(Product::ENTITY)
-        )->will($this->returnValue($entityType));
+        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($actualLabel)
+            ->willReturn($expectedLabel);
 
-        $this->assertEquals([['field' => 'attributeCode_', 'label' => 'testLabel']], $this->model->getPrefixes());
+        $this->assertEquals([['field' => 'attributeCode_', 'label' => $expectedLabel]], $this->model->getPrefixes());
+    }
+
+    /**
+     * @return array
+     */
+    public function getPrefixesDataProvider(): array
+    {
+        return [
+            [
+                'actual_label' => 'testLabel',
+                'expected_label' => 'testLabel',
+            ],
+            [
+                'actual_label' => '<media-image-attributelabel',
+                'expected_label' => '&lt;media-image-attributelabel',
+            ],
+        ];
     }
 }

From f5f137c718089f709949ab269454ddc1f925da90 Mon Sep 17 00:00:00 2001
From: Andrii Meysar <andrii.meysar@transoftgroup.com>
Date: Wed, 23 Jan 2019 13:06:23 +0200
Subject: [PATCH 0139/1055] MC-10852: Attribute output

---
 .../catalog/product/composite/fieldset/configurable.phtml    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
index a8712cdc183de..a6e58afd312ef 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -20,9 +20,8 @@
     <div class="product-options">
         <div class="field admin__field _required required">
             <?php foreach ($_attributes as $_attribute): ?>
-                <label class="label admin__field-label"><?php
-                    /* @escapeNotVerified */ echo $_attribute->getProductAttribute()
-                        ->getStoreLabel($_product->getStoreId());
+                <label class="label admin__field-label"><?=
+                    $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel($_product->getStoreId()));
                     ?></label>
                 <div class="control admin__field-control <?php
                     if ($_attribute->getDecoratedIsLast()):

From 0dfe0f0980a8be7f5ab62d5572126a0a8802ea21 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 23 Jan 2019 13:38:28 +0200
Subject: [PATCH 0140/1055] Sorting by Websites not working in product grid in
 backoffice #20511

---
 .../Ui/Component/Listing/Columns/Websites.php | 58 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index 5af0d71dc246c..f67585c6401f8 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -8,6 +8,7 @@
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use \Magento\Framework\DB\Helper;
 
 /**
  * @api
@@ -20,6 +21,11 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
      */
     const NAME = 'websites';
 
+    /**
+     * Data for concatenated website names value
+     */
+    const WEBSITE_NAMES = 'website_names';
+
     /**
      * Store manager
      *
@@ -27,10 +33,16 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
      */
     protected $storeManager;
 
+    /**
+     * @var \Magento\Framework\DB\Helper
+     */
+    protected $_resourceHelper;
+
     /**
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param StoreManagerInterface $storeManager
+     * @param Helper $resourceHelper
      * @param array $components
      * @param array $data
      */
@@ -38,11 +50,13 @@ public function __construct(
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
         StoreManagerInterface $storeManager,
+        Helper $resourceHelper,
         array $components = [],
         array $data = []
     ) {
         parent::__construct($context, $uiComponentFactory, $components, $data);
         $this->storeManager = $storeManager;
+        $this->_resourceHelper = $resourceHelper;
     }
 
     /**
@@ -83,4 +97,46 @@ public function prepare()
             $this->_data['config']['componentDisabled'] = true;
         }
     }
+
+    /**
+     * Apply sorting
+     *
+     * @return void
+     */
+    protected function applySorting()
+    {
+        $sorting = $this->getContext()->getRequestParam('sorting');
+        $isSortable = $this->getData('config/sortable');
+        if ($isSortable !== false
+            && !empty($sorting['field'])
+            && !empty($sorting['direction'])
+            && $sorting['field'] === $this->getName()
+        ) {
+            $collection = $this->getContext()->getDataProvider()->getCollection();
+            $collection
+                 ->joinField(
+                     'websites_ids',
+                     'catalog_product_website',
+                     'website_id',
+                     'product_id=entity_id',
+                     null,
+                     'left'
+                 )
+                 ->joinTable(
+                     'store_website',
+                     'website_id = websites_ids',
+                     ['name'],
+                     null,
+                     'left'
+                 )
+                 ->groupByAttribute('entity_id');
+            $this->_resourceHelper->addGroupConcatColumn(
+                $collection->getSelect(),
+                self::WEBSITE_NAMES,
+                'name'
+            );
+
+            $collection->getSelect()->order(self::WEBSITE_NAMES . ' ' . $sorting['direction']);
+        }
+    }
 }

From 6f83604f8a702ac0f4fda98ca7697d15a5c60456 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 23 Jan 2019 16:47:07 +0200
Subject: [PATCH 0141/1055] Improving the eav attribute code validation, by not
 allowing to use not allowed chars

---
 .../Magento/Eav/Model/Entity/Attribute.php    | 39 ++++++------
 .../Eav/Model/Validator/Attribute/Code.php    | 63 +++++++++++++++++++
 app/code/Magento/Eav/Setup/EavSetup.php       | 32 ++++------
 .../Magento/Eav/Setup/EavSetupTest.php        | 29 ++++++++-
 4 files changed, 122 insertions(+), 41 deletions(-)
 create mode 100644 app/code/Magento/Eav/Model/Validator/Attribute/Code.php

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 06a4abb985802..ab8a869123dce 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Eav\Model\Entity;
 
+use Magento\Eav\Model\Validator\Attribute\Code;
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
@@ -80,6 +82,11 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      */
     protected $dateTimeFormatter;
 
+    /**
+     * @var Code|null
+     */
+    private $attributeCodeValidator;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -99,6 +106,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param Code|null $attributeCodeValidator
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
@@ -122,7 +130,8 @@ public function __construct(
         DateTimeFormatterInterface $dateTimeFormatter,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        Code $attributeCodeValidator = null
     ) {
         parent::__construct(
             $context,
@@ -145,6 +154,9 @@ public function __construct(
         $this->_localeResolver = $localeResolver;
         $this->reservedAttributeList = $reservedAttributeList;
         $this->dateTimeFormatter = $dateTimeFormatter;
+        $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
+            Code::class
+        );
     }
 
     /**
@@ -230,6 +242,10 @@ public function loadEntityAttributeIdBySet()
      */
     public function beforeSave()
     {
+        if (isset($this->_data['attribute_code'])) {
+            $this->attributeCodeValidator->isValid($this->_data['attribute_code']);
+        }
+
         // prevent overriding product data
         if (isset($this->_data['attribute_code']) && $this->reservedAttributeList->isReservedAttribute($this)) {
             throw new LocalizedException(
@@ -240,25 +256,6 @@ public function beforeSave()
             );
         }
 
-        /**
-         * Check for maximum attribute_code length
-         */
-        if (isset(
-            $this->_data['attribute_code']
-        ) && !\Zend_Validate::is(
-            $this->_data['attribute_code'],
-            'StringLength',
-            ['max' => self::ATTRIBUTE_CODE_MAX_LENGTH]
-        )
-        ) {
-            throw new LocalizedException(
-                __(
-                    'The attribute code needs to be %1 characters or fewer. Re-enter the code and try again.',
-                    self::ATTRIBUTE_CODE_MAX_LENGTH
-                )
-            );
-        }
-
         $defaultValue = $this->getDefaultValue();
         $hasDefaultValue = (string)$defaultValue != '';
 
@@ -513,7 +510,7 @@ public function __sleep()
     public function __wakeup()
     {
         parent::__wakeup();
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $objectManager = ObjectManager::getInstance();
         $this->_localeDate = $objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
         $this->_localeResolver = $objectManager->get(\Magento\Framework\Locale\ResolverInterface::class);
         $this->reservedAttributeList = $objectManager->get(\Magento\Catalog\Model\Product\ReservedAttributeList::class);
diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
new file mode 100644
index 0000000000000..01e3dac499bae
--- /dev/null
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Eav\Model\Validator\Attribute;
+
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Class Code
+ *
+ * Validation EAV attribute code
+ */
+class Code  extends \Magento\Framework\Validator\AbstractValidator
+{
+    /**
+     * Validates the correctness of the attribute code
+     *
+     * @param $attributeCode
+     * @return bool
+     * @throws LocalizedException
+     */
+    public function isValid($attributeCode)
+    {
+        /**
+         * Check attribute_code for allowed characters
+         */
+        if (trim($attributeCode)
+            && !preg_match('/^[a-z][a-z0-9_]*$/', trim($attributeCode))
+        ) {
+            throw new LocalizedException(
+                __(
+                    'Attribute code "%1" is invalid. Please use only letters (a-z), ' .
+                    'numbers (0-9) or underscore(_) in this field, first character should be a letter.',
+                    $attributeCode
+                )
+            );
+        }
+
+        /**
+         * Check attribute_code for allowed length
+         */
+        $minLength = Attribute::ATTRIBUTE_CODE_MIN_LENGTH;
+        $maxLength = Attribute::ATTRIBUTE_CODE_MAX_LENGTH;
+        $isAllowedLength = \Zend_Validate::is(
+            trim($attributeCode),
+            'StringLength',
+            ['min' => $minLength, 'max' => $maxLength]
+        );
+        if (!$isAllowedLength) {
+            throw new LocalizedException(__(
+                'An attribute code must not be less than %1 and more than %2 characters.',
+                $minLength,
+                $maxLength
+            ));
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 6e81ddc36e9c9..77fd0e95de364 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -9,6 +9,7 @@
 use Magento\Eav\Model\Entity\Setup\Context;
 use Magento\Eav\Model\Entity\Setup\PropertyMapperInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
+use Magento\Eav\Model\Validator\Attribute\Code;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
@@ -80,6 +81,11 @@ class EavSetup
      */
     private $_defaultAttributeSetName = 'Default';
 
+    /**
+     * @var Code
+     */
+    private $attributeCodeValidator;
+
     /**
      * Init
      *
@@ -87,17 +93,22 @@ class EavSetup
      * @param Context $context
      * @param CacheInterface $cache
      * @param CollectionFactory $attrGroupCollectionFactory
+     * @param Code|null $attributeCodeValidator
      */
     public function __construct(
         ModuleDataSetupInterface $setup,
         Context $context,
         CacheInterface $cache,
-        CollectionFactory $attrGroupCollectionFactory
+        CollectionFactory $attrGroupCollectionFactory,
+        Code $attributeCodeValidator = null
     ) {
         $this->cache = $cache;
         $this->attrGroupCollectionFactory = $attrGroupCollectionFactory;
         $this->attributeMapper = $context->getAttributeMapper();
         $this->setup = $setup;
+        $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
+            Code::class
+        );
     }
 
     /**
@@ -783,25 +794,8 @@ private function _getValue($array, $key, $default = null)
      */
     private function _validateAttributeData($data)
     {
-        $minLength = \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MIN_LENGTH;
-        $maxLength = \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MAX_LENGTH;
         $attributeCode = isset($data['attribute_code']) ? $data['attribute_code'] : '';
-
-        $isAllowedLength = \Zend_Validate::is(
-            trim($attributeCode),
-            'StringLength',
-            ['min' => $minLength, 'max' => $maxLength]
-        );
-
-        if (!$isAllowedLength) {
-            $errorMessage = __(
-                'An attribute code must not be less than %1 and more than %2 characters.',
-                $minLength,
-                $maxLength
-            );
-
-            throw new LocalizedException($errorMessage);
-        }
+        $this->attributeCodeValidator->isValid($attributeCode);
 
         return true;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php b/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php
index 5d7a72c65597d..3e8e146144c36 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php
@@ -55,7 +55,7 @@ public function addAttributeDataProvider()
     {
         return [
             ['eav_setup_test'],
-            ['_59_characters_59_characters_59_characters_59_characters_59'],
+            ['characters_59_characters_59_characters_59_characters_59_59_'],
         ];
     }
 
@@ -90,6 +90,33 @@ public function addAttributeThrowExceptionDataProvider()
         ];
     }
 
+    /**
+     * Verify that add attribute throw exception if attribute_code is not valid.
+     *
+     * @param string|null $attributeCode
+     *
+     * @dataProvider addInvalidAttributeThrowExceptionDataProvider
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first char
+     */
+    public function testAddInvalidAttributeThrowException($attributeCode)
+    {
+        $attributeData = $this->getAttributeData();
+        $this->eavSetup->addAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, $attributeData);
+    }
+    /**
+     * Data provider for testAddInvalidAttributeThrowException().
+     *
+     * @return array
+     */
+    public function addInvalidAttributeThrowExceptionDataProvider()
+    {
+        return [
+            ['1first_character_is_not_letter'],
+            ['attribute.with.dots'],
+        ];
+    }
+
     /**
      * Get simple attribute data.
      */

From af11e87e2d01c293cd7b59e2731631f6662def06 Mon Sep 17 00:00:00 2001
From: Vasilii <v.burlacu@atwix.com>
Date: Wed, 23 Jan 2019 16:49:33 +0200
Subject: [PATCH 0142/1055] Made configurable product variations table cell
 label hidden, because they were positioned (absolute) all in on place above
 the table

---
 .../web/css/source/forms/fields/_control-table.less  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
index a9035a9a7e47d..48b9ef8bbb8a7 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
@@ -25,6 +25,18 @@
     max-width: 100%;
     overflow-x: auto;
     overflow-y: hidden;
+
+    .admin__control-fields {
+        .admin__field {
+            position: relative;
+
+            .admin__field-label {
+                span {
+                    display: none;
+                }
+            }
+        }
+    }
 }
 
 .admin__control-table {

From adb1a8f6f16a0da2cada4d2a838328334b4e3a18 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 23 Jan 2019 23:14:29 +0200
Subject: [PATCH 0143/1055] Declaring strict typing

---
 app/code/Magento/Eav/Model/Validator/Attribute/Code.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
index 01e3dac499bae..c3a29854d227f 100644
--- a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
@@ -3,18 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Eav\Model\Validator\Attribute;
 
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Validator\AbstractValidator;
+use Zend_Validate;
 
 /**
  * Class Code
  *
  * Validation EAV attribute code
  */
-class Code  extends \Magento\Framework\Validator\AbstractValidator
+class Code  extends AbstractValidator
 {
     /**
      * Validates the correctness of the attribute code
@@ -45,7 +48,7 @@ public function isValid($attributeCode)
          */
         $minLength = Attribute::ATTRIBUTE_CODE_MIN_LENGTH;
         $maxLength = Attribute::ATTRIBUTE_CODE_MAX_LENGTH;
-        $isAllowedLength = \Zend_Validate::is(
+        $isAllowedLength = Zend_Validate::is(
             trim($attributeCode),
             'StringLength',
             ['min' => $minLength, 'max' => $maxLength]

From 80c13e233f88cd46d186d8378816fcbc05e90cf0 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Wed, 19 Sep 2018 16:56:40 +0300
Subject: [PATCH 0144/1055] MAGETWO-85120: Wrong wysiwyg images request flow

---
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php   | 3 ++-
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php      | 3 ++-
 .../Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php   | 1 +
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php     | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

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/NewFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
index a7f49e8a431a4..82d200beb6dc9 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
@@ -6,12 +6,13 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Creates new folder.
  */
-class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
+class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
index a1a29706756b5..c574869a83cab 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
@@ -66,6 +66,7 @@ public function testExecute()
             $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $directoryName)
         );
         $this->model->getRequest()->setParams(['node' => $this->imagesHelper->idEncode($directoryName)]);
+        $this->model->getRequest()->setMethod('POST');
         $this->model->execute();
 
         $this->assertFalse(
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
index bab14a8663eae..8715bae6ddb5c 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
@@ -81,6 +81,7 @@ protected function setUp()
     public function testExecute()
     {
         $this->model->getRequest()->setParams(['type' => 'image/png']);
+        $this->model->getRequest()->setMethod('POST');
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
         $this->model->execute();
 

From 3c8acbbe6fe490141af37f5f9cea80df8401d885 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Thu, 24 Jan 2019 20:08:15 +0200
Subject: [PATCH 0145/1055] Using an alias for attribute code validator

---
 app/code/Magento/Eav/Model/Entity/Attribute.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index ab8a869123dce..38e47cc98a524 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Eav\Model\Entity;
 
-use Magento\Eav\Model\Validator\Attribute\Code;
+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
@@ -83,7 +83,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
     protected $dateTimeFormatter;
 
     /**
-     * @var Code|null
+     * @var AttributeCodeValidator|null
      */
     private $attributeCodeValidator;
 
@@ -106,7 +106,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-     * @param Code|null $attributeCodeValidator
+     * @param AttributeCodeValidator|null $attributeCodeValidator
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
@@ -131,7 +131,7 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        Code $attributeCodeValidator = null
+        AttributeCodeValidator $attributeCodeValidator = null
     ) {
         parent::__construct(
             $context,
@@ -155,7 +155,7 @@ public function __construct(
         $this->reservedAttributeList = $reservedAttributeList;
         $this->dateTimeFormatter = $dateTimeFormatter;
         $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
-            Code::class
+            AttributeCodeValidator::class
         );
     }
 

From ea76a14fe98e439135bcc77809f1588b33cfda77 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 24 Jan 2019 13:32:56 -0600
Subject: [PATCH 0146/1055] MAGETWO-71993: CMS Image Upload Response Contains
 Redundant Info

---
 app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index c1dfe993141a5..54136a0491c0b 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -12,11 +12,15 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
- * Wysiwyg Images model
+ * Wysiwyg Images model.
+ *
+ * Tightly connected with controllers responsible for managing files so it uses session and is (sort of) a part
+ * of the presentation layer.
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  *
  * @api
  * @since 100.0.2

From fabfb01c2e326638b2c44a4e74be668120dc7476 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 24 Jan 2019 13:38:32 -0600
Subject: [PATCH 0147/1055] MC-5947: Email templates breaking rendering

---
 .../Magento/Framework/Filter/Template.php     | 36 +++++++++++++++----
 .../Filter/Test/Unit/TemplateTest.php         | 11 ++++++
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 3e5f9bcf0bd27..fee62e6c3d963 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -63,6 +63,11 @@ class Template implements \Zend_Filter_Interface
      */
     protected $string;
 
+    /**
+     * @var string[]
+     */
+    private $restrictedMethods = ['addafterfiltercallback'];
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param array $variables
@@ -367,6 +372,25 @@ protected function getParameters($value)
         return $params;
     }
 
+    /**
+     * Validate method call initiated in a template.
+     *
+     * Deny calls for methods that may disrupt template processing.
+     *
+     * @param object $object
+     * @param string $method
+     * @return void
+     * @throws \InvalidArgumentException
+     */
+    private function validateVariableMethodCall($object, string $method): void
+    {
+        if ($object === $this) {
+            if (in_array(mb_strtolower($method), $this->restrictedMethods)) {
+                throw new \InvalidArgumentException("Method $method cannot be called from template.");
+            }
+        }
+    }
+
     /**
      * Return variable value for var construction
      *
@@ -414,12 +438,12 @@ protected function getVariable($value, $default = '{no_value_defined}')
                 $last = $i;
             } elseif (isset($stackVars[$i - 1]['variable']) && $stackVars[$i]['type'] == 'method') {
                 // Calling object methods
-                if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])) {
-                    $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
-                    $stackVars[$i]['variable'] = call_user_func_array(
-                        [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
-                        $stackVars[$i]['args']
-                    );
+                $object = $stackVars[$i - 1]['variable'];
+                $method = $stackVars[$i]['name'];
+                if (method_exists($object, $method)) {
+                    $args = $this->getStackArgs($stackVars[$i]['args']);
+                    $this->validateVariableMethodCall($object, $method);
+                    $stackVars[$i]['variable'] = call_user_func_array([$object, $method], $args);
                 }
                 $last = $i;
             }
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
index 4883dc5fbe33b..f19d240a651b8 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
@@ -380,4 +380,15 @@ private function getObjectData()
         $dataObject->setAllVisibleItems($visibleItems);
         return $dataObject;
     }
+
+    /**
+     * Test adding callbacks when already filtering.
+     *
+     * @expectedException \InvalidArgumentException
+     */
+    public function testInappropriateCallbacks()
+    {
+        $this->templateFilter->setVariables(['filter' => $this->templateFilter]);
+        $this->templateFilter->filter('Test {{var filter.addAfterFilterCallback(\'mb_strtolower\')}}');
+    }
 }

From 57d8ae284c3eb4bbc45a6e5c8dbeeb21505a78c2 Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Fri, 25 Jan 2019 11:36:44 +0200
Subject: [PATCH 0148/1055] MC-5872: Updated the implements for the
 Magento_Search Adminhtml Controllers

---
 .../Controller/Adminhtml/Synonyms/MassDelete.php       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
index f2770f77cc533..c32ca04d39b61 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
@@ -6,15 +6,17 @@
 
 namespace Magento\Search\Controller\Adminhtml\Synonyms;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
 /**
- * Mass-Delete Controller
+ * Mass-Delete Controller.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class MassDelete extends \Magento\Backend\App\Action
+class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
-     * Authorization level of a basic admin session
+     * Authorization level of a basic admin session.
      *
      * @see _isAllowed()
      */
@@ -56,7 +58,7 @@ public function __construct(
     }
 
     /**
-     * Execute action
+     * Execute action.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @throws \Magento\Framework\Exception\LocalizedException|\Exception

From 887902bdf7bbf524ef4b852cd8c6efb0775dd1bf Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 25 Jan 2019 13:24:27 +0200
Subject: [PATCH 0149/1055] ENGCOM-3810: Static test fix.

---
 .../Eav/Model/Entity/Attribute/Source/AbstractSource.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
index 8d5b501654749..36ad026029056 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
@@ -80,6 +80,8 @@ public function getOptionText($value)
     }
 
     /**
+     * Get option id.
+     *
      * @param string $value
      * @return null|string
      */

From eb820e097c2e84241748aebd6d1bec6ca61f2b9d Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 25 Jan 2019 13:43:38 -0600
Subject: [PATCH 0150/1055] MC-13633: File Read Configuration

---
 app/bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index 0b13d12cece58..ddbcaffd42962 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -8,6 +8,7 @@
  * Environment initialization
  */
 error_reporting(E_ALL);
+stream_wrapper_unregister('phar');
 #ini_set('display_errors', 1);
 
 /* PHP version validation */

From d9edb754993817d46bc6b6c843d8fdf93d610012 Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Mon, 28 Jan 2019 11:59:14 +0200
Subject: [PATCH 0151/1055] MC-5876: Terms & Conditions logic fix

---
 .../Model/AgreementsConfigProvider.php        |  7 +--
 .../Model/AgreementsConfigProviderTest.php    | 50 ++++++++++++++-----
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
index 1f1b5be9683ed..1217270d780e1 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
@@ -67,17 +67,18 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig()
     {
         $agreements = [];
         $agreements['checkoutAgreements'] = $this->getAgreementsConfig();
+
         return $agreements;
     }
 
     /**
-     * Returns agreements config
+     * Returns agreements config.
      *
      * @return array
      */
@@ -99,7 +100,7 @@ protected function getAgreementsConfig()
                 'content' => $agreement->getIsHtml()
                     ? $agreement->getContent()
                     : nl2br($this->escaper->escapeHtml($agreement->getContent())),
-                'checkboxText' => $agreement->getCheckboxText(),
+                'checkboxText' => $this->escaper->escapeHtml($agreement->getCheckboxText()),
                 'mode' => $agreement->getMode(),
                 'agreementId' => $agreement->getAgreementId()
             ];
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
index c59a3d2433ec2..c8309bacb0a86 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
@@ -8,6 +8,9 @@
 use Magento\CheckoutAgreements\Model\AgreementsProvider;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Tests for AgreementsConfigProvider.
+ */
 class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -35,6 +38,9 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $agreementsFilterMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
@@ -59,10 +65,16 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test for getConfig if content is HTML.
+     *
+     * @return void
+     */
     public function testGetConfigIfContentIsHtml()
     {
         $content = 'content';
         $checkboxText = 'checkbox_text';
+        $escapedCheckboxText = 'escaped_checkbox_text';
         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
         $agreementId = 100;
         $expectedResult = [
@@ -71,12 +83,12 @@ public function testGetConfigIfContentIsHtml()
                 'agreements' => [
                     [
                         'content' => $content,
-                        'checkboxText' => $checkboxText,
+                        'checkboxText' => $escapedCheckboxText,
                         'mode' => $mode,
-                        'agreementId' => $agreementId
-                    ]
-                ]
-            ]
+                        'agreementId' => $agreementId,
+                    ],
+                ],
+            ],
         ];
 
         $this->scopeConfigMock->expects($this->once())
@@ -94,6 +106,11 @@ public function testGetConfigIfContentIsHtml()
             ->with($searchCriteriaMock)
             ->willReturn([$agreement]);
 
+        $this->escaperMock->expects($this->once())
+            ->method('escapeHtml')
+            ->with($checkboxText)
+            ->willReturn($escapedCheckboxText);
+
         $agreement->expects($this->once())->method('getIsHtml')->willReturn(true);
         $agreement->expects($this->once())->method('getContent')->willReturn($content);
         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);
@@ -103,11 +120,17 @@ public function testGetConfigIfContentIsHtml()
         $this->assertEquals($expectedResult, $this->model->getConfig());
     }
 
+    /**
+     * Test for getConfig if content is not HTML.
+     *
+     * @return void
+     */
     public function testGetConfigIfContentIsNotHtml()
     {
         $content = 'content';
         $escapedContent = 'escaped_content';
         $checkboxText = 'checkbox_text';
+        $escapedCheckboxText = 'escaped_checkbox_text';
         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
         $agreementId = 100;
         $expectedResult = [
@@ -116,12 +139,12 @@ public function testGetConfigIfContentIsNotHtml()
                 'agreements' => [
                     [
                         'content' => $escapedContent,
-                        'checkboxText' => $checkboxText,
+                        'checkboxText' => $escapedCheckboxText,
                         'mode' => $mode,
-                        'agreementId' => $agreementId
-                    ]
-                ]
-            ]
+                        'agreementId' => $agreementId,
+                    ],
+                ],
+            ],
         ];
 
         $this->scopeConfigMock->expects($this->once())
@@ -139,8 +162,11 @@ public function testGetConfigIfContentIsNotHtml()
             ->with($searchCriteriaMock)
             ->willReturn([$agreement]);
 
-        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($content)->willReturn($escapedContent);
-
+        $this->escaperMock->expects($this->at(0))->method('escapeHtml')->with($content)->willReturn($escapedContent);
+        $this->escaperMock->expects($this->at(1))
+            ->method('escapeHtml')
+            ->with($checkboxText)
+            ->willReturn($escapedCheckboxText);
         $agreement->expects($this->once())->method('getIsHtml')->willReturn(false);
         $agreement->expects($this->once())->method('getContent')->willReturn($content);
         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);

From 82f5511ee558549501a2b533b6b0a31df609fae5 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Mon, 28 Jan 2019 15:40:21 +0200
Subject: [PATCH 0152/1055] Adding returning strict typing

---
 app/code/Magento/Eav/Model/Validator/Attribute/Code.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
index c3a29854d227f..af4791cc0d5d1 100644
--- a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
@@ -22,11 +22,11 @@ class Code  extends AbstractValidator
     /**
      * Validates the correctness of the attribute code
      *
-     * @param $attributeCode
+     * @param string $attributeCode
      * @return bool
      * @throws LocalizedException
      */
-    public function isValid($attributeCode)
+    public function isValid($attributeCode): bool
     {
         /**
          * Check attribute_code for allowed characters

From ed2a80c45a3dee49380f8c6cc9cd971f2045c121 Mon Sep 17 00:00:00 2001
From: Vasilii <v.burlacu@atwix.com>
Date: Tue, 29 Jan 2019 15:37:04 +0200
Subject: [PATCH 0153/1055] magento/magento2#20527 - Hide configurable product
 variations table labels from UI not with CSS

---
 .../Product/Form/Modifier/ConfigurablePanel.php      |  2 ++
 .../web/css/source/forms/fields/_control-table.less  | 12 ------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
index fbab25ff1bea6..6f373871bdb76 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -577,6 +577,7 @@ protected function getColumn(
             'dataType' => Form\Element\DataType\Text::NAME,
             'dataScope' => $name,
             'visibleIfCanEdit' => false,
+            'labelVisible' => false,
             'imports' => [
                 'visible' => '!${$.provider}:${$.parentScope}.canEdit'
             ],
@@ -595,6 +596,7 @@ protected function getColumn(
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => $label,
             'dataScope' => '',
+            'showLabel' => false
         ];
         $container['children'] = [
             $name . '_edit' => $fieldEdit,
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
index 48b9ef8bbb8a7..a9035a9a7e47d 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less
@@ -25,18 +25,6 @@
     max-width: 100%;
     overflow-x: auto;
     overflow-y: hidden;
-
-    .admin__control-fields {
-        .admin__field {
-            position: relative;
-
-            .admin__field-label {
-                span {
-                    display: none;
-                }
-            }
-        }
-    }
 }
 
 .admin__control-table {

From 24382e3eb968d13e4a86955cbdc2966b989afe1c Mon Sep 17 00:00:00 2001
From: vitaliyboyko <v.boyko@atwix.com>
Date: Tue, 29 Jan 2019 19:34:06 +0200
Subject: [PATCH 0154/1055] ENGCOM-20434: Consider deleting/creating url
 rewrites on change the product attribute visibility via mass action

---
 ...writeOnChangeProductVisibilityObserver.php | 106 ++++++++++++++++++
 ...ProductProcessUrlRewriteSavingObserver.php |  39 ++++++-
 ...uctProcessUrlRewriteSavingObserverTest.php |  52 +++++++--
 .../Magento/CatalogUrlRewrite/etc/events.xml  |   3 +
 .../product_configurable_not_available.php    |   2 +-
 ...uctProcessUrlRewriteSavingObserverTest.php |  30 ++++-
 .../_files/configurable_products.php          |   2 +-
 .../Framework/DB/Adapter/Pdo/Mysql.php        |   4 -
 8 files changed, 213 insertions(+), 25 deletions(-)
 create mode 100644 app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
new file mode 100644
index 0000000000000..16d12bd4c7e4b
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Observer;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ * Class ProductProcessUrlRewriteSavingObserver
+ */
+class ProcessUrlRewriteOnChangeProductVisibilityObserver implements ObserverInterface
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $productCollectionFactory;
+    /**
+     * @var ProductUrlRewriteGenerator
+     */
+    private $urlRewriteGenerator;
+    /**
+     * @var UrlPersistInterface
+     */
+    private $urlPersist;
+    /**
+     * @var ProductUrlPathGenerator
+     */
+    private $urlPathGenerator;
+    /**
+     * @param CollectionFactory $collectionFactory
+     * @param ProductUrlRewriteGenerator $urlRewriteGenerator
+     * @param UrlPersistInterface $urlPersist
+     * @param ProductUrlPathGenerator|null $urlPathGenerator
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory,
+        ProductUrlRewriteGenerator $urlRewriteGenerator,
+        UrlPersistInterface $urlPersist,
+        ProductUrlPathGenerator $urlPathGenerator
+    ) {
+        $this->productCollectionFactory = $collectionFactory;
+        $this->urlRewriteGenerator = $urlRewriteGenerator;
+        $this->urlPersist = $urlPersist;
+        $this->urlPathGenerator = $urlPathGenerator;
+    }
+    /**
+     * Generate urls for UrlRewrites and save it in storage
+     *
+     * @param Observer $observer
+     * @return array
+     * @throws UrlAlreadyExistsException
+     */
+    public function execute(Observer $observer)
+    {
+        $event = $observer->getEvent();
+        $attrData = $event->getAttributesData();
+        $productIds = $event->getProductIds();
+        $storeId = $event->getStoreId();
+        $visibility = $attrData[ProductInterface::VISIBILITY] ?? null;
+
+        if (!$visibility) {
+            return [$attrData, $productIds, $storeId];
+        }
+
+        $productCollection = $this->productCollectionFactory->create();
+        $productCollection->addAttributeToSelect(ProductInterface::VISIBILITY);
+        $productCollection->addAttributeToSelect('url_key');
+        $productCollection->addFieldToFilter(
+            'entity_id',
+            ['in' => array_unique($productIds)]
+        );
+
+        foreach ($productCollection as $product) {
+            if ($visibility == Visibility::VISIBILITY_NOT_VISIBLE) {
+                $this->urlPersist->deleteByData(
+                    [
+                        UrlRewrite::ENTITY_ID => $product->getId(),
+                        UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+                    ]
+                );
+            } elseif ($visibility !== Visibility::VISIBILITY_NOT_VISIBLE) {
+                $product->setVisibility($visibility);
+                $productUrlPath = $this->urlPathGenerator->getUrlPath($product);
+                $productUrlRewrite = $this->urlRewriteGenerator->generate($product);
+                $product->unsUrlPath();
+                $product->setUrlPath($productUrlPath);
+                $this->urlPersist->replace($productUrlRewrite);
+            }
+        }
+
+        return [$attrData, $productIds, $storeId];
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
index 6eda8dd0b61ee..c5a1c1e429bfa 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
@@ -3,14 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\App\ObjectManager;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 /**
  * Class ProductProcessUrlRewriteSavingObserver
@@ -32,20 +36,29 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
      */
     private $productUrlPathGenerator;
 
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
     /**
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param UrlPersistInterface $urlPersist
-     * @param ProductUrlPathGenerator|null $productUrlPathGenerator
+     * @param ProductUrlPathGenerator|null $urlPathGenerator
+     * @param CollectionFactory|null $collectionFactory
      */
     public function __construct(
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
         UrlPersistInterface $urlPersist,
-        ProductUrlPathGenerator $productUrlPathGenerator = null
+        ProductUrlPathGenerator $urlPathGenerator = null,
+        CollectionFactory $collectionFactory = null
     ) {
         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
         $this->urlPersist = $urlPersist;
-        $this->productUrlPathGenerator = $productUrlPathGenerator ?: ObjectManager::getInstance()
+        $this->productUrlPathGenerator = $urlPathGenerator ?: ObjectManager::getInstance()
             ->get(ProductUrlPathGenerator::class);
+        $this->collectionFactory = $collectionFactory ?: ObjectManager::getInstance()
+            ->get(CollectionFactory::class);
     }
 
     /**
@@ -69,7 +82,27 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 $product->unsUrlPath();
                 $product->setUrlPath($this->productUrlPathGenerator->getUrlPath($product));
                 $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+                return;
             }
         }
+        $this->validateUrlKey($product);
+    }
+
+    /**
+     * @param Product $product
+     * @throws UrlAlreadyExistsException
+     */
+    private function validateUrlKey(Product $product)
+    {
+        $productCollection = $this->collectionFactory->create();
+        $productCollection->addFieldToFilter(
+            'url_key',
+            ['in' => $product->getUrlKey()]
+        );
+        $productCollection->getSelect()->where('e.entity_id != ?', $product->getId());
+
+        if ($productCollection->getItems()) {
+            throw new UrlAlreadyExistsException();
+        }
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
index 39317b42af989..3df850f51e695 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
@@ -6,9 +6,7 @@
 
 namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
 
-use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
  * Class ProductProcessUrlRewriteSavingObserverTest
@@ -48,6 +46,21 @@ class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Test
      */
     protected $objectManager;
 
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product\Collection
+     */
+    private $productCollection;
+
+    /**
+     * @var \Magento\Framework\DB\Select
+     */
+    private $select;
+
     /**
      * @var \Magento\CatalogUrlRewrite\Observer\ProductProcessUrlRewriteSavingObserver
      */
@@ -60,13 +73,13 @@ protected function setUp()
     {
         $this->urlPersist = $this->createMock(\Magento\UrlRewrite\Model\UrlPersistInterface::class);
         $this->product = $this->createPartialMock(\Magento\Catalog\Model\Product::class, [
-                'getId',
-                'dataHasChangedFor',
-                'isVisibleInSiteVisibility',
-                'getIsChangedWebsites',
-                'getIsChangedCategories',
-                'getStoreId'
-            ]);
+            'getId',
+            'dataHasChangedFor',
+            'isVisibleInSiteVisibility',
+            'getIsChangedWebsites',
+            'getIsChangedCategories',
+            'getStoreId'
+        ]);
         $this->product->expects($this->any())->method('getId')->will($this->returnValue(3));
         $this->event = $this->createPartialMock(\Magento\Framework\Event::class, ['getProduct']);
         $this->event->expects($this->any())->method('getProduct')->willReturn($this->product);
@@ -79,12 +92,28 @@ protected function setUp()
         $this->productUrlRewriteGenerator->expects($this->any())
             ->method('generate')
             ->will($this->returnValue([3 => 'rewrite']));
+        $this->collectionFactory = $this->createMock(
+            \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class
+        );
+        $this->productCollection = $this->createMock(
+            \Magento\Catalog\Model\ResourceModel\Product\Collection::class
+        );
+        $this->select = $this->createMock(
+            \Magento\Framework\DB\Select::class
+        );
+        $this->collectionFactory->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($this->productCollection));
+        $this->productCollection->expects($this->any())
+            ->method('getSelect')
+            ->will($this->returnValue($this->select));
         $this->objectManager = new ObjectManager($this);
         $this->model = $this->objectManager->getObject(
             \Magento\CatalogUrlRewrite\Observer\ProductProcessUrlRewriteSavingObserver::class,
             [
                 'productUrlRewriteGenerator' => $this->productUrlRewriteGenerator,
-                'urlPersist' => $this->urlPersist
+                'urlPersist' => $this->urlPersist,
+                'collectionFactory' => $this->collectionFactory
             ]
         );
     }
@@ -103,8 +132,7 @@ public function urlKeyDataProvider()
                 'isChangedWebsites'     => false,
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
-                'expectedReplaceCount'  => 1,
-
+                'expectedReplaceCount'  => 1
             ],
             'no chnages' => [
                 'isChangedUrlKey'       => false,
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/events.xml b/app/code/Magento/CatalogUrlRewrite/etc/events.xml
index cc558fe81f16d..728442acf7a44 100644
--- a/app/code/Magento/CatalogUrlRewrite/etc/events.xml
+++ b/app/code/Magento/CatalogUrlRewrite/etc/events.xml
@@ -27,6 +27,9 @@
     <event name="catalog_product_save_after">
         <observer name="process_url_rewrite_saving" instance="Magento\CatalogUrlRewrite\Observer\ProductProcessUrlRewriteSavingObserver"/>
     </event>
+    <event name="catalog_product_attribute_update_before">
+        <observer name="process_url_rewrite_on_change_product_visibility" instance="Magento\CatalogUrlRewrite\Observer\ProcessUrlRewriteOnChangeProductVisibilityObserver"/>
+    </event>
     <event name="catalog_category_save_before">
         <observer name="category_url_path_autogeneration" instance="Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver"/>
     </event>
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_not_available.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_not_available.php
index 73467cd8d063e..87290e0b8259c 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_not_available.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_not_available.php
@@ -43,7 +43,7 @@
     $productSku = array_shift($productsSku);
     $product->setTypeId(Type::TYPE_SIMPLE)
         ->setAttributeSetId($attributeSetId)
-        ->setName('Configurable Option' . $option->getLabel())
+        ->setName('Configurable Option Not Available' . $option->getLabel())
         ->setSku('simple_not_avalilable_' . $productSku)
         ->setPrice(11)
         ->setTestConfigurable($option->getValue())
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
index c72a58197b1fd..f902ee993b84e 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
@@ -5,9 +5,11 @@
  */
 namespace Magento\CatalogUrlRewrite\Observer;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 
 /**
  * @magentoAppArea adminhtml
@@ -18,12 +20,16 @@ class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Test
     /** @var \Magento\Framework\ObjectManagerInterface */
     protected $objectManager;
 
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
     /**
      * Set up
      */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -136,10 +142,8 @@ public function testUrlKeyHasChangedInGlobalContext()
      */
     public function testUrlKeyHasChangedInStoreviewContextWithPermanentRedirection()
     {
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository*/
-        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         /** @var \Magento\Catalog\Model\Product $product*/
-        $product = $productRepository->get('product1');
+        $product = $this->productRepository->get('product1');
 
         /** @var StoreManagerInterface $storeManager */
         $storeManager = $this->objectManager->get(StoreManagerInterface::class);
@@ -234,4 +238,22 @@ public function testUrlKeyHasChangedInStoreviewContextWithoutPermanentRedirectio
             $this->assertContains($row, $actual);
         }
     }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoAppIsolation enabled
+     */
+    public function testDuplicatedUrlKeyInvisibleProduct()
+    {
+        $this->expectException(
+            UrlAlreadyExistsException::class,
+            'URL key for specified store already exists'
+        );
+        /** @var \Magento\Catalog\Model\Product $product*/
+        $product = $this->productRepository->get('simple2');
+        $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
+        $product->setUrlKey('simple_product');
+        $product->save();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
index 985c77dba6626..afebcab773d9c 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
@@ -107,7 +107,7 @@
         ->setId($productId)
         ->setAttributeSetId($attributeSetId)
         ->setWebsiteIds([1])
-        ->setName('Configurable Option' . $option->getLabel())
+        ->setName('Configurable Option 12345' . $option->getLabel())
         ->setSku('simple_' . $productId)
         ->setPrice($productId)
         ->setTestConfigurable($option->getValue())
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 86266ec23fe47..dfa30e1964e31 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -384,10 +384,6 @@ protected function _connect()
             throw new \Zend_Db_Adapter_Exception('No host configured to connect');
         }
 
-        if (isset($this->_config['port'])) {
-            throw new \Zend_Db_Adapter_Exception('Port must be configured within host parameter (like localhost:3306');
-        }
-
         unset($this->_config['port']);
 
         if (strpos($this->_config['host'], '/') !== false) {

From 4d18c9a92cd8f1acdd780ce933f2860e7d092f7f Mon Sep 17 00:00:00 2001
From: vitaliyboyko <v.boyko@atwix.com>
Date: Tue, 29 Jan 2019 19:36:12 +0200
Subject: [PATCH 0155/1055] ENGCOM-20434: Added accidentally removed code

---
 lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index dfa30e1964e31..86266ec23fe47 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -384,6 +384,10 @@ protected function _connect()
             throw new \Zend_Db_Adapter_Exception('No host configured to connect');
         }
 
+        if (isset($this->_config['port'])) {
+            throw new \Zend_Db_Adapter_Exception('Port must be configured within host parameter (like localhost:3306');
+        }
+
         unset($this->_config['port']);
 
         if (strpos($this->_config['host'], '/') !== false) {

From 70fb3da4f8dda65a2ffcf6ed20e57f63cc3133ee Mon Sep 17 00:00:00 2001
From: Rik Willems <rikwillems@users.noreply.github.com>
Date: Wed, 30 Jan 2019 09:07:09 +0200
Subject: [PATCH 0156/1055] Use batches and direct queries to fix sales address
 upgrade

---
 .../FillQuoteAddressIdInSalesOrderAddress.php | 130 ++++++++++++------
 1 file changed, 90 insertions(+), 40 deletions(-)

diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
index 2716e860243bf..e1b517befccb4 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
@@ -9,6 +9,7 @@
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\State;
 use Magento\Quote\Model\QuoteFactory;
+use Magento\Sales\Model\Order\Address;
 use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
 use Magento\Framework\App\ResourceConnection;
@@ -39,23 +40,11 @@ class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, Patch
      */
     private $eavConfig;
 
-    /**
-     * @var AddressCollectionFactory
-     */
-    private $addressCollectionFactory;
-
-    /**
-     * @var OrderFactory
-     */
-    private $orderFactory;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
     /**
      * PatchInitial constructor.
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
      * @param ModuleDataSetupInterface $moduleDataSetup
      */
     public function __construct(
@@ -71,9 +60,6 @@ public function __construct(
         $this->salesSetupFactory = $salesSetupFactory;
         $this->state = $state;
         $this->eavConfig = $eavConfig;
-        $this->addressCollectionFactory = $addressCollectionFactory;
-        $this->orderFactory = $orderFactory;
-        $this->quoteFactory = $quoteFactory;
     }
 
     /**
@@ -96,28 +82,8 @@ public function apply()
      */
     public function fillQuoteAddressIdInSalesOrderAddress(ModuleDataSetupInterface $setup)
     {
-        $addressTable = $setup->getTable('sales_order_address');
-        $updateOrderAddress = $setup->getConnection()
-            ->select()
-            ->joinInner(
-                ['sales_order' => $setup->getTable('sales_order')],
-                $addressTable . '.parent_id = sales_order.entity_id',
-                ['quote_address_id' => 'quote_address.address_id']
-            )
-            ->joinInner(
-                ['quote_address' => $setup->getTable('quote_address')],
-                'sales_order.quote_id = quote_address.quote_id 
-                AND ' . $addressTable . '.address_type = quote_address.address_type',
-                []
-            )
-            ->where(
-                $addressTable . '.quote_address_id IS NULL'
-            );
-        $updateOrderAddress = $setup->getConnection()->updateFromSelect(
-            $updateOrderAddress,
-            $addressTable
-        );
-        $setup->getConnection()->query($updateOrderAddress);
+        $this->fillQuoteAddressIdInSalesOrderAddressByType($setup, Address::TYPE_SHIPPING);
+        $this->fillQuoteAddressIdInSalesOrderAddressByType($setup, Address::TYPE_BILLING);
     }
 
     /**
@@ -145,4 +111,88 @@ public function getAliases()
     {
         return [];
     }
+
+    /**
+     * @param ModuleDataSetupInterface $setup
+     * @param string $addressType
+     */
+    private function fillQuoteAddressIdInSalesOrderAddressByType(ModuleDataSetupInterface $setup, $addressType)
+    {
+        $salesConnection = $setup->getConnection('sales');
+
+        $orderTable = $setup->getTable('sales_order', 'sales');
+        $orderAddressTable = $setup->getTable('sales_order_address', 'sales');
+
+        $query = $salesConnection
+            ->select()
+            ->from(
+                ['sales_order_address' => $orderAddressTable],
+                ['entity_id', 'address_type']
+            )
+            ->joinInner(
+                ['sales_order' => $orderTable],
+                'sales_order_address.parent_id = sales_order.entity_id',
+                ['quote_id' => 'sales_order.quote_id']
+            )
+            ->where('sales_order_address.quote_address_id IS NULL')
+            ->where('sales_order_address.address_type = ?', $addressType)
+            ->order('sales_order_address.entity_id');
+
+        $batchSize = 5000;
+        $result = $salesConnection->query($query);
+        $count = $result->rowCount();
+        $batches = ceil($count / $batchSize);
+
+        for ($batch = $batches; $batch > 0; $batch--) {
+            $query->limitPage($batch, $batchSize);
+            $result = $salesConnection->fetchAssoc($query);
+
+            $this->fillQuoteAddressIdInSalesOrderAddressProcessBatch($setup, $result, $addressType);
+        }
+    }
+
+    /**
+     * @param ModuleDataSetupInterface $setup
+     * @param array $orderAddresses
+     * @param string $addressType
+     */
+    private function fillQuoteAddressIdInSalesOrderAddressProcessBatch(
+        ModuleDataSetupInterface $setup,
+        array $orderAddresses,
+        $addressType
+    ) {
+        $salesConnection = $setup->getConnection('sales');
+        $quoteConnection = $setup->getConnection('checkout');
+
+        $quoteAddressTable = $setup->getTable('quote_address', 'checkout');
+        $quoteTable = $setup->getTable('quote', 'checkout');
+        $salesOrderAddressTable = $setup->getTable('sales_order_address', 'sales');
+
+        $query = $quoteConnection
+            ->select()
+            ->from(
+                ['quote_address' => $quoteAddressTable],
+                ['quote_id', 'address_id']
+            )
+            ->joinInner(
+                ['quote' => $quoteTable],
+                'quote_address.quote_id = quote.entity_id',
+                []
+            )
+            ->where('quote.entity_id in (?)', array_column($orderAddresses, 'quote_id'))
+            ->where('address_type = ?', $addressType);
+
+        $quoteAddresses = $quoteConnection->fetchAssoc($query);
+
+        foreach ($orderAddresses as $orderAddress) {
+            $bind = [
+                'quote_address_id' => $quoteAddresses[$orderAddress['quote_id']]['address_id'] ?? null,
+            ];
+            $where = [
+                'orderAddressId' => $orderAddress['entity_id']
+            ];
+
+            $salesConnection->update($salesOrderAddressTable, $bind, $where);
+        }
+    }
 }

From 54469ce4307776cf5e5beedb002ef8b5775da51e Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 31 Jan 2019 10:53:54 +0200
Subject: [PATCH 0157/1055] magento:magento2 Missed form validation in Admin
 Order Address Edit route sales/order/address

---
 .../Order/Create/Form/AbstractForm.php        | 50 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index d15c218a60b47..b5761bc0ad733 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -176,8 +176,8 @@ protected function _addAttributesToForm($attributes, \Magento\Framework\Data\For
                     [
                         'name' => $attribute->getAttributeCode(),
                         'label' => __($attribute->getStoreLabel()),
-                        'class' => $attribute->getFrontendClass(),
-                        'required' => $attribute->isRequired()
+                        'class' => $this->getValidationClasses($attribute),
+                        'required' => $attribute->isRequired(),
                     ]
                 );
                 if ($inputType == 'multiline') {
@@ -227,4 +227,50 @@ public function getFormValues()
     {
         return [];
     }
+
+    /**
+     * Retrieve frontend classes according validation rules
+     *
+     * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
+     *
+     * @return string
+     */
+    private function getValidationClasses(\Magento\Customer\Api\Data\AttributeMetadataInterface $attribute) : string
+    {
+        $out = [];
+        $out[] = $attribute->getFrontendClass();
+
+        $textLengthValidateClasses = $this->getTextLengthValidateClasses($attribute);
+        if (!empty($textLengthValidateClasses)) {
+            $out = array_merge($out, $textLengthValidateClasses);
+        }
+
+        $out = !empty($out) ? implode(' ', array_unique(array_filter($out))) : '';
+        return $out;
+    }
+
+    /**
+     * Retrieve validation classes by min_text_length and max_text_length rules
+     *
+     * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
+     *
+     * @return array
+     */
+    private function getTextLengthValidateClasses(\Magento\Customer\Api\Data\AttributeMetadataInterface $attribute) : array
+    {
+        $classes = [];
+
+        $validateRules = $attribute->getValidationRules();
+        if (!empty($validateRules['min_text_length'])) {
+            $classes[] = 'minimum-length-' . $validateRules['min_text_length'];
+        }
+        if (!empty($validateRules['max_text_length'])) {
+            $classes[] = 'maximum-length-' . $validateRules['max_text_length'];
+        }
+        if (!empty($classes)) {
+            $classes[] = 'validate-length';
+        }
+
+        return $classes;
+    }
 }

From dfd0874aaee2ed45c221380b570192bd75ed1631 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Thu, 31 Jan 2019 18:54:47 +0200
Subject: [PATCH 0158/1055] MC-13741: Fixed incorrect behavior of template
 variables

---
 .../Magento/Framework/Filter/Template.php     | 43 ++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index fee62e6c3d963..9c7aa7a2c43b7 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Framework\Filter;
 
+use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\Model\AbstractModel;
+
 /**
  * Template filter
  *
@@ -66,7 +69,13 @@ class Template implements \Zend_Filter_Interface
     /**
      * @var string[]
      */
-    private $restrictedMethods = ['addafterfiltercallback'];
+    private $restrictedMethods = [
+        'addafterfiltercallback',
+        'getresourcecollection',
+        'load',
+        'save',
+        'getcollection'
+    ];
 
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
@@ -391,6 +400,27 @@ private function validateVariableMethodCall($object, string $method): void
         }
     }
 
+    /**
+     * Check allowed methods for data objects.
+     *
+     * Deny calls for methods that may disrupt template processing.
+     *
+     * @param object $object
+     * @param string $method
+     * @return bool
+     * @throws \InvalidArgumentException
+     */
+    private function isAllowedDataObjectMethod($object, string $method): bool
+    {
+        if ($object instanceof AbstractExtensibleModel || $object instanceof AbstractModel) {
+            if (in_array(mb_strtolower($method), $this->restrictedMethods)) {
+                throw new \InvalidArgumentException("Method $method cannot be called from template.");
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Return variable value for var construction
      *
@@ -429,10 +459,13 @@ protected function getVariable($value, $default = '{no_value_defined}')
                             || substr($stackVars[$i]['name'], 0, 3) == 'get'
                     ) {
                         $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
-                        $stackVars[$i]['variable'] = call_user_func_array(
-                            [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
-                            $stackVars[$i]['args']
-                        );
+
+                        if ($this->isAllowedDataObjectMethod($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])) {
+                            $stackVars[$i]['variable'] = call_user_func_array(
+                                [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
+                                $stackVars[$i]['args']
+                            );
+                        }
                     }
                 }
                 $last = $i;

From 464e9817dee6dd9c0f15d3b7823e70a84ff6e2b4 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Fri, 1 Feb 2019 12:12:15 +0200
Subject: [PATCH 0159/1055] magento:magento2 Missed form validation in Admin
 Order Address Edit route sales/order/address

---
 .../Block/Adminhtml/Order/Create/Form/AbstractForm.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index b5761bc0ad733..b4442458e801b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -240,9 +240,9 @@ private function getValidationClasses(\Magento\Customer\Api\Data\AttributeMetada
         $out = [];
         $out[] = $attribute->getFrontendClass();
 
-        $textLengthValidateClasses = $this->getTextLengthValidateClasses($attribute);
-        if (!empty($textLengthValidateClasses)) {
-            $out = array_merge($out, $textLengthValidateClasses);
+        $textClasses = $this->getTextLengthValidateClasses($attribute);
+        if (!empty($textClasses)) {
+            $out = array_merge($out, $textClasses);
         }
 
         $out = !empty($out) ? implode(' ', array_unique(array_filter($out))) : '';

From c074563b17e20a2d6bd663757fcd5b777e734e30 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Fri, 1 Feb 2019 13:08:55 +0200
Subject: [PATCH 0160/1055] MC-13741: Fixed incorrect behavior of template
 variables

---
 .../Magento/Framework/Filter/Template.php     |  3 +-
 .../Filter/Test/Unit/TemplateTest.php         | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 9c7aa7a2c43b7..f62d01895eb67 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -74,7 +74,8 @@ class Template implements \Zend_Filter_Interface
         'getresourcecollection',
         'load',
         'save',
-        'getcollection'
+        'getcollection',
+        'getresource'
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
index f19d240a651b8..a6447d0ac62b1 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Framework\Filter\Test\Unit;
 
+use Magento\Store\Model\Store;
+
 class TemplateTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -13,10 +15,16 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
      */
     private $templateFilter;
 
+    /**
+     * @var Store
+     */
+    private $store;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->templateFilter = $objectManager->getObject(\Magento\Framework\Filter\Template::class);
+        $this->store = $objectManager->getObject(Store::class);
     }
 
     public function testFilter()
@@ -391,4 +399,32 @@ public function testInappropriateCallbacks()
         $this->templateFilter->setVariables(['filter' => $this->templateFilter]);
         $this->templateFilter->filter('Test {{var filter.addAfterFilterCallback(\'mb_strtolower\')}}');
     }
+
+    /**
+     * Test adding callbacks when already filtering.
+     *
+     * @expectedException \InvalidArgumentException
+     * @dataProvider disallowedMethods
+     */
+    public function testDisallowedMethods($method)
+    {
+        $this->templateFilter->setVariables(['store' => $this->store]);
+        $this->templateFilter->filter('{{var store.'.$method.'()}}');
+    }
+
+    /**
+     * Data for testDisallowedMethods method
+     *
+     * @return array
+     */
+    public function disallowedMethods()
+    {
+        return [
+            ['getResourceCollection'],
+            ['load'],
+            ['save'],
+            ['getCollection'],
+            ['getResource'],
+        ];
+    }
 }

From 3ec955b7dfd27cfc8a9575a57a07c32d943cec6e Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Fri, 1 Feb 2019 15:56:43 -0600
Subject: [PATCH 0161/1055] MC-5964: Fixed incorrect behaviour of sync actions

---
 .../Product/ProductFrontendAction/Synchronizer.php    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
index 331c6673a555c..72f66284e159a 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
@@ -16,6 +16,8 @@
 use Magento\Framework\EntityManager\EntityManager;
 
 /**
+ * A Product Widget Synchronizer.
+ *
  * Service which allows to sync product widget information, such as product id with db. In order to reuse this info
  * on different devices
  */
@@ -85,9 +87,10 @@ public function __construct(
     }
 
     /**
-     * Find lifetime in configuration. Configuration is hold in Stores Configuration
-     * Also this configuration is generated by:
-     * @see \Magento\Catalog\Model\Widget\RecentlyViewedStorageConfiguration
+     * Finds lifetime in configuration.
+     *
+     * Configuration is hold in Stores Configuration. Also this configuration is generated by
+     * {@see Magento\Catalog\Model\Widget\RecentlyViewedStorageConfiguration}
      *
      * @param string $namespace
      * @return int
@@ -108,6 +111,8 @@ private function getLifeTimeByNamespace($namespace)
     }
 
     /**
+     * Filters actions.
+     *
      * In order to avoid suspicious actions, we need to filter them in DESC order, and slice only items that
      * can be persisted in database.
      *

From 6a5776c46396810875f46e986e56594e8e5ea30c Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Sat, 2 Feb 2019 20:02:54 +0200
Subject: [PATCH 0162/1055] ENGCOM-20434: Removed url key validation for
 invisible products

---
 ...ProductProcessUrlRewriteSavingObserver.php | 39 ++-----------------
 1 file changed, 3 insertions(+), 36 deletions(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
index c5a1c1e429bfa..6eda8dd0b61ee 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
@@ -3,18 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
-
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\App\ObjectManager;
-use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 /**
  * Class ProductProcessUrlRewriteSavingObserver
@@ -36,29 +32,20 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
      */
     private $productUrlPathGenerator;
 
-    /**
-     * @var CollectionFactory
-     */
-    private $collectionFactory;
-
     /**
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param UrlPersistInterface $urlPersist
-     * @param ProductUrlPathGenerator|null $urlPathGenerator
-     * @param CollectionFactory|null $collectionFactory
+     * @param ProductUrlPathGenerator|null $productUrlPathGenerator
      */
     public function __construct(
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
         UrlPersistInterface $urlPersist,
-        ProductUrlPathGenerator $urlPathGenerator = null,
-        CollectionFactory $collectionFactory = null
+        ProductUrlPathGenerator $productUrlPathGenerator = null
     ) {
         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
         $this->urlPersist = $urlPersist;
-        $this->productUrlPathGenerator = $urlPathGenerator ?: ObjectManager::getInstance()
+        $this->productUrlPathGenerator = $productUrlPathGenerator ?: ObjectManager::getInstance()
             ->get(ProductUrlPathGenerator::class);
-        $this->collectionFactory = $collectionFactory ?: ObjectManager::getInstance()
-            ->get(CollectionFactory::class);
     }
 
     /**
@@ -82,27 +69,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 $product->unsUrlPath();
                 $product->setUrlPath($this->productUrlPathGenerator->getUrlPath($product));
                 $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
-                return;
             }
         }
-        $this->validateUrlKey($product);
-    }
-
-    /**
-     * @param Product $product
-     * @throws UrlAlreadyExistsException
-     */
-    private function validateUrlKey(Product $product)
-    {
-        $productCollection = $this->collectionFactory->create();
-        $productCollection->addFieldToFilter(
-            'url_key',
-            ['in' => $product->getUrlKey()]
-        );
-        $productCollection->getSelect()->where('e.entity_id != ?', $product->getId());
-
-        if ($productCollection->getItems()) {
-            throw new UrlAlreadyExistsException();
-        }
     }
 }

From f2088d9b59d0fcf6d521d510fcc37d11e3308f03 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Sat, 2 Feb 2019 20:04:24 +0200
Subject: [PATCH 0163/1055] ENGCOM-20434: Removed url key validation for
 invisible products (revert tests)

---
 .../product_configurable_not_available.php    |  2 +-
 ...uctProcessUrlRewriteSavingObserverTest.php | 30 +++----------------
 .../_files/configurable_products.php          |  2 +-
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_not_available.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_not_available.php
index 87290e0b8259c..73467cd8d063e 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_not_available.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_configurable_not_available.php
@@ -43,7 +43,7 @@
     $productSku = array_shift($productsSku);
     $product->setTypeId(Type::TYPE_SIMPLE)
         ->setAttributeSetId($attributeSetId)
-        ->setName('Configurable Option Not Available' . $option->getLabel())
+        ->setName('Configurable Option' . $option->getLabel())
         ->setSku('simple_not_avalilable_' . $productSku)
         ->setPrice(11)
         ->setTestConfigurable($option->getValue())
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
index f902ee993b84e..c72a58197b1fd 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
@@ -5,11 +5,9 @@
  */
 namespace Magento\CatalogUrlRewrite\Observer;
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product\Visibility;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 
 /**
  * @magentoAppArea adminhtml
@@ -20,16 +18,12 @@ class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Test
     /** @var \Magento\Framework\ObjectManagerInterface */
     protected $objectManager;
 
-    /** @var ProductRepositoryInterface */
-    private $productRepository;
-
     /**
      * Set up
      */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -142,8 +136,10 @@ public function testUrlKeyHasChangedInGlobalContext()
      */
     public function testUrlKeyHasChangedInStoreviewContextWithPermanentRedirection()
     {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository*/
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         /** @var \Magento\Catalog\Model\Product $product*/
-        $product = $this->productRepository->get('product1');
+        $product = $productRepository->get('product1');
 
         /** @var StoreManagerInterface $storeManager */
         $storeManager = $this->objectManager->get(StoreManagerInterface::class);
@@ -238,22 +234,4 @@ public function testUrlKeyHasChangedInStoreviewContextWithoutPermanentRedirectio
             $this->assertContains($row, $actual);
         }
     }
-
-    /**
-     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_simple.php
-     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
-     * @magentoAppIsolation enabled
-     */
-    public function testDuplicatedUrlKeyInvisibleProduct()
-    {
-        $this->expectException(
-            UrlAlreadyExistsException::class,
-            'URL key for specified store already exists'
-        );
-        /** @var \Magento\Catalog\Model\Product $product*/
-        $product = $this->productRepository->get('simple2');
-        $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
-        $product->setUrlKey('simple_product');
-        $product->save();
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
index afebcab773d9c..985c77dba6626 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
@@ -107,7 +107,7 @@
         ->setId($productId)
         ->setAttributeSetId($attributeSetId)
         ->setWebsiteIds([1])
-        ->setName('Configurable Option 12345' . $option->getLabel())
+        ->setName('Configurable Option' . $option->getLabel())
         ->setSku('simple_' . $productId)
         ->setPrice($productId)
         ->setTestConfigurable($option->getValue())

From 4edec382f3517f64284ba45fb341e4bcce1745ab Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Sat, 2 Feb 2019 20:06:54 +0200
Subject: [PATCH 0164/1055] ENGCOM-20434: Removed url key validation for
 invisible products (revert unit test)

---
 ...uctProcessUrlRewriteSavingObserverTest.php | 52 +++++--------------
 1 file changed, 12 insertions(+), 40 deletions(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
index 3df850f51e695..39317b42af989 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php
@@ -6,7 +6,9 @@
 
 namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
 
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
  * Class ProductProcessUrlRewriteSavingObserverTest
@@ -46,21 +48,6 @@ class ProductProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\Test
      */
     protected $objectManager;
 
-    /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
-     */
-    private $collectionFactory;
-
-    /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Collection
-     */
-    private $productCollection;
-
-    /**
-     * @var \Magento\Framework\DB\Select
-     */
-    private $select;
-
     /**
      * @var \Magento\CatalogUrlRewrite\Observer\ProductProcessUrlRewriteSavingObserver
      */
@@ -73,13 +60,13 @@ protected function setUp()
     {
         $this->urlPersist = $this->createMock(\Magento\UrlRewrite\Model\UrlPersistInterface::class);
         $this->product = $this->createPartialMock(\Magento\Catalog\Model\Product::class, [
-            'getId',
-            'dataHasChangedFor',
-            'isVisibleInSiteVisibility',
-            'getIsChangedWebsites',
-            'getIsChangedCategories',
-            'getStoreId'
-        ]);
+                'getId',
+                'dataHasChangedFor',
+                'isVisibleInSiteVisibility',
+                'getIsChangedWebsites',
+                'getIsChangedCategories',
+                'getStoreId'
+            ]);
         $this->product->expects($this->any())->method('getId')->will($this->returnValue(3));
         $this->event = $this->createPartialMock(\Magento\Framework\Event::class, ['getProduct']);
         $this->event->expects($this->any())->method('getProduct')->willReturn($this->product);
@@ -92,28 +79,12 @@ protected function setUp()
         $this->productUrlRewriteGenerator->expects($this->any())
             ->method('generate')
             ->will($this->returnValue([3 => 'rewrite']));
-        $this->collectionFactory = $this->createMock(
-            \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class
-        );
-        $this->productCollection = $this->createMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Collection::class
-        );
-        $this->select = $this->createMock(
-            \Magento\Framework\DB\Select::class
-        );
-        $this->collectionFactory->expects($this->any())
-            ->method('create')
-            ->will($this->returnValue($this->productCollection));
-        $this->productCollection->expects($this->any())
-            ->method('getSelect')
-            ->will($this->returnValue($this->select));
         $this->objectManager = new ObjectManager($this);
         $this->model = $this->objectManager->getObject(
             \Magento\CatalogUrlRewrite\Observer\ProductProcessUrlRewriteSavingObserver::class,
             [
                 'productUrlRewriteGenerator' => $this->productUrlRewriteGenerator,
-                'urlPersist' => $this->urlPersist,
-                'collectionFactory' => $this->collectionFactory
+                'urlPersist' => $this->urlPersist
             ]
         );
     }
@@ -132,7 +103,8 @@ public function urlKeyDataProvider()
                 'isChangedWebsites'     => false,
                 'isChangedCategories'   => false,
                 'visibilityResult'      => true,
-                'expectedReplaceCount'  => 1
+                'expectedReplaceCount'  => 1,
+
             ],
             'no chnages' => [
                 'isChangedUrlKey'       => false,

From a8d1dc042d663adf6b1667192ba3f044c57d51f1 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Sat, 2 Feb 2019 20:09:02 +0200
Subject: [PATCH 0165/1055] ENGCOM-20434: static fixes

---
 .../ProcessUrlRewriteOnChangeProductVisibilityObserver.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
index 16d12bd4c7e4b..6006f75035409 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
@@ -27,18 +27,22 @@ class ProcessUrlRewriteOnChangeProductVisibilityObserver implements ObserverInte
      * @var CollectionFactory
      */
     private $productCollectionFactory;
+
     /**
      * @var ProductUrlRewriteGenerator
      */
     private $urlRewriteGenerator;
+
     /**
      * @var UrlPersistInterface
      */
     private $urlPersist;
+
     /**
      * @var ProductUrlPathGenerator
      */
     private $urlPathGenerator;
+
     /**
      * @param CollectionFactory $collectionFactory
      * @param ProductUrlRewriteGenerator $urlRewriteGenerator
@@ -56,6 +60,7 @@ public function __construct(
         $this->urlPersist = $urlPersist;
         $this->urlPathGenerator = $urlPathGenerator;
     }
+
     /**
      * Generate urls for UrlRewrites and save it in storage
      *

From 56504e1d8b0bde92a0eba4cec2ef233ad147dfc9 Mon Sep 17 00:00:00 2001
From: Mudit Shukla <markadams@cedcommerce.com>
Date: Sun, 3 Feb 2019 11:01:36 +0530
Subject: [PATCH 0166/1055] Updated AbstractCarrier.php

Fixed #13319 , added type casting and updated function comment..
---
 .../Magento/Shipping/Model/Carrier/AbstractCarrier.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index f9030ee75630b..628bc9c4295b0 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -531,10 +531,10 @@ protected function _getPerorderPrice($cost, $handlingType, $handlingFee)
     }
 
     /**
-     * Sets the number of boxes for shipping
+     * Gets the average weight of each box available for shipping
      *
-     * @param int $weight in some measure
-     * @return int
+     * @param float $weight in some measure
+     * @return float
      */
     public function getTotalNumOfBoxes($weight)
     {
@@ -545,7 +545,7 @@ public function getTotalNumOfBoxes($weight)
         $maxPackageWeight = $this->getConfigData('max_package_weight');
         if ($weight > $maxPackageWeight && $maxPackageWeight != 0) {
             $this->_numBoxes = ceil($weight / $maxPackageWeight);
-            $weight = $weight / $this->_numBoxes;
+            $weight = (float)$weight / $this->_numBoxes;
         }
 
         return $weight;

From facfa44aa6f5163a1d78f501c94a8a4303b6b631 Mon Sep 17 00:00:00 2001
From: Ananth Iyer <iyerananth3@gmail.com>
Date: Sun, 3 Feb 2019 15:50:41 +0530
Subject: [PATCH 0167/1055] Fixed Massaction design with submenu on grid pages

---
 .../Magento/backend/web/css/source/actions/_actions-select.less  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
index 1cc61bef5da07..e2e1e301d8ee1 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
@@ -114,6 +114,7 @@
 
             .action-submenu {
                 position: absolute;
+                right: -100%;
             }
         }
     }

From 528864d82c4661dac997198d3cb542232fbf1037 Mon Sep 17 00:00:00 2001
From: Daniel Anderson <daniel@dattrix.com>
Date: Sun, 3 Feb 2019 05:20:50 -0800
Subject: [PATCH 0168/1055] Direct STDERR output when listing crontab to
 /dev/null

When installing crontab on systems using fcron the output from STDERR is captured and inserted into the updated crontab. An example from a fresh install follows. While fcron does not outright complain about this when saving the file, it is messy and quite avoidable.

2019-02-03 13:18:18  INFO listing magento's fcrontab
#~ MAGENTO START 7cd0a74c421051ec6cce8936eb9edd02
* * * * * /usr/lib64/php7.2/bin/php /var/www/magento/bin/magento cron:run 2>&1 | grep -v "Ran jobs by schedule" >> /var/www/magento/var/log/magento.cron.log
* * * * * /usr/lib64/php7.2/bin/php /var/www/magento/update/cron.php >> /var/www/magento/var/log/update.cron.log
* * * * * /usr/lib64/php7.2/bin/php /var/www/magento/bin/magento setup:cron:run >> /var/www/magento/var/log/setup.cron.log
#~ MAGENTO END 7cd0a74c421051ec6cce8936eb9edd02
---
 lib/internal/Magento/Framework/Crontab/CrontabManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Crontab/CrontabManager.php b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
index 6049b7fba6d44..37ced978c5567 100644
--- a/lib/internal/Magento/Framework/Crontab/CrontabManager.php
+++ b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
@@ -182,7 +182,7 @@ private function cleanMagentoSection($content)
     private function getCrontabContent()
     {
         try {
-            $content = (string)$this->shell->execute('crontab -l');
+            $content = (string)$this->shell->execute('crontab -l 2>/dev/null');
         } catch (LocalizedException $e) {
             return '';
         }

From 7b8e969747b4ecefbfcf407cfabe11a4ff08e3c7 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Mon, 4 Feb 2019 12:06:51 +0200
Subject: [PATCH 0169/1055] magento:magento2 Missed form validation in Admin
 Order Address Edit route sales/order/address

---
 .../Order/Create/Form/AbstractForm.php        | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index b4442458e801b..5ea77b0f71811 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -261,14 +261,22 @@ private function getTextLengthValidateClasses(\Magento\Customer\Api\Data\Attribu
         $classes = [];
 
         $validateRules = $attribute->getValidationRules();
-        if (!empty($validateRules['min_text_length'])) {
-            $classes[] = 'minimum-length-' . $validateRules['min_text_length'];
-        }
-        if (!empty($validateRules['max_text_length'])) {
-            $classes[] = 'maximum-length-' . $validateRules['max_text_length'];
-        }
-        if (!empty($classes)) {
-            $classes[] = 'validate-length';
+        if(!empty($validateRules)) {
+            foreach ($validateRules as $rule) {
+                switch ($rule->getName()) {
+                    case 'min_text_length' :
+                        $classes[] = 'minimum-length-' . $rule->getValue();
+                        break;
+
+                    case 'max_text_length' :
+                        $classes[] = 'maximum-length-' . $rule->getValue();
+                        break;
+                }
+            }
+
+            if (!empty($classes)) {
+                $classes[] = 'validate-length';
+            }
         }
 
         return $classes;

From b2608a7851c687e752c392537d2c0756e44ca00a Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Mon, 4 Feb 2019 12:30:03 +0200
Subject: [PATCH 0170/1055] MAGETWO-96505: Fixed incorrect stacktrace
 displaying

---
 .htaccess.sample  | 2 ++
 nginx.conf.sample | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.htaccess.sample b/.htaccess.sample
index c9ddff2cca4cf..9444059aabc4b 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -29,6 +29,8 @@
 
 ############################################
 ## default index file
+## Specifies option, to use methods arguments in backtrace or not
+    SetEnv MAGE_DEBUG_SHOW_ARGS 1
 
     DirectoryIndex index.php
 
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 90604808f6ec0..8da6309d10556 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -9,6 +9,7 @@
 #    listen 80;
 #    server_name mage.dev;
 #    set $MAGE_ROOT /var/www/magento2;
+#    set $MAGE_DEBUG_SHOW_ARGS 1
 #    include /vagrant/magento2/nginx.conf.sample;
 # }
 #

From 448837183069ececaba307b47c7e7ebb1ca27963 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Mon, 4 Feb 2019 19:40:07 +0200
Subject: [PATCH 0171/1055] Allowing usage of the capital letters in attribute
 code

---
 app/code/Magento/Eav/Model/Validator/Attribute/Code.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
index af4791cc0d5d1..578816bc99abd 100644
--- a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
@@ -32,7 +32,7 @@ public function isValid($attributeCode): bool
          * Check attribute_code for allowed characters
          */
         if (trim($attributeCode)
-            && !preg_match('/^[a-z][a-z0-9_]*$/', trim($attributeCode))
+            && !preg_match('/^[a-zA-Z]+[a-zA-Z0-9_]*$/', trim($attributeCode))
         ) {
             throw new LocalizedException(
                 __(

From ebc79a2b6c4f990c4eb8ffd862c57872eb504a3e Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 5 Feb 2019 12:21:40 +0200
Subject: [PATCH 0172/1055] MAGETWO-98081: [FT] [MFTF]
 AdminProductImageAssignmentForMultipleStoresTest fails because of bad design

---
 .../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..2b5a7cae40591 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml
@@ -106,6 +106,7 @@
 
         <!-- Go to Product Page and see Default Store View-->
         <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToDefaultStorefrontProductPage"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(TestImageNew.filename)}}" time="30" stepKey="waitImageToBeLoaded"/>
         <seeElement selector="{{StorefrontProductMediaSection.productImageActive(TestImageNew.filename)}}" stepKey="seeActiveImageDefault"/>
 
         <!-- English Switch Store View and see English Store View -->
@@ -117,6 +118,7 @@
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc(ProductImage.fileName)}}" stepKey="seeThumb"/>
         <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct.name$$)}}" stepKey="openProductPage"/>
         <waitForPageLoad time="30" stepKey="waitForProductPage"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(ProductImage.filename)}}" time="30" stepKey="waitImageToBeLoaded2"/>
         <seeElement selector="{{StorefrontProductMediaSection.productImageActive(ProductImage.filename)}}" stepKey="seeActiveImageEnglish"/>
 
         <!-- Switch France Store View and see France Store View -->
@@ -128,6 +130,7 @@
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc(Magento3.fileName)}}" stepKey="seeThumb1"/>
         <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct.name$$)}}" stepKey="openProductPage1"/>
         <waitForPageLoad time="30" stepKey="waitForProductPage1"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(Magento3.filename)}}" time="30" stepKey="waitImageToBeLoaded3"/>
         <seeElement selector="{{StorefrontProductMediaSection.productImageActive(Magento3.filename)}}" stepKey="seeActiveImageFrance"/>
     </test>
 </tests>

From 48126f0458b6d493792089237cfed8ec88d1d15d Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Tue, 5 Feb 2019 16:35:12 -0600
Subject: [PATCH 0173/1055] MC-5784: Image fields using imageUploader
 UIComponent cannot use gallery image - Modified File Model to suit
 Image-uploader config - Added coverage through MFTF MC-13832

---
 .../Theme/Model/Design/Backend/File.php       | 25 +++++++--
 .../Mftf/Section/AdminDesignConfigSection.xml |  7 +++
 .../Test/AdminMediaGalleryImageUploadTest.xml | 56 +++++++++++++++++++
 3 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml

diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index b37628e54aa30..8bb73fbb35116 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -88,23 +88,27 @@ public function beforeSave()
     {
         $values = $this->getValue();
         $value = reset($values) ?: [];
-        if (!isset($value['file'])) {
+        $file = $value['file'] ?? $value['name'];
+        if (!isset($file)) {
             throw new LocalizedException(
                 __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
             );
         }
         if (isset($value['exists'])) {
-            $this->setValue($value['file']);
+            $this->setValue($file);
             return $this;
         }
 
-        $filename = basename($value['file']);
+        $filename = basename($file);
+        $relativeMediaUrl = $this->getRelativeMediaPath($value['url']);
+        $tmpMediaPath = $this->_mediaDirectory->isFile($relativeMediaUrl) ?
+            $relativeMediaUrl : $this->getTmpMediaPath($filename);
         $result = $this->_mediaDirectory->copyFile(
-            $this->getTmpMediaPath($filename),
+            $tmpMediaPath,
             $this->_getUploadDir() . '/' . $filename
         );
         if ($result) {
-            $this->_mediaDirectory->delete($this->getTmpMediaPath($filename));
+            $this->_mediaDirectory->delete($tmpMediaPath);
             if ($this->_addWhetherScopeInfo()) {
                 $filename = $this->_prependScopeInfo($filename);
             }
@@ -231,4 +235,15 @@ private function getMime()
         }
         return $this->mime;
     }
+
+    /**
+     * Get Relative Media Path
+     *
+     * @param string $path
+     * @return string
+     */
+    private function getRelativeMediaPath(string $path)
+    {
+        return str_replace('/pub/media', '', $path);
+    }
 }
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
index 0aa2f7f35218a..3f548850b3c06 100644
--- a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
@@ -14,5 +14,12 @@
         <element name="watermarkSection" type="text" selector="[data-index='watermark'] .admin__fieldset-wrapper-content"/>
         <element name="imageUploadInputByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//input" parameterized="true"/>
         <element name="imageUploadPreviewByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader-preview')]//img" parameterized="true"/>
+        <element name="addSelectedFromMediaGallery" type="input" selector="//button[contains(@title,'Add Selected')]"/>
+        <element name="htmlHeaderSection" type="text" selector="[data-index='head']"/>
+        <element name="selectFromGalleryByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//label[contains(text(), 'Select from Gallery')]" parameterized="true"/>
+        <element name="imageUploadFromMediaGallery" type="input" selector="//input[contains(@class,'fileupload')]" />
+        <element name="saveConfiguration" type="input" selector="//button[contains(@title, 'Save Configuration')]" />
+        <element name="successNotification" type="text" selector="//div[contains(@data-ui-id, 'messages-message-success')]" />
+        <element name="useDefaultByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//span[contains(text(), 'Use Default Value')]" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml
new file mode 100644
index 0000000000000..2cd74c53baa13
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.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="AdminMediaGalleryImageUploadTest">
+        <annotations>
+            <features value="Content"/>
+            <stories value="Content"/>
+            <title value="MC-5784: Image fields using imageUploader UIComponent cannot use gallery image"/>
+            <description value="Admin should be able to use Image Uploader to add Gallery Images"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13832"/>
+            <group value="Content"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
+        <waitForPageLoad stepKey="waitForPageload1"/>
+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
+        <waitForPageLoad stepKey="waitForPageload2"/>
+        <scrollTo selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="scrollToHtmlHeadSection"/>
+        <click selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="openHtmlHeadSection"/>
+
+        <click selector="{{AdminDesignConfigSection.selectFromGalleryByFieldsetName('Head')}}" stepKey="openMediaGallery"/>
+        <wait time="3" stepKey="waitForAddingdSelectedImages"/>
+        <attachFile selector="{{AdminDesignConfigSection.imageUploadFromMediaGallery}}" userInput="adobe-base.jpg" stepKey="attachFile1"/>
+        <wait time="3" stepKey="waitForAddingSelectedImages"/>
+        <click selector="{{AdminDesignConfigSection.addSelectedFromMediaGallery}}" stepKey="addSelectedImages"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Head')}}" stepKey="waitForPreviewImage"/>
+        <wait time="3" stepKey="waitForWrapperToClose"/>
+        <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification"/>
+        <waitForPageLoad stepKey="waitForPageloadSuccess"/>
+
+        <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView2"/>
+        <waitForPageLoad stepKey="waitForPageload3"/>
+        <scrollTo selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="scrollToHtmlHeadSection2"/>
+        <click selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="openHtmlHeadSection2"/>
+
+        <click selector="{{AdminDesignConfigSection.useDefaultByFieldsetName('Head')}}" stepKey="clickUseDefault"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Head')}}" stepKey="waitForPreviewImage2"/>
+        <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration2"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification2"/>
+        <waitForPageLoad stepKey="waitForPageloadSuccess2"/>
+    </test>
+</tests>

From e028d6f490a0c616095654daf221cc6d9b27f66f Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 6 Feb 2019 09:30:03 +0200
Subject: [PATCH 0174/1055] Improving the validation rules on product attribute
 save

---
 .../Adminhtml/Product/Attribute/Save.php      | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 39ed11b1806cd..cdf0397674e30 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -196,8 +196,23 @@ public function execute()
                 : $this->getRequest()->getParam('attribute_code');
             $attributeCode = $attributeCode ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
             if (strlen($attributeCode) > 0) {
+                $attributeCodeIsValid = true;
+                $minLength = \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MIN_LENGTH;
+                $maxLength = \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MAX_LENGTH;
+
+                if (strlen($attributeCode) < $minLength || strlen($attributeCode) > $maxLength) {
+                    $this->messageManager->addErrorMessage(
+                        __(
+                            'An attribute code must not be less than %1 and more than %2 characters.',
+                            $minLength,
+                            $maxLength
+                        )
+                    );
+                    $attributeCodeIsValid = false;
+                }
+
                 $validatorAttrCode = new \Zend_Validate_Regex(
-                    ['pattern' => '/^[a-zA-Z\x{600}-\x{6FF}][a-zA-Z\x{600}-\x{6FF}_0-9]{0,30}$/u']
+                    ['pattern' => '/^[a-zA-Z]+[a-zA-Z0-9_]$/u']
                 );
                 if (!$validatorAttrCode->isValid($attributeCode)) {
                     $this->messageManager->addErrorMessage(
@@ -207,6 +222,10 @@ public function execute()
                             $attributeCode
                         )
                     );
+                    $attributeCodeIsValid = false;
+                }
+
+                if (!$attributeCodeIsValid) {
                     return $this->returnResult(
                         'catalog/*/edit',
                         ['attribute_id' => $attributeId, '_current' => true],

From fa22418f6f0fd629b440c171e883d6242c0f32bb Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 6 Feb 2019 09:44:37 +0200
Subject: [PATCH 0175/1055] Fixing the multidimensional array as value for the
 widget's parameter

---
 .../Magento/Widget/Block/Adminhtml/Widget/Options.php     | 4 +++-
 .../Magento/Framework/Data/Form/Element/Label.php         | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
index cc2af4996d562..829741786316d 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -166,7 +166,9 @@ protected function _addField($parameter)
 
         if (is_array($data['value'])) {
             foreach ($data['value'] as &$value) {
-                $value = html_entity_decode($value);
+                if (!is_array($value)) {
+                    $value = html_entity_decode($value);
+                }
             }
         } else {
             $data['value'] = html_entity_decode($data['value']);
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Label.php b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
index 901dcb5289e8d..a95c7646eadce 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Label.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
@@ -37,8 +37,14 @@ public function __construct(
     public function getElementHtml()
     {
         $html = $this->getBold() ? '<div class="control-value special">' : '<div class="control-value">';
-        $html .= $this->getEscapedValue() . '</div>';
+        if (is_array($this->getValue())) {
+            $html .= '</div>';
+        } else {
+            $html .= $this->getEscapedValue() . '</div>';
+        }
+
         $html .= $this->getAfterElementHtml();
+
         return $html;
     }
 }

From 314d3a8ef24d49f5a55cf6ca3efe5bdfef025b4d Mon Sep 17 00:00:00 2001
From: Ananth Iyer <iyerananth3@gmail.com>
Date: Wed, 6 Feb 2019 14:34:02 +0530
Subject: [PATCH 0176/1055] Fixed mass action design issue #2

---
 .../backend/web/css/source/actions/_actions-select.less       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
index e2e1e301d8ee1..544ab2fadd624 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
@@ -108,10 +108,6 @@
             min-width: 100%;
             position: static;
 
-            ._parent._visible {
-                position: relative;
-            }
-
             .action-submenu {
                 position: absolute;
                 right: -100%;

From 06113942bfd95b25efd94c2f3626526549aade1a Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Wed, 6 Feb 2019 15:25:56 +0530
Subject: [PATCH 0177/1055] reolve comflict and remove unncessary code using
 compare with magento 2 core file

---
 .../Swatches/view/frontend/web/js/swatch-renderer.js     | 9 ---------
 1 file changed, 9 deletions(-)

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 3693f86984602..220b06fea1dc0 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
@@ -1242,15 +1242,6 @@ define([
                     });
                 }
 
-                if (typeof gallery === 'undefined') {
-                    context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
-                        loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
-                        loadedGallery.first();
-                    }.bind(this));
-                } else {
-                    gallery.first();
-                }
-
             } else if (justAnImage && justAnImage.img) {
                 context.find('.product-image-photo').attr('src', justAnImage.img);
             }

From f35392661962f824a474a260618a9bb8ec41549e Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 6 Feb 2019 12:31:31 +0200
Subject: [PATCH 0178/1055] Refactoring the if condition

---
 lib/internal/Magento/Framework/Data/Form/Element/Label.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Label.php b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
index a95c7646eadce..a2efb72c75542 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Label.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
@@ -37,12 +37,11 @@ public function __construct(
     public function getElementHtml()
     {
         $html = $this->getBold() ? '<div class="control-value special">' : '<div class="control-value">';
-        if (is_array($this->getValue())) {
-            $html .= '</div>';
-        } else {
-            $html .= $this->getEscapedValue() . '</div>';
+        if (!is_array($this->getValue())) {
+            $html .= $this->getEscapedValue();
         }
 
+        $html .= '</div>';
         $html .= $this->getAfterElementHtml();
 
         return $html;

From 1651f9080e57a7aa9763d84c6b31a29c610d74a1 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Wed, 6 Feb 2019 18:11:11 +0530
Subject: [PATCH 0179/1055] Corrected the translation for comment tag

---
 .../system/paypal_payflowpro_with_express_checkout.xml       | 4 ++--
 app/code/Magento/Paypal/i18n/en_US.csv                       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

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..3e9de03b854c1 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
@@ -6,7 +6,7 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="paypal_payflowpro_with_express_checkout" translate="label comment" extends="payment_all_paypal/paypal_payflowpro">
+    <group id="paypal_payflowpro_with_express_checkout" translate="label" extends="payment_all_paypal/paypal_payflowpro">
         <label>Payflow Pro</label>
         <attribute type="paypal_ec_separate">0</attribute>
         <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
@@ -30,7 +30,7 @@
                     <field id="enable_paypal_payflow"/>
                 </requires>
             </field>
-            <field id="enable_express_checkout_bml_payflow" translate="label" type="select" sortOrder="21" showInWebsite="1" showInDefault="1">
+            <field id="enable_express_checkout_bml_payflow" translate="label comment" 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.
                             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;.
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index c3f3e38fa03b4..2781cd1b71086 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -697,3 +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>.
                 "
+"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>","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>"
\ No newline at end of file

From 7ce57eb86e068ece2c3caa212a3d41344252bfdb Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Wed, 6 Feb 2019 09:30:59 -0600
Subject: [PATCH 0180/1055] MC-5784: Image fields using imageUploader
 UIComponent cannot use gallery image - Fixed static, unit and mftf tests.

---
 app/code/Magento/Theme/Model/Design/Backend/File.php  | 11 +++++++++--
 .../Mftf/Test/AdminMediaGalleryImageUploadTest.xml    |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 8bb73fbb35116..74127484e23b4 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -22,6 +22,8 @@
 use Magento\Theme\Model\Design\Config\FileUploader\FileProcessor;
 
 /**
+ * File Backend
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class File extends BackendFile
@@ -88,7 +90,7 @@ public function beforeSave()
     {
         $values = $this->getValue();
         $value = reset($values) ?: [];
-        $file = $value['file'] ?? $value['name'];
+        $file = $value['file'] ?? $value['name'] ?? null;
         if (!isset($file)) {
             throw new LocalizedException(
                 __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
@@ -121,7 +123,10 @@ public function beforeSave()
     }
 
     /**
-     * @return array
+     * After Load
+     *
+     * @return File
+     * @throws LocalizedException
      */
     public function afterLoad()
     {
@@ -170,6 +175,8 @@ protected function getUploadDirPath($uploadDir)
     }
 
     /**
+     * Get Value
+     *
      * @return array
      */
     public function getValue()
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml
index 2cd74c53baa13..de2363da3e7a5 100644
--- a/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml
@@ -49,6 +49,7 @@
 
         <click selector="{{AdminDesignConfigSection.useDefaultByFieldsetName('Head')}}" stepKey="clickUseDefault"/>
         <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Head')}}" stepKey="waitForPreviewImage2"/>
+        <wait time="3" stepKey="waitForWrapperToClose2"/>
         <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration2"/>
         <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification2"/>
         <waitForPageLoad stepKey="waitForPageloadSuccess2"/>

From 8bb2a3a4fd90914d12fd26204cb9490c6c044abe Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Wed, 6 Feb 2019 10:53:31 -0600
Subject: [PATCH 0181/1055] MC-5784: Image fields using imageUploader
 UIComponent cannot use gallery image - Fixed flaky mftf test.

---
 .../Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml
index de2363da3e7a5..f9f6e6b37c5dd 100644
--- a/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml
@@ -48,7 +48,6 @@
         <click selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="openHtmlHeadSection2"/>
 
         <click selector="{{AdminDesignConfigSection.useDefaultByFieldsetName('Head')}}" stepKey="clickUseDefault"/>
-        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Head')}}" stepKey="waitForPreviewImage2"/>
         <wait time="3" stepKey="waitForWrapperToClose2"/>
         <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration2"/>
         <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification2"/>

From fd4ed41edfd534a1037f13c21aa9d16a8d07c37a Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 7 Feb 2019 13:06:30 +0200
Subject: [PATCH 0182/1055] magento:magento2 Missed form validation in Admin
 Order Address Edit route sales/order/address

---
 ...rderWithAndWithoutFieldsValidationTest.xml | 79 +++++++++++++++++++
 .../Customer/Test/Repository/Address.xml      | 15 ++++
 2 files changed, 94 insertions(+)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
new file mode 100644
index 0000000000000..83c9072721836
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.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="AdminSubmitsOrderWithAndWithoutFieldsValidationTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Create orders"/>
+            <title value="Fields validation is required to create an order from Admin Panel"/>
+            <description value="Admin should not be able to submit orders without invalid address fields"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <!--Create order via Admin-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
+        <!--<actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage"/>-->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+
+        <!--Check if order can be submitted without the required fields including email address-->
+        <actionGroup ref="checkRequiredFieldsNewOrderForm" stepKey="checkRequiredFieldsNewOrder" after="seeNewOrderPageTitle"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="checkRequiredFieldsNewOrder"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder" after="scrollToTopOfOrderFormPage">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!--Fill customer group and customer email-->
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="addSimpleProductToOrder"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
+
+        <!--Fill wrong customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_address_TX_Wrong_Validation"/>
+        </actionGroup>
+        <!-- Select shipping -->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
+
+        <!--Verify totals on Order page-->
+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping" after="seeOrderSubTotal"/>
+        <scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="scrollToOrderGrandTotal"/>
+
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="seeCorrectGrandTotal"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}" userInput="Please enter less or equal than 255 symbols." stepKey="firstNameError" after="clickSubmitOrder"/>
+
+        <!--Fill correct customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="firstNameError">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_address_TX"/>
+        </actionGroup>
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="fillCustomerAddress"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
+        </test>
+    </tests>
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml
index 32f5d54340026..c182f59c2474b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml
@@ -118,6 +118,21 @@
             <field name="default_shipping" xsi:type="string">Yes</field>
         </dataset>
 
+        <dataset name="US_address_TX_Wrong_Validation">
+            <field name="firstname" xsi:type="string">LoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsum</field>
+            <field name="lastname" xsi:type="string">Doe</field>
+            <field name="email" xsi:type="string">John.Doe%isolation%@example.com</field>
+            <field name="company" xsi:type="string">Magento %isolation%</field>
+            <field name="street" xsi:type="string">7700 W. Parmer Lane Bldg. D</field>
+            <field name="city" xsi:type="string">Austin</field>
+            <field name="region_id" xsi:type="string">Texas</field>
+            <field name="postcode" xsi:type="string">78729</field>
+            <field name="country_id" xsi:type="string">United States</field>
+            <field name="telephone" xsi:type="string">512-691-4400</field>
+            <field name="default_billing" xsi:type="string">Yes</field>
+            <field name="default_shipping" xsi:type="string">Yes</field>
+        </dataset>
+
         <dataset name="US_address_NY">
             <field name="firstname" xsi:type="string">John</field>
             <field name="lastname" xsi:type="string">Doe</field>

From 7eb567e48314c8e2f290838b3eefd23656e58eb7 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Thu, 7 Feb 2019 13:25:45 +0200
Subject: [PATCH 0183/1055] Applying some minor adjustments

---
 app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php | 2 +-
 lib/internal/Magento/Framework/Data/Form/Element/Label.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
index 829741786316d..43761d4d4ef2d 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -166,7 +166,7 @@ protected function _addField($parameter)
 
         if (is_array($data['value'])) {
             foreach ($data['value'] as &$value) {
-                if (!is_array($value)) {
+                if (is_string($value)) {
                     $value = html_entity_decode($value);
                 }
             }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Label.php b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
index a2efb72c75542..d9834b8c15ee1 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Label.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
@@ -37,7 +37,7 @@ public function __construct(
     public function getElementHtml()
     {
         $html = $this->getBold() ? '<div class="control-value special">' : '<div class="control-value">';
-        if (!is_array($this->getValue())) {
+        if (is_string($this->getValue())) {
             $html .= $this->getEscapedValue();
         }
 

From 40d44c2884cfb56850ce929b1c9e6577b489efe8 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 25 Jan 2019 16:23:29 +0200
Subject: [PATCH 0184/1055] ENGCOM-3725: MTF test fix.

---
 .../Backend/Test/Page/Adminhtml/Dashboard.xml |  1 +
 .../AssertUserRoleRestrictedAccess.php        |  5 +-
 ...ssertUserRoleRestrictedAccessWithError.php | 17 ++++++
 .../Constraint/AssertUserSuccessLogin.php     | 10 +++-
 .../AssertUserSuccessLoginWithError.php       | 20 +++++++
 .../TestCase/UpdateAdminUserEntityTest.xml    |  2 +-
 .../UpdateAdminUserRoleEntityTest.php         |  5 ++
 .../UpdateAdminUserRoleEntityTest.xml         |  4 +-
 .../Test/TestStep/CloseErrorAlertStep.php     | 53 +++++++++++++++++++
 .../Test/TestStep/LoginUserOnBackendStep.php  |  4 +-
 .../LoginUserOnBackendWithErrorStep.php       | 53 +++++++++++++++++++
 .../Test/TestStep/LogoutUserOnBackendStep.php |  1 -
 .../LogoutUserOnBackendWithErrorStep.php      | 40 ++++++++++++++
 .../tests/app/Magento/User/Test/etc/di.xml    | 14 +++++
 14 files changed, 219 insertions(+), 10 deletions(-)
 create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php
 create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php
 create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
 create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php
 create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php
 create mode 100644 dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml

diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
index adae65a1d06d6..799f9e30fd972 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
@@ -17,5 +17,6 @@
         <block name="accessDeniedBlock" class="Magento\Backend\Test\Block\Denied" locator="#anchor-content" strategy="css selector" />
         <block name="systemMessageDialog" class="Magento\AdminNotification\Test\Block\System\Messages" locator='.ui-popup-message .modal-inner-wrap' strategy="css selector" />
         <block name="applicationVersion" class="Magento\Backend\Test\Block\Version" locator="body" strategy="css selector" />
+        <block name="modalMessage" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator=".modal-popup>.modal-inner-wrap" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
index f7c56ae1b9653..ecfbc8d353888 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php
@@ -10,6 +10,7 @@
 use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\User\Test\Fixture\User;
+use Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep;
 
 /**
  * Asserts that user has only related permissions.
@@ -18,6 +19,8 @@ class AssertUserRoleRestrictedAccess extends AbstractConstraint
 {
     const DENIED_ACCESS = 'Sorry, you need permissions to view this content.';
 
+    protected $loginStep = 'Magento\User\Test\TestStep\LoginUserOnBackendStep';
+
     /**
      * Asserts that user has only related permissions.
      *
@@ -36,7 +39,7 @@ public function processAssert(
         $denyUrl
     ) {
         $this->objectManager->create(
-            \Magento\User\Test\TestStep\LoginUserOnBackendStep::class,
+            $this->loginStep,
             ['user' => $user]
         )->run();
 
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php
new file mode 100644
index 0000000000000..b001893abb4c4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccessWithError.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\User\Test\Constraint;
+
+/**
+ * @inheritdoc
+ */
+class AssertUserRoleRestrictedAccessWithError extends AssertUserRoleRestrictedAccess
+{
+    protected $loginStep = 'Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep';
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
index c0c04628f744d..c4645e6e8916a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
@@ -7,14 +7,20 @@
 namespace Magento\User\Test\Constraint;
 
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
-use Magento\User\Test\Fixture\User;
 use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\User\Test\Fixture\User;
+use Magento\User\Test\TestStep\LoginUserOnBackendStep;
 
 /**
  * Verify whether customer has logged in to the Backend.
  */
 class AssertUserSuccessLogin extends AbstractConstraint
 {
+    /**
+     * @var string
+     */
+    protected $loginStep = LoginUserOnBackendStep::class;
+
     /**
      * Verify whether customer has logged in to the Backend.
      *
@@ -25,7 +31,7 @@ class AssertUserSuccessLogin extends AbstractConstraint
     public function processAssert(User $user, Dashboard $dashboard)
     {
         $this->objectManager->create(
-            \Magento\User\Test\TestStep\LoginUserOnBackendStep::class,
+            $this->loginStep,
             ['user' => $user]
         )->run();
         \PHPUnit\Framework\Assert::assertTrue(
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php
new file mode 100644
index 0000000000000..9fed1f4df8573
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLoginWithError.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\Constraint;
+
+use Magento\User\Test\TestStep\LoginUserOnBackendWithErrorStep;
+
+/**
+ * Verify whether customer has logged in to the Backend with error alert.
+ */
+class AssertUserSuccessLoginWithError extends AssertUserSuccessLogin
+{
+    /**
+     * @var string
+     */
+    protected $loginStep = LoginUserOnBackendWithErrorStep::class;
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
index f7de667cf17ac..a89d1ede80112 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
@@ -32,7 +32,7 @@
             <constraint name="Magento\User\Test\Constraint\AssertUserInGrid" />
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogOut" />
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
-            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccess" />
+            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccessWithError" />
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
index cc1d0fc980fbf..58450abc71633 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
@@ -121,6 +121,11 @@ public function testUpdateAdminUserRolesEntity(
      */
     public function tearDown()
     {
+        sleep(3);
+        $modalMessage = $this->dashboard->getModalMessage();
+        if ($modalMessage->isVisible()) {
+            $modalMessage->acceptAlert();
+        }
         $this->dashboard->getAdminPanelHeader()->logOut();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
index 224ccbce10f96..db6a13d0f3551 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.xml
@@ -29,8 +29,8 @@
             <constraint name="Magento\User\Test\Constraint\AssertRoleSuccessSaveMessage" />
             <constraint name="Magento\User\Test\Constraint\AssertRoleInGrid" />
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogOut" />
-            <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
-            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccess" />
+            <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLoginWithError"/>
+            <constraint name="Magento\User\Test\Constraint\AssertUserRoleRestrictedAccessWithError" />
         </variation>
         <variation name="UpdateAdminUserRoleEntityTestVariation3">
             <data name="user/dataset" xsi:type="string">custom_admin_with_default_role</data>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
new file mode 100644
index 0000000000000..b8a3fce5de214
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\TestStep;
+
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Close access error modal message.
+ */
+class CloseErrorAlertStep implements TestStepInterface
+{
+    /**
+     * @var Dashboard
+     */
+    private $dashboard;
+
+    /**
+     * @var BrowserInterface
+     */
+    private $browser;
+
+    /**
+     * @param Dashboard $dashboard
+     * @param BrowserInterface $browser
+     */
+    public function __construct(
+        Dashboard $dashboard,
+        BrowserInterface $browser
+    ) {
+        $this->dashboard = $dashboard;
+        $this->browser = $browser;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $modalMessage = $this->dashboard->getModalMessage();
+        $this->browser->waitUntil(
+            function () use ($modalMessage) {
+                return $modalMessage->isVisible() ? true : null;
+            }
+        );
+        $modalMessage->acceptAlert();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
index 4f7e6deed7a85..c244e27d42899 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
@@ -50,7 +50,7 @@ class LoginUserOnBackendStep implements TestStepInterface
      *
      * @var BrowserInterface
      */
-    private $browser;
+    protected $browser;
 
     /**
      * Array of error messages on admin login form.
@@ -108,8 +108,6 @@ public function run()
                 }
             }
         }
-
-        $this->dashboard->getSystemMessageDialog()->closePopup();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php
new file mode 100644
index 0000000000000..094f90d0a5d70
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendWithErrorStep.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\TestStep;
+
+use Magento\Backend\Test\Page\AdminAuthLogin;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\User\Test\Fixture\User;
+
+/**
+ * Login user on backend with access error.
+ */
+class LoginUserOnBackendWithErrorStep extends LoginUserOnBackendStep
+{
+    /**
+     * @var CloseErrorAlertStep
+     */
+    private $closeErrorAlertStep;
+
+    /**
+     * @param LogoutUserOnBackendStep $logoutUserOnBackendStep
+     * @param AdminAuthLogin $adminAuth
+     * @param User $user
+     * @param Dashboard $dashboard
+     * @param BrowserInterface $browser
+     */
+    public function __construct(
+        LogoutUserOnBackendStep $logoutUserOnBackendStep,
+        AdminAuthLogin $adminAuth,
+        User $user,
+        Dashboard $dashboard,
+        BrowserInterface $browser,
+        CloseErrorAlertStep $closeErrorAlertStep
+    ) {
+        parent::__construct($logoutUserOnBackendStep, $adminAuth, $user, $dashboard, $browser);
+        $this->closeErrorAlertStep = $closeErrorAlertStep;
+    }
+
+    /**
+     * Run step flow.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        parent::run();
+        $this->closeErrorAlertStep->run();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php
index 70a4080a0b4d5..7f366312bba24 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendStep.php
@@ -48,7 +48,6 @@ public function __construct(AdminAuthLogin $adminAuth, Dashboard $dashboard)
     public function run()
     {
         $this->adminAuth->open();
-        $this->dashboard->getSystemMessageDialog()->closePopup();
         $this->dashboard->getAdminPanelHeader()->logOut();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php
new file mode 100644
index 0000000000000..ce49e86afc065
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LogoutUserOnBackendWithErrorStep.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\TestStep;
+
+use Magento\Backend\Test\Page\AdminAuthLogin;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+
+/**
+ * Logout user on backend with access error.
+ */
+class LogoutUserOnBackendWithErrorStep extends LogoutUserOnBackendStep
+{
+    /**
+     * @var CloseErrorAlertStep
+     */
+    private $closeErrorAlertStep;
+
+    public function __construct(
+        AdminAuthLogin $adminAuth,
+        Dashboard $dashboard,
+        CloseErrorAlertStep $closeErrorAlertStep
+    ) {
+        parent::__construct($adminAuth, $dashboard);
+        $this->closeErrorAlertStep = $closeErrorAlertStep;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run()
+    {
+        $this->adminAuth->open();
+        $this->closeErrorAlertStep->run();
+        $this->dashboard->getAdminPanelHeader()->logOut();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml
new file mode 100644
index 0000000000000..1298bd56a8fb0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/User/Test/etc/di.xml
@@ -0,0 +1,14 @@
+<?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\User\Test\TestStep\LoginUserOnBackendWithErrorStep">
+        <arguments>
+            <argument name="logoutUserOnBackendStep" xsi:type="object">\Magento\User\Test\TestStep\LogoutUserOnBackendWithErrorStep</argument>
+        </arguments>
+    </type>
+</config>

From 5cec0bbcc401dca61ebeea7cc04deb73e0a4263c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 7 Feb 2019 14:54:07 +0200
Subject: [PATCH 0185/1055] MAGETWO-98081: [FT] [MFTF]
 AdminProductImageAssignmentForMultipleStoresTest fails because of bad design

---
 .../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..3fd32573aace5 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">MAGETWO-98141</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 8129886905890be85b009d499451854653f9ebf8 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Thu, 7 Feb 2019 17:48:05 +0200
Subject: [PATCH 0186/1055] Fixing the Regex expr

---
 .../Catalog/Controller/Adminhtml/Product/Attribute/Save.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index cdf0397674e30..3fb93911b85d7 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -212,7 +212,7 @@ public function execute()
                 }
 
                 $validatorAttrCode = new \Zend_Validate_Regex(
-                    ['pattern' => '/^[a-zA-Z]+[a-zA-Z0-9_]$/u']
+                    ['pattern' => '/^[a-zA-Z]+[a-zA-Z0-9_]+$/u']
                 );
                 if (!$validatorAttrCode->isValid($attributeCode)) {
                     $this->messageManager->addErrorMessage(

From 079bb15922f35995991d42be8b671d034f7cd0b9 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Thu, 7 Feb 2019 18:27:09 +0200
Subject: [PATCH 0187/1055] Using the same regex rule as it is in attribute
 code validator

---
 .../Catalog/Controller/Adminhtml/Product/Attribute/Save.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 3fb93911b85d7..78a25567eb195 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -212,7 +212,7 @@ public function execute()
                 }
 
                 $validatorAttrCode = new \Zend_Validate_Regex(
-                    ['pattern' => '/^[a-zA-Z]+[a-zA-Z0-9_]+$/u']
+                    ['pattern' => '/^[a-zA-Z]+[a-zA-Z0-9_]*$/u']
                 );
                 if (!$validatorAttrCode->isValid($attributeCode)) {
                     $this->messageManager->addErrorMessage(

From fa477196ef25c2df82cd7c7bc03257c48a04d14b Mon Sep 17 00:00:00 2001
From: "colin.macdonald" <colin.macdonald@au.harveynorman.com>
Date: Fri, 8 Feb 2019 14:34:48 +1100
Subject: [PATCH 0188/1055] allowing setup:install to specify
 redis-compress-data and redis-compression-library for cache and pagecache

---
 .../Setup/Model/ConfigOptionsList/Cache.php   | 26 ++++++++++++++++---
 .../Model/ConfigOptionsList/PageCache.php     | 26 +++++++++++++------
 .../Model/ConfigOptionsList/CacheTest.php     | 22 +++++++++++++---
 .../Model/ConfigOptionsList/PageCacheTest.php | 20 +++++++++-----
 4 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
index 173064b472217..eb1b30093a670 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
@@ -27,6 +27,8 @@ class Cache implements ConfigOptionsListInterface
     const INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE = 'cache-backend-redis-db';
     const INPUT_KEY_CACHE_BACKEND_REDIS_PORT = 'cache-backend-redis-port';
     const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
+    const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'cache-backend-redis-compress-data';
+    const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY = 'cache-backend-redis-compression-library';
     const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';
 
     const CONFIG_PATH_CACHE_BACKEND = 'cache/frontend/default/backend';
@@ -34,6 +36,8 @@ class Cache implements ConfigOptionsListInterface
     const CONFIG_PATH_CACHE_BACKEND_DATABASE = 'cache/frontend/default/backend_options/database';
     const CONFIG_PATH_CACHE_BACKEND_PORT = 'cache/frontend/default/backend_options/port';
     const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
+    const CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/default/backend_options/compress_data';
+    const CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIBRARY = 'cache/frontend/default/backend_options/compression_library';
     const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';
 
     /**
@@ -43,7 +47,9 @@ class Cache implements ConfigOptionsListInterface
         self::INPUT_KEY_CACHE_BACKEND_REDIS_SERVER => '127.0.0.1',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE => '0',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => '6379',
-        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => ''
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => '',
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => '0',
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY => '',
     ];
 
     /**
@@ -60,7 +66,9 @@ class Cache implements ConfigOptionsListInterface
         self::INPUT_KEY_CACHE_BACKEND_REDIS_SERVER => self::CONFIG_PATH_CACHE_BACKEND_SERVER,
         self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE => self::CONFIG_PATH_CACHE_BACKEND_DATABASE,
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_CACHE_BACKEND_PORT,
-        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_CACHE_BACKEND_PASSWORD
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA,
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY => self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIBRARY,
     ];
 
     /**
@@ -115,12 +123,24 @@ public function getOptions()
                 self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
                 'Redis server password'
             ),
+            new TextConfigOption(
+                self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA,
+                'Set to 1 to compress the cache (use 0 to disable)'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIBRARY,
+                'Compression library to use [snappy,lzf,l4z,zstd,gzip] (leave blank to determine automatically)'
+            ),
             new TextConfigOption(
                 self::INPUT_KEY_CACHE_ID_PREFIX,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_CACHE_ID_PREFIX,
                 'ID prefix for cache keys'
-            )
+            ),
         ];
     }
 
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
index 7451b59356828..57912cb117c2a 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
@@ -26,16 +26,18 @@ class PageCache implements ConfigOptionsListInterface
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER = 'page-cache-redis-server';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE = 'page-cache-redis-db';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT = 'page-cache-redis-port';
-    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD = 'page-cache-redis-password';
+    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
+    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY = 'page-cache-redis-compression-library';
     const INPUT_KEY_PAGE_CACHE_ID_PREFIX = 'page-cache-id-prefix';
 
     const CONFIG_PATH_PAGE_CACHE_BACKEND = 'cache/frontend/page_cache/backend';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER = 'cache/frontend/page_cache/backend_options/server';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE = 'cache/frontend/page_cache/backend_options/database';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_PORT = 'cache/frontend/page_cache/backend_options/port';
-    const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/page_cache/backend_options/compress_data';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD = 'cache/frontend/page_cache/backend_options/password';
+    const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/page_cache/backend_options/compress_data';
+    const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIBRARY = 'cache/frontend/page_cache/backend_options/compression_library';
     const CONFIG_PATH_PAGE_CACHE_ID_PREFIX = 'cache/frontend/page_cache/id_prefix';
 
     /**
@@ -45,8 +47,9 @@ class PageCache implements ConfigOptionsListInterface
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER => '127.0.0.1',
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE => '1',
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => '6379',
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => '',
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => '0',
-        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => ''
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY => '',
     ];
 
     /**
@@ -63,8 +66,9 @@ class PageCache implements ConfigOptionsListInterface
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_SERVER => self::CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE => self::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT,
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA,
-        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIBRARY,
     ];
 
     /**
@@ -113,6 +117,12 @@ public function getOptions()
                 self::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT,
                 'Redis server listen port'
             ),
+            new TextConfigOption(
+                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
+                'Redis server password'
+            ),
             new TextConfigOption(
                 self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
@@ -120,17 +130,17 @@ public function getOptions()
                 'Set to 1 to compress the full page cache (use 0 to disable)'
             ),
             new TextConfigOption(
-                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD,
+                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
-                self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
-                'Redis server password'
+                self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIBRARY,
+                'Compression library to use [snappy,lzf,l4z,zstd,gzip] (leave blank to determine automatically)'
             ),
             new TextConfigOption(
                 self::INPUT_KEY_PAGE_CACHE_ID_PREFIX,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX,
                 'ID prefix for cache keys'
-            )
+            ),
         ];
     }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
index 9c123fcb330dd..f4d8136e85270 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
@@ -68,8 +68,17 @@ public function testGetOptions()
         $this->assertEquals('cache-backend-redis-password', $options[4]->getName());
 
         $this->assertArrayHasKey(5, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[6]);
+        $this->assertEquals('cache-backend-redis-compress-data', $options[6]->getName());
+
+        $this->assertArrayHasKey(6, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[7]);
+        $this->assertEquals('cache-backend-redis-compression-library', $options[7]->getName());
+
+        $this->assertArrayHasKey(7, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[5]);
         $this->assertEquals('cache-id-prefix', $options[5]->getName());
+
     }
 
     /**
@@ -88,7 +97,9 @@ public function testCreateConfigCacheRedis()
                             'server' => '',
                             'port' => '',
                             'database' => '',
-                            'password' => ''
+                            'password' => '',
+                            'compress_data' => '0',
+                            'compression_library' => '',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
@@ -115,18 +126,23 @@ public function testCreateConfigWithRedisConfig()
                             'server' => 'localhost',
                             'port' => '1234',
                             'database' => '5',
-                            'password' => ''
+                            'password' => '',
+                            'compress_data' => '1',
+                            'compression_library' => 'gzip',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]
         ];
+
         $options = [
             'cache-backend' => 'redis',
             'cache-backend-redis-server' => 'localhost',
             'cache-backend-redis-port' => '1234',
-            'cache-backend-redis-db' => '5'
+            'cache-backend-redis-db' => '5',
+            'cache-backend-redis-compress-data' => '1',
+            'cache-backend-redis-compression-library' => 'gzip'
         ];
 
         $configData = $this->configOptionsList->createConfig($options, $this->deploymentConfigMock);
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
index 1cf3937f98684..f0a68d213d407 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
@@ -65,15 +65,20 @@ public function testGetOptions()
 
         $this->assertArrayHasKey(4, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[4]);
-        $this->assertEquals('page-cache-redis-compress-data', $options[4]->getName());
+        $this->assertEquals('page-cache-redis-password', $options[4]->getName());
 
         $this->assertArrayHasKey(5, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[5]);
-        $this->assertEquals('page-cache-redis-password', $options[5]->getName());
+        $this->assertEquals('page-cache-redis-compress-data', $options[5]->getName());
 
         $this->assertArrayHasKey(6, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[6]);
-        $this->assertEquals('page-cache-id-prefix', $options[6]->getName());
+        $this->assertEquals('page-cache-redis-compression-library', $options[6]->getName());
+
+        $this->assertArrayHasKey(7, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[7]);
+        $this->assertEquals('page-cache-id-prefix', $options[7]->getName());
+
     }
 
     /**
@@ -93,7 +98,8 @@ public function testCreateConfigWithRedis()
                             'port' => '',
                             'database' => '',
                             'compress_data' => '',
-                            'password' => ''
+                            'password' => '',
+                            'compression_library' => '',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
@@ -120,8 +126,9 @@ public function testCreateConfigWithRedisConfiguration()
                             'server' => 'foo.bar',
                             'port' => '9000',
                             'database' => '6',
+                            'password' => '',
                             'compress_data' => '1',
-                            'password' => ''
+                            'compression_library' => 'gzip',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
@@ -134,7 +141,8 @@ public function testCreateConfigWithRedisConfiguration()
             'page-cache-redis-server' => 'foo.bar',
             'page-cache-redis-port' => '9000',
             'page-cache-redis-db' => '6',
-            'page-cache-redis-compress-data' => '1'
+            'page-cache-redis-compress-data' => '1',
+            'page-cache-redis-compression-library' => 'gzip',
         ];
 
         $configData = $this->configList->createConfig($options, $this->deploymentConfigMock);

From dd913cf0aab0fe3edc4aa95722b2a1113b8b2470 Mon Sep 17 00:00:00 2001
From: "colin.macdonald" <colin.macdonald@au.harveynorman.com>
Date: Fri, 8 Feb 2019 14:46:13 +1100
Subject: [PATCH 0189/1055] Allowing compression by default (previous, standard
 behaviour). Cleaning up test count.

---
 setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php     | 4 ++--
 .../Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php     | 4 ++--
 .../Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
index eb1b30093a670..9f822d6dd5d37 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
@@ -48,7 +48,7 @@ class Cache implements ConfigOptionsListInterface
         self::INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE => '0',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => '6379',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => '',
-        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => '0',
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => '1',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY => '',
     ];
 
@@ -127,7 +127,7 @@ public function getOptions()
                 self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA,
-                'Set to 1 to compress the cache (use 0 to disable)'
+                'Set to 0 to disable compression (default is 1, enabled)'
             ),
             new TextConfigOption(
                 self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY,
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
index f4d8136e85270..e9a0cf27c0110 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
@@ -45,7 +45,7 @@ protected function setUp()
     public function testGetOptions()
     {
         $options = $this->configOptionsList->getOptions();
-        $this->assertCount(6, $options);
+        $this->assertCount(8, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -98,7 +98,7 @@ public function testCreateConfigCacheRedis()
                             'port' => '',
                             'database' => '',
                             'password' => '',
-                            'compress_data' => '0',
+                            'compress_data' => '1',
                             'compression_library' => '',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
index f0a68d213d407..8fc30ce5ea64b 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
@@ -45,7 +45,7 @@ protected function setUp()
     public function testGetOptions()
     {
         $options = $this->configList->getOptions();
-        $this->assertCount(7, $options);
+        $this->assertCount(8, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);

From 68623a9cf84169d7826d7ef6d4619a3826121086 Mon Sep 17 00:00:00 2001
From: "colin.macdonald" <colin.macdonald@au.harveynorman.com>
Date: Fri, 8 Feb 2019 14:51:01 +1100
Subject: [PATCH 0190/1055] cleaning expected blank config test struct

---
 .../Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
index e9a0cf27c0110..d3c3a10f6bd68 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
@@ -98,7 +98,7 @@ public function testCreateConfigCacheRedis()
                             'port' => '',
                             'database' => '',
                             'password' => '',
-                            'compress_data' => '1',
+                            'compress_data' => '',
                             'compression_library' => '',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),

From eb213d86ca8281d5ff6a8a526c936b514f379122 Mon Sep 17 00:00:00 2001
From: "colin.macdonald" <colin.macdonald@au.harveynorman.com>
Date: Fri, 8 Feb 2019 15:00:22 +1100
Subject: [PATCH 0191/1055] cm/redis listens for compression_lib - be
 consistent

---
 .../Setup/Model/ConfigOptionsList/Cache.php        | 14 +++++++-------
 .../Setup/Model/ConfigOptionsList/PageCache.php    | 12 ++++++------
 .../Unit/Model/ConfigOptionsList/CacheTest.php     |  8 ++++----
 .../Unit/Model/ConfigOptionsList/PageCacheTest.php |  8 ++++----
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
index 9f822d6dd5d37..89a37429c47c9 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
@@ -28,7 +28,7 @@ class Cache implements ConfigOptionsListInterface
     const INPUT_KEY_CACHE_BACKEND_REDIS_PORT = 'cache-backend-redis-port';
     const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
     const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'cache-backend-redis-compress-data';
-    const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY = 'cache-backend-redis-compression-library';
+    const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'cache-backend-redis-compression-lib';
     const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';
 
     const CONFIG_PATH_CACHE_BACKEND = 'cache/frontend/default/backend';
@@ -37,7 +37,7 @@ class Cache implements ConfigOptionsListInterface
     const CONFIG_PATH_CACHE_BACKEND_PORT = 'cache/frontend/default/backend_options/port';
     const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
     const CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/default/backend_options/compress_data';
-    const CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIBRARY = 'cache/frontend/default/backend_options/compression_library';
+    const CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB = 'cache/frontend/default/backend_options/compression_lib';
     const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';
 
     /**
@@ -49,7 +49,7 @@ class Cache implements ConfigOptionsListInterface
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => '6379',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => '',
         self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => '1',
-        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY => '',
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB => '',
     ];
 
     /**
@@ -68,7 +68,7 @@ class Cache implements ConfigOptionsListInterface
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_CACHE_BACKEND_PORT,
         self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
         self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA,
-        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY => self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIBRARY,
+        self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB => self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB,
     ];
 
     /**
@@ -130,10 +130,10 @@ public function getOptions()
                 'Set to 0 to disable compression (default is 1, enabled)'
             ),
             new TextConfigOption(
-                self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY,
+                self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
-                self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIBRARY,
-                'Compression library to use [snappy,lzf,l4z,zstd,gzip] (leave blank to determine automatically)'
+                self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB,
+                'Compression lib to use [snappy,lzf,l4z,zstd,gzip] (leave blank to determine automatically)'
             ),
             new TextConfigOption(
                 self::INPUT_KEY_CACHE_ID_PREFIX,
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
index 57912cb117c2a..01c8b5ff10e05 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
@@ -28,7 +28,7 @@ class PageCache implements ConfigOptionsListInterface
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT = 'page-cache-redis-port';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD = 'page-cache-redis-password';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
-    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY = 'page-cache-redis-compression-library';
+    const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'page-cache-redis-compression-lib';
     const INPUT_KEY_PAGE_CACHE_ID_PREFIX = 'page-cache-id-prefix';
 
     const CONFIG_PATH_PAGE_CACHE_BACKEND = 'cache/frontend/page_cache/backend';
@@ -37,7 +37,7 @@ class PageCache implements ConfigOptionsListInterface
     const CONFIG_PATH_PAGE_CACHE_BACKEND_PORT = 'cache/frontend/page_cache/backend_options/port';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD = 'cache/frontend/page_cache/backend_options/password';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/page_cache/backend_options/compress_data';
-    const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIBRARY = 'cache/frontend/page_cache/backend_options/compression_library';
+    const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB = 'cache/frontend/page_cache/backend_options/compression_lib';
     const CONFIG_PATH_PAGE_CACHE_ID_PREFIX = 'cache/frontend/page_cache/id_prefix';
 
     /**
@@ -49,7 +49,7 @@ class PageCache implements ConfigOptionsListInterface
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => '6379',
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => '',
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => '0',
-        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY => '',
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB => '',
     ];
 
     /**
@@ -68,7 +68,7 @@ class PageCache implements ConfigOptionsListInterface
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA,
-        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIBRARY,
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB,
     ];
 
     /**
@@ -130,9 +130,9 @@ public function getOptions()
                 'Set to 1 to compress the full page cache (use 0 to disable)'
             ),
             new TextConfigOption(
-                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIBRARY,
+                self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
-                self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIBRARY,
+                self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB,
                 'Compression library to use [snappy,lzf,l4z,zstd,gzip] (leave blank to determine automatically)'
             ),
             new TextConfigOption(
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
index d3c3a10f6bd68..e7d1099884d7d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
@@ -73,7 +73,7 @@ public function testGetOptions()
 
         $this->assertArrayHasKey(6, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[7]);
-        $this->assertEquals('cache-backend-redis-compression-library', $options[7]->getName());
+        $this->assertEquals('cache-backend-redis-compression-lib', $options[7]->getName());
 
         $this->assertArrayHasKey(7, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[5]);
@@ -99,7 +99,7 @@ public function testCreateConfigCacheRedis()
                             'database' => '',
                             'password' => '',
                             'compress_data' => '',
-                            'compression_library' => '',
+                            'compression_lib' => '',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
@@ -128,7 +128,7 @@ public function testCreateConfigWithRedisConfig()
                             'database' => '5',
                             'password' => '',
                             'compress_data' => '1',
-                            'compression_library' => 'gzip',
+                            'compression_lib' => 'gzip',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
@@ -142,7 +142,7 @@ public function testCreateConfigWithRedisConfig()
             'cache-backend-redis-port' => '1234',
             'cache-backend-redis-db' => '5',
             'cache-backend-redis-compress-data' => '1',
-            'cache-backend-redis-compression-library' => 'gzip'
+            'cache-backend-redis-compression-lib' => 'gzip'
         ];
 
         $configData = $this->configOptionsList->createConfig($options, $this->deploymentConfigMock);
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
index 8fc30ce5ea64b..2b96be2deee23 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
@@ -73,7 +73,7 @@ public function testGetOptions()
 
         $this->assertArrayHasKey(6, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[6]);
-        $this->assertEquals('page-cache-redis-compression-library', $options[6]->getName());
+        $this->assertEquals('page-cache-redis-compression-lib', $options[6]->getName());
 
         $this->assertArrayHasKey(7, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[7]);
@@ -99,7 +99,7 @@ public function testCreateConfigWithRedis()
                             'database' => '',
                             'compress_data' => '',
                             'password' => '',
-                            'compression_library' => '',
+                            'compression_lib' => '',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
@@ -128,7 +128,7 @@ public function testCreateConfigWithRedisConfiguration()
                             'database' => '6',
                             'password' => '',
                             'compress_data' => '1',
-                            'compression_library' => 'gzip',
+                            'compression_lib' => 'gzip',
                         ],
                         'id_prefix' => $this->expectedIdPrefix(),
                     ]
@@ -142,7 +142,7 @@ public function testCreateConfigWithRedisConfiguration()
             'page-cache-redis-port' => '9000',
             'page-cache-redis-db' => '6',
             'page-cache-redis-compress-data' => '1',
-            'page-cache-redis-compression-library' => 'gzip',
+            'page-cache-redis-compression-lib' => 'gzip',
         ];
 
         $configData = $this->configList->createConfig($options, $this->deploymentConfigMock);

From 589bcb2bb238e0a3a60350f0c069c2a57f290ff6 Mon Sep 17 00:00:00 2001
From: Simon Sprankel <sprankhub@users.noreply.github.com>
Date: Fri, 8 Feb 2019 11:45:11 +0100
Subject: [PATCH 0192/1055] refactored retrieval of entity ID

---
 app/code/Magento/Ui/Component/Form.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/Component/Form.php b/app/code/Magento/Ui/Component/Form.php
index 4033abba820e0..b560097e490e0 100644
--- a/app/code/Magento/Ui/Component/Form.php
+++ b/app/code/Magento/Ui/Component/Form.php
@@ -60,7 +60,8 @@ public function getDataSourceData()
         $dataSource = [];
 
         $id = $this->getContext()->getRequestParam($this->getContext()->getDataProvider()->getRequestFieldName(), null);
-        $filter = $this->filterBuilder->setField($this->getContext()->getDataProvider()->getPrimaryFieldName())
+        $idFieldName = $this->getContext()->getDataProvider()->getPrimaryFieldName();
+        $filter = $this->filterBuilder->setField($idFieldName)
             ->setValue($id)
             ->create();
         $this->getContext()->getDataProvider()
@@ -74,7 +75,7 @@ public function getDataSourceData()
             ];
         } elseif (isset($data['items'])) {
             foreach ($data['items'] as $item) {
-                if ($item[$item['id_field_name']] == $id) {
+                if ($item[$idFieldName] == $id) {
                     $dataSource = ['data' => ['general' => $item]];
                 }
             }

From 669980aab826a151ff3c100352294460d84c3df1 Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Fri, 8 Feb 2019 18:10:28 +0530
Subject: [PATCH 0193/1055] Added space above error message.

---
 .../Magento/luma/Magento_Catalog/web/css/source/_module.less    | 2 ++
 1 file changed, 2 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..ba30763110d67 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
@@ -391,6 +391,8 @@
 
     .box-tocart {
         &:extend(.abs-box-tocart all);
+        margin-top: @indent__s;
+        
         .field.qty {
         }
 

From b3b6c90480942d7b56a398e33d1ce0a357358997 Mon Sep 17 00:00:00 2001
From: Pedro Sousa <pedrosousa13@users.noreply.github.com>
Date: Fri, 8 Feb 2019 17:15:22 +0100
Subject: [PATCH 0194/1055] Turn on edit mode for product repository when
 adding children

This should fix the issue with the configurable products not having any options with Bulk and Async API.
Related issue: https://github.com/magento/magento2/issues/20366
---
 app/code/Magento/ConfigurableProduct/Model/LinkManagement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
index 79c2dd812acf1..06b49d356c5ee 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -111,7 +111,7 @@ public function getChildren($sku)
      */
     public function addChild($sku, $childSku)
     {
-        $product = $this->productRepository->get($sku);
+        $product = $this->productRepository->get($sku, true);
         $child = $this->productRepository->get($childSku);
 
         $childrenIds = array_values($this->configurableType->getChildrenIds($product->getId())[0]);

From 3f84d5fed87f4b02211d63d3a4700b1a368074eb Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 8 Feb 2019 12:17:30 -0600
Subject: [PATCH 0195/1055] MC-5784: Image fields using imageUploader
 UIComponent cannot use gallery image

- fix return type and mftf test
---
 .../Theme/Model/Design/Backend/File.php       |  2 +-
 ...signConfigMediaGalleryImageUploadTest.xml} | 26 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)
 rename app/code/Magento/Theme/Test/Mftf/Test/{AdminMediaGalleryImageUploadTest.xml => AdminDesignConfigMediaGalleryImageUploadTest.xml} (75%)

diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 74127484e23b4..81217430c083f 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -249,7 +249,7 @@ private function getMime()
      * @param string $path
      * @return string
      */
-    private function getRelativeMediaPath(string $path)
+    private function getRelativeMediaPath(string $path): string
     {
         return str_replace('/pub/media', '', $path);
     }
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
similarity index 75%
rename from app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml
rename to app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
index f9f6e6b37c5dd..40b80be48efd3 100644
--- a/app/code/Magento/Theme/Test/Mftf/Test/AdminMediaGalleryImageUploadTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.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="AdminMediaGalleryImageUploadTest">
+    <test name="AdminDesignConfigMediaGalleryImageUploadTest">
         <annotations>
             <features value="Content"/>
             <stories value="Content"/>
@@ -24,31 +24,35 @@
         <after>
             <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
         </after>
+        <!--Edit Store View-->
+        <comment userInput="Edit Store View" stepKey="editStoreViewComment"/>
         <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
         <waitForPageLoad stepKey="waitForPageload1"/>
         <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
         <waitForPageLoad stepKey="waitForPageload2"/>
         <scrollTo selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="scrollToHtmlHeadSection"/>
         <click selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="openHtmlHeadSection"/>
-
+        <!--Upload Image-->
+        <comment userInput="Upload Image" stepKey="uploadImageComment"/>
         <click selector="{{AdminDesignConfigSection.selectFromGalleryByFieldsetName('Head')}}" stepKey="openMediaGallery"/>
-        <wait time="3" stepKey="waitForAddingdSelectedImages"/>
-        <attachFile selector="{{AdminDesignConfigSection.imageUploadFromMediaGallery}}" userInput="adobe-base.jpg" stepKey="attachFile1"/>
-        <wait time="3" stepKey="waitForAddingSelectedImages"/>
-        <click selector="{{AdminDesignConfigSection.addSelectedFromMediaGallery}}" stepKey="addSelectedImages"/>
-        <waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Head')}}" stepKey="waitForPreviewImage"/>
-        <wait time="3" stepKey="waitForWrapperToClose"/>
+        <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="attachImage" stepKey="SelectImageFromMediaStorage">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="saveImage" stepKey="insertImage"/>
         <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration"/>
         <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification"/>
         <waitForPageLoad stepKey="waitForPageloadSuccess"/>
-
+        <!--Edit Store View-->
+        <comment userInput="Edit Store View" stepKey="editStoreViewComment2"/>
         <click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView2"/>
         <waitForPageLoad stepKey="waitForPageload3"/>
         <scrollTo selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="scrollToHtmlHeadSection2"/>
         <click selector="{{AdminDesignConfigSection.htmlHeaderSection}}" stepKey="openHtmlHeadSection2"/>
-
+        <!--Save Default Configuration-->
+        <comment userInput="Save Default Configuration" stepKey="saveDefaultConfigurationComment"/>
         <click selector="{{AdminDesignConfigSection.useDefaultByFieldsetName('Head')}}" stepKey="clickUseDefault"/>
-        <wait time="3" stepKey="waitForWrapperToClose2"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="waitForWrapperToClose2"/>
         <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration2"/>
         <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification2"/>
         <waitForPageLoad stepKey="waitForPageloadSuccess2"/>

From 422e459f6cd012bd381c029915c52dbdfe2d5815 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Fri, 8 Feb 2019 17:08:33 -0600
Subject: [PATCH 0196/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
index c5871ddc3a373..a3c9e7b39217d 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
@@ -9,7 +9,7 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="NewProductsListWidgetSimpleProductTest">
-        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
     </test>
     <test name="NewProductsListWidgetConfigurableProductTest">
         <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
@@ -18,7 +18,7 @@
         <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
     </test>
     <test name="NewProductsListWidgetVirtualProductTest">
-        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
     </test>
     <test name="NewProductsListWidgetBundleProductTest">
         <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>

From ce6dee1833114fa788f90bc260fcb6d426076714 Mon Sep 17 00:00:00 2001
From: "colin.macdonald" <colin.macdonald@au.harveynorman.com>
Date: Mon, 11 Feb 2019 10:56:17 +1100
Subject: [PATCH 0197/1055] Correct options ordering in assertions

---
 .../Test/Unit/Model/ConfigOptionsList/CacheTest.php  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
index e7d1099884d7d..b3c88930c948a 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
@@ -68,16 +68,16 @@ public function testGetOptions()
         $this->assertEquals('cache-backend-redis-password', $options[4]->getName());
 
         $this->assertArrayHasKey(5, $options);
-        $this->assertInstanceOf(TextConfigOption::class, $options[6]);
-        $this->assertEquals('cache-backend-redis-compress-data', $options[6]->getName());
+        $this->assertInstanceOf(TextConfigOption::class, $options[5]);
+        $this->assertEquals('cache-backend-redis-compress-data', $options[5]->getName());
 
         $this->assertArrayHasKey(6, $options);
-        $this->assertInstanceOf(TextConfigOption::class, $options[7]);
-        $this->assertEquals('cache-backend-redis-compression-lib', $options[7]->getName());
+        $this->assertInstanceOf(TextConfigOption::class, $options[6]);
+        $this->assertEquals('cache-backend-redis-compression-lib', $options[6]->getName());
 
         $this->assertArrayHasKey(7, $options);
-        $this->assertInstanceOf(TextConfigOption::class, $options[5]);
-        $this->assertEquals('cache-id-prefix', $options[5]->getName());
+        $this->assertInstanceOf(TextConfigOption::class, $options[7]);
+        $this->assertEquals('cache-id-prefix', $options[7]->getName());
 
     }
 

From 7d6cca6c944eb694d40ae169fe8443bbd75486c8 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Mon, 11 Feb 2019 07:52:36 +0200
Subject: [PATCH 0198/1055] magento:magento2 Missed form validation in Admin
 Order Address Edit route sales/order/address

---
 .../Customer/Test/Mftf/Data/AddressData.xml      | 16 ++++++++++++++++
 .../Magento/Customer/Test/Repository/Address.xml | 15 ---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index d090620145105..93556bc2bff2f 100755
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -49,6 +49,22 @@
         <data key="default_shipping">Yes</data>
         <requiredEntity type="region">RegionTX</requiredEntity>
     </entity>
+    <entity name="US_address_TX_Wrong_Validation" type="address">
+        <data key="firstname">LoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsum</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="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_NY" type="address">
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml
index c182f59c2474b..32f5d54340026 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.xml
@@ -118,21 +118,6 @@
             <field name="default_shipping" xsi:type="string">Yes</field>
         </dataset>
 
-        <dataset name="US_address_TX_Wrong_Validation">
-            <field name="firstname" xsi:type="string">LoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsum</field>
-            <field name="lastname" xsi:type="string">Doe</field>
-            <field name="email" xsi:type="string">John.Doe%isolation%@example.com</field>
-            <field name="company" xsi:type="string">Magento %isolation%</field>
-            <field name="street" xsi:type="string">7700 W. Parmer Lane Bldg. D</field>
-            <field name="city" xsi:type="string">Austin</field>
-            <field name="region_id" xsi:type="string">Texas</field>
-            <field name="postcode" xsi:type="string">78729</field>
-            <field name="country_id" xsi:type="string">United States</field>
-            <field name="telephone" xsi:type="string">512-691-4400</field>
-            <field name="default_billing" xsi:type="string">Yes</field>
-            <field name="default_shipping" xsi:type="string">Yes</field>
-        </dataset>
-
         <dataset name="US_address_NY">
             <field name="firstname" xsi:type="string">John</field>
             <field name="lastname" xsi:type="string">Doe</field>

From 405a7d490edb9681b0a263053b1ccdc69ec9cd76 Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Mon, 11 Feb 2019 12:02:31 +0200
Subject: [PATCH 0199/1055] MAGETWO-96757: Fixed incorrect displaying of the
 sales rule conditions

---
 .../System/Config/AdditionalCommentTest.php        |  9 +++++++++
 .../System/Config/CollectionTimeLabelTest.php      |  8 ++++++++
 .../System/Config/SubscriptionStatusLabelTest.php  |  8 ++++++++
 .../Block/Adminhtml/System/Config/VerticalTest.php |  8 ++++++++
 .../Block/System/Config/Form/Field/FileTest.php    |  6 +++++-
 .../Block/System/Config/Form/Field/ImageTest.php   |  1 +
 .../Config/Form/Field/Select/AllowspecificTest.php |  5 ++++-
 .../Test/Unit/Model/Renderer/RegionTest.php        | 10 ++++++++++
 .../Unit/Block/Adminhtml/Form/Field/ImportTest.php |  5 ++++-
 .../Config/Field/Enable/AbstractEnableTest.php     | 14 +++++++++++++-
 10 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
index 407e323aeaae6..9428f8954c60e 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
@@ -39,6 +39,15 @@ protected function setUp()
             ->setMethods(['getComment', 'getLabel'])
             ->disableOriginalConstructor()
             ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $reflection = new \ReflectionClass($this->abstractElementMock);
+        $reflection_property = $reflection->getProperty('_escaper');
+        $reflection_property->setAccessible(true);
+        $reflection_property->setValue($this->abstractElementMock, $escaper);
+
+        $this->abstractElementMock->setEscaper($escaper);
         $this->contextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
index d567d65882350..08ee3c356937a 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -46,6 +46,14 @@ protected function setUp()
             ->setMethods(['getComment'])
             ->disableOriginalConstructor()
             ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $reflection = new \ReflectionClass($this->abstractElementMock);
+        $reflection_property = $reflection->getProperty('_escaper');
+        $reflection_property->setAccessible(true);
+        $reflection_property->setValue($this->abstractElementMock, $escaper);
+
         $this->contextMock = $this->getMockBuilder(Context::class)
             ->setMethods(['getLocaleDate'])
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
index 78ff581f3de9d..b43225be9570d 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
@@ -51,6 +51,14 @@ protected function setUp()
             ->setMethods(['getComment'])
             ->disableOriginalConstructor()
             ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $reflection = new \ReflectionClass($this->abstractElementMock);
+        $reflection_property = $reflection->getProperty('_escaper');
+        $reflection_property->setAccessible(true);
+        $reflection_property->setValue($this->abstractElementMock, $escaper);
+
         $this->formMock = $this->getMockBuilder(Form::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
index 6a0cecc781062..0b5e86a523339 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
@@ -39,6 +39,14 @@ protected function setUp()
             ->setMethods(['getComment', 'getLabel', 'getHint'])
             ->disableOriginalConstructor()
             ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $reflection = new \ReflectionClass($this->abstractElementMock);
+        $reflection_property = $reflection->getProperty('_escaper');
+        $reflection_property->setAccessible(true);
+        $reflection_property->setValue($this->abstractElementMock, $escaper);
+
         $this->contextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
index de18d45d26864..31215f1bdee2b 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
@@ -40,7 +40,11 @@ protected function setUp()
 
         $this->file = $objectManager->getObject(
             \Magento\Config\Block\System\Config\Form\Field\File::class,
-            ['data' => $this->testData]
+            [
+                '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class),
+                'data' => $this->testData,
+
+            ]
         );
 
         $formMock = new \Magento\Framework\DataObject();
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
index 8a005a52ab614..b752f79f73446 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -34,6 +34,7 @@ protected function setUp()
             \Magento\Config\Block\System\Config\Form\Field\Image::class,
             [
                 'urlBuilder' => $this->urlBuilderMock,
+                '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class)
             ]
         );
 
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
index f5c65e848b3bf..e7ba2e8aaa2e7 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -21,7 +21,10 @@ protected function setUp()
     {
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_object = $testHelper->getObject(
-            \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class
+            \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class,
+            [
+                '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class)
+            ]
         );
         $this->_object->setData('html_id', 'spec_element');
         $this->_formMock = $this->createPartialMock(
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
index c655ff7056ed6..e67adc47b8884 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Customer\Test\Unit\Model\Renderer;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class RegionTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -58,6 +60,14 @@ public function testRender($regionCollection)
                 ]
             )
         );
+
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $reflection = new \ReflectionClass($elementMock);
+        $reflection_property = $reflection->getProperty('_escaper');
+        $reflection_property->setAccessible(true);
+        $reflection_property->setValue($elementMock, $escaper);
+
         $formMock->expects(
             $this->any()
         )->method(
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
index 8d75cc32914b4..a1fb2e449d7bf 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -33,7 +33,10 @@ protected function setUp()
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_object = $testHelper->getObject(
             \Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import::class,
-            ['data' => $testData]
+            [
+                'data' => $testData,
+                '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class)
+            ]
         );
         $this->_object->setForm($this->_formMock);
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
index b33d2f5723961..b9ea53c154014 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 /**
  * Class AbstractEnableTest
  *
@@ -43,8 +45,18 @@ protected function setUp()
             )->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $reflection = new \ReflectionClass($this->elementMock);
+        $reflection_property = $reflection->getProperty('_escaper');
+        $reflection_property->setAccessible(true);
+        $reflection_property->setValue($this->elementMock, $escaper);
+
         $this->abstractEnable = $objectManager->getObject(
-            \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class
+            \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class,
+            [
+                '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class)
+            ]
         );
     }
 

From 8c0dee36efc0d79e5f2d4c308c1708cf128f90ef Mon Sep 17 00:00:00 2001
From: roman <rleshchenko@magento.com>
Date: Mon, 11 Feb 2019 13:47:04 +0200
Subject: [PATCH 0200/1055] MAGETWO-96757: Fixed incorrect displaying of the
 sales rule conditions

---
 .../Test/Unit/Form/Element/AbstractElementTest.php     |  6 ++----
 .../Framework/Data/Test/Unit/Form/Element/LinkTest.php |  3 ++-
 .../Data/Test/Unit/Form/Element/MultiselectTest.php    | 10 +++++++++-
 .../Framework/Data/Test/Unit/Form/Element/NoteTest.php |  3 ++-
 4 files changed, 15 insertions(+), 7 deletions(-)

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 a85c1f4aa450c..d9dafddc571b8 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
@@ -33,11 +33,12 @@ class AbstractElementTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_factoryMock =
             $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $this->_collectionFactoryMock =
             $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
-        $this->_escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->_escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
 
         $this->_model = $this->getMockForAbstractClass(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
@@ -423,9 +424,6 @@ public function testGetHtmlContainerIdWithFieldContainerIdPrefix()
      */
     public function testAddElementValues(array $initialData, $expectedValue)
     {
-        $this->_escaperMock->expects($this->any())
-            ->method('escapeHtml')
-            ->will($this->returnArgument(0));
         $this->_model->setValues($initialData['initial_values']);
         $this->_model->addElementValues($initialData['add_values'], $initialData['overwrite']);
 
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
index a2a40ee03b044..cf3cd0345e174 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
@@ -23,9 +23,10 @@ class LinkTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
-        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
         $this->_link = new \Magento\Framework\Data\Form\Element\Link(
             $factoryMock,
             $collectionFactoryMock,
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
index 47eae73d8cd8c..c515e0aca01df 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+use Magento\Framework\Escaper;
+
 class MultiselectTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -15,7 +17,13 @@ class MultiselectTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_model = $testHelper->getObject(\Magento\Framework\Data\Form\Element\Editablemultiselect::class);
+        $escaper = new Escaper();
+        $this->_model = $testHelper->getObject(
+            \Magento\Framework\Data\Form\Element\Editablemultiselect::class,
+            [
+                '_escaper' => $escaper
+            ]
+        );
         $this->_model->setForm(new \Magento\Framework\DataObject());
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
index f77f4a816a1af..ad7d20fdc0acc 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
@@ -23,9 +23,10 @@ class NoteTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
-        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
         $this->_model = new \Magento\Framework\Data\Form\Element\Note(
             $factoryMock,
             $collectionFactoryMock,

From ac40d43e4a51ad235b4817d09f28cb50869c13a1 Mon Sep 17 00:00:00 2001
From: Wojtek Naruniec <wojtek@mediotype.com>
Date: Mon, 11 Feb 2019 13:45:13 +0100
Subject: [PATCH 0201/1055] Add missing attributes initialization to avoid
 throwing foreach error

---
 app/code/Magento/Eav/Model/Form.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index c8c50521f5509..1d867109aaf38 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -323,6 +323,8 @@ public function getAttributes()
         if ($this->_attributes === null) {
             $this->_attributes = [];
             $this->_userAttributes = [];
+            $this->_systemAttributes = [];
+            $this->_allowedAttributes = [];
             /** @var $attribute \Magento\Eav\Model\Attribute */
             foreach ($this->_getFilteredFormAttributeCollection() as $attribute) {
                 $this->_attributes[$attribute->getAttributeCode()] = $attribute;

From 2ce6383ada938d9cda47e12040e63a88b09de6de Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Mon, 11 Feb 2019 11:22:28 -0600
Subject: [PATCH 0202/1055] MAGETWO-91523: [2.3] Allowed countries restriction
 for a default website is applied to backend customer grid

---
 .../Customer/view/adminhtml/ui_component/customer_listing.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
index 6b479ad1cb290..f845d407d401a 100644
--- a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
@@ -174,6 +174,7 @@
         </column>
         <column name="billing_country_id" component="Magento_Ui/js/grid/columns/select" sortOrder="80">
             <settings>
+                <options class="Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites"/>
                 <filter>select</filter>
                 <dataType>select</dataType>
                 <label translate="true">Country</label>

From 0b4ac19d8f199533ff1859877f649d124bb6af82 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Mon, 11 Feb 2019 12:26:50 -0600
Subject: [PATCH 0203/1055] MC-5784: Image fields using imageUploader
 UIComponent cannot use gallery image

- save file to correct location
---
 .../Theme/Model/Design/Backend/File.php       | 55 +++++++++++++------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 81217430c083f..820144c7f1cb1 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -101,23 +101,7 @@ public function beforeSave()
             return $this;
         }
 
-        $filename = basename($file);
-        $relativeMediaUrl = $this->getRelativeMediaPath($value['url']);
-        $tmpMediaPath = $this->_mediaDirectory->isFile($relativeMediaUrl) ?
-            $relativeMediaUrl : $this->getTmpMediaPath($filename);
-        $result = $this->_mediaDirectory->copyFile(
-            $tmpMediaPath,
-            $this->_getUploadDir() . '/' . $filename
-        );
-        if ($result) {
-            $this->_mediaDirectory->delete($tmpMediaPath);
-            if ($this->_addWhetherScopeInfo()) {
-                $filename = $this->_prependScopeInfo($filename);
-            }
-            $this->setValue($filename);
-        } else {
-            $this->unsValue();
-        }
+        $this->saveFile($value, $file);
 
         return $this;
     }
@@ -251,6 +235,41 @@ private function getMime()
      */
     private function getRelativeMediaPath(string $path): string
     {
-        return str_replace('/pub/media', '', $path);
+        return str_replace('/pub/media/', '', $path);
+    }
+
+    /**
+     * Save file to the media directory in the correct location
+     *
+     * @param array $value
+     * @param string $file
+     * @throws LocalizedException
+     */
+    private function saveFile(array $value, string $file)
+    {
+        $filename = basename($file);
+        $relativeMediaPath = $this->getRelativeMediaPath($value['url']);
+        $tmpMediaPath = $this->getTmpMediaPath($filename);
+        $mediaPath = $this->_mediaDirectory->isFile($relativeMediaPath) ? $relativeMediaPath : $tmpMediaPath;
+        $destinationMediaPath = $this->_getUploadDir() . '/' . $filename;
+
+        $result = $mediaPath === $destinationMediaPath;
+        if (!$result) {
+            $result = $this->_mediaDirectory->copyFile(
+                $mediaPath,
+                $destinationMediaPath
+            );
+        }
+        if ($result) {
+            if ($mediaPath === $tmpMediaPath) {
+                $this->_mediaDirectory->delete($mediaPath);
+            }
+            if ($this->_addWhetherScopeInfo()) {
+                $filename = $this->_prependScopeInfo($filename);
+            }
+            $this->setValue($filename);
+        } else {
+            $this->unsValue();
+        }
     }
 }

From be55ef50a6fe13d984c83b76f01d73ac5c2cd3d7 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Mon, 11 Feb 2019 13:53:08 -0600
Subject: [PATCH 0204/1055] MC-13741: Fixed incorrect behavior of template
 variables

---
 .htaccess         | 7 +++++--
 .htaccess.sample  | 7 +++++--
 nginx.conf.sample | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.htaccess b/.htaccess
index 8634bc7339e44..71a5cf708dbc5 100644
--- a/.htaccess
+++ b/.htaccess
@@ -28,10 +28,13 @@
     #AddHandler x-mapp-php5 .php
 
 ############################################
-## default index file
-## Specifies option, to use methods arguments in backtrace or not
+## enable usage of methods arguments in backtrace
+
     SetEnv MAGE_DEBUG_SHOW_ARGS 1
 
+############################################
+## default index file
+
     DirectoryIndex index.php
 
 <IfModule mod_php5.c>
diff --git a/.htaccess.sample b/.htaccess.sample
index 66699ced2bd1b..c9e83a53cc8bd 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -28,10 +28,13 @@
     #AddHandler x-mapp-php5 .php
 
 ############################################
-## default index file
-## Specifies option, to use methods arguments in backtrace or not
+## enable usage of methods arguments in backtrace
+
     SetEnv MAGE_DEBUG_SHOW_ARGS 1
 
+############################################
+## default index file
+
     DirectoryIndex index.php
 
 ############################################
diff --git a/nginx.conf.sample b/nginx.conf.sample
index d47efa5c4b4b3..fc7c266a56360 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -9,7 +9,7 @@
 #    listen 80;
 #    server_name mage.dev;
 #    set $MAGE_ROOT /var/www/magento2;
-#    set $MAGE_DEBUG_SHOW_ARGS 1
+#    set $MAGE_DEBUG_SHOW_ARGS 1;
 #    include /vagrant/magento2/nginx.conf.sample;
 # }
 #

From c276064c31714bb21c494e5dc45e8ffe8217c333 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Tue, 12 Feb 2019 13:27:31 +0300
Subject: [PATCH 0205/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Fix product name with special characters in product grid
---
 .../Catalog/view/adminhtml/ui_component/product_listing.xml      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
index 65090fa3ac461..ad4a9d8103704 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -132,6 +132,7 @@
             <settings>
                 <addField>true</addField>
                 <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
                 <label translate="true">Name</label>
             </settings>
         </column>

From 9f021b0a79e19d05a3fbb22c4146064c3a6b0997 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 12 Feb 2019 09:01:19 -0600
Subject: [PATCH 0206/1055] MC-5784: Image fields using imageUploader
 UIComponent cannot use gallery image

- delete image in the MFTF test
---
 ...avigateToFaviconMediaFolderActionGroup.xml | 23 +++++++++++++++++++
 .../Mftf/Section/AdminDesignConfigSection.xml |  5 ++++
 ...esignConfigMediaGalleryImageUploadTest.xml | 12 ++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml

diff --git a/app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml b/app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml
new file mode 100644
index 0000000000000..6b98686574321
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/ActionGroup/NavigateToFaviconMediaFolderActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="NavigateToFaviconMediaFolderActionGroup">
+        <arguments>
+            <argument name="StoreFolder" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickArrowIfClosed" visible="true"/>
+        <waitForElement selector="{{AdminDesignConfigSection.faviconArrow}}" stepKey="waitForFaviconFolder"/>
+        <conditionalClick selector="{{AdminDesignConfigSection.faviconArrow}}" dependentSelector="{{AdminDesignConfigSection.checkIfFaviconArrowExpand}}" stepKey="clickFaviconArrowIfClosed" visible="true"/>
+        <waitForElement selector="{{AdminDesignConfigSection.storesArrow}}" stepKey="waitForStoresFolder"/>
+        <conditionalClick selector="{{AdminDesignConfigSection.storesArrow}}" dependentSelector="{{AdminDesignConfigSection.checkIfStoresArrowExpand}}" stepKey="clickStoresArrowIfClosed" visible="true"/>
+        <waitForElement selector="{{StoreFolder}}" stepKey="waitForStoreFolder"/>
+        <click selector="{{StoreFolder}}" stepKey="clickOnCreatedFolder"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
index ceb5556b2673d..c2652f33f7606 100644
--- a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
@@ -26,5 +26,10 @@
         <element name="logoUpload" type ="input" selector="[name='email_logo']" />
         <element name="logoWrapperOpen" type ="text" selector="[data-index='email'] [data-state-collapsible ='closed']"/>
         <element name="logoPreview" type ="text" selector="[alt ='magento-logo.png']"/>
+        <element name="faviconArrow" type="button" selector="#ZmF2aWNvbg-- > .jstree-icon" />
+        <element name="checkIfFaviconArrowExpand" type="button" selector="//li[@id='ZmF2aWNvbg--' and contains(@class,'jstree-closed')]" />
+        <element name="storesArrow" type="button" selector="#ZmF2aWNvbi9zdG9yZXM- > .jstree-icon" />
+        <element name="checkIfStoresArrowExpand" type="button" selector="//li[@id='ZmF2aWNvbi9zdG9yZXM-' and contains(@class,'jstree-closed')]" />
+        <element name="storeLink" type="button" selector="#ZmF2aWNvbi9zdG9yZXMvMQ-- > a"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
index 40b80be48efd3..c896c29f42a30 100644
--- a/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
@@ -36,6 +36,9 @@
         <comment userInput="Upload Image" stepKey="uploadImageComment"/>
         <click selector="{{AdminDesignConfigSection.selectFromGalleryByFieldsetName('Head')}}" stepKey="openMediaGallery"/>
         <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="NavigateToFaviconMediaFolderActionGroup" stepKey="NavigateToFolder">
+            <argument name="StoreFolder" value="{{AdminDesignConfigSection.storeLink}}"/>
+        </actionGroup>
         <actionGroup ref="attachImage" stepKey="SelectImageFromMediaStorage">
             <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
@@ -56,5 +59,14 @@
         <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration2"/>
         <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification2"/>
         <waitForPageLoad stepKey="waitForPageloadSuccess2"/>
+        <!--Delete Image-->
+        <comment userInput="Delete Image" stepKey="deleteImageComment"/>
+        <actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
+        <actionGroup ref="NavigateToFaviconMediaFolderActionGroup" stepKey="NavigateToFolder2">
+            <argument name="StoreFolder" value="{{AdminDesignConfigSection.storeLink}}"/>
+        </actionGroup>
+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
     </test>
 </tests>

From 04acd7b84086c6d423b394c44472645400e20b8e Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 12 Feb 2019 12:00:16 -0600
Subject: [PATCH 0207/1055] MC-5784: Image fields using imageUploader
 UIComponent cannot use gallery image

---
 .../Theme/Model/Design/Backend/File.php       | 15 +++++++-------
 ...esignConfigMediaGalleryImageUploadTest.xml | 20 ++++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 820144c7f1cb1..511fe30f79dcd 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -90,6 +90,8 @@ public function beforeSave()
     {
         $values = $this->getValue();
         $value = reset($values) ?: [];
+
+        // Need to check name when it is uploaded in the media gallary
         $file = $value['file'] ?? $value['name'] ?? null;
         if (!isset($file)) {
             throw new LocalizedException(
@@ -101,7 +103,7 @@ public function beforeSave()
             return $this;
         }
 
-        $this->saveFile($value, $file);
+        $this->updateMediaDirectory(basename($file), $value['url']);
 
         return $this;
     }
@@ -239,16 +241,15 @@ private function getRelativeMediaPath(string $path): string
     }
 
     /**
-     * Save file to the media directory in the correct location
+     * Move file to the correct media directory
      *
-     * @param array $value
-     * @param string $file
+     * @param string $filename
+     * @param string $url
      * @throws LocalizedException
      */
-    private function saveFile(array $value, string $file)
+    private function updateMediaDirectory(string $filename, string $url)
     {
-        $filename = basename($file);
-        $relativeMediaPath = $this->getRelativeMediaPath($value['url']);
+        $relativeMediaPath = $this->getRelativeMediaPath($url);
         $tmpMediaPath = $this->getTmpMediaPath($filename);
         $mediaPath = $this->_mediaDirectory->isFile($relativeMediaPath) ? $relativeMediaPath : $tmpMediaPath;
         $destinationMediaPath = $this->_getUploadDir() . '/' . $filename;
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
index c896c29f42a30..f46328ac151b1 100644
--- a/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminDesignConfigMediaGalleryImageUploadTest.xml
@@ -35,11 +35,11 @@
         <!--Upload Image-->
         <comment userInput="Upload Image" stepKey="uploadImageComment"/>
         <click selector="{{AdminDesignConfigSection.selectFromGalleryByFieldsetName('Head')}}" stepKey="openMediaGallery"/>
-        <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="VerifyMediaGalleryStorageBtn"/>
-        <actionGroup ref="NavigateToFaviconMediaFolderActionGroup" stepKey="NavigateToFolder">
-            <argument name="StoreFolder" value="{{AdminDesignConfigSection.storeLink}}"/>
+        <actionGroup ref="VerifyMediaGalleryStorageActions" stepKey="verifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+            <argument name="FolderName" value="Storage Root"/>
         </actionGroup>
-        <actionGroup ref="attachImage" stepKey="SelectImageFromMediaStorage">
+        <actionGroup ref="attachImage" stepKey="selectImageFromMediaStorage">
             <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
         <actionGroup ref="saveImage" stepKey="insertImage"/>
@@ -59,13 +59,19 @@
         <click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration2"/>
         <waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification2"/>
         <waitForPageLoad stepKey="waitForPageloadSuccess2"/>
-        <!--Delete Image-->
+        <!--Delete Image: will be in both root and favicon-->
         <comment userInput="Delete Image" stepKey="deleteImageComment"/>
         <actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
-        <actionGroup ref="NavigateToFaviconMediaFolderActionGroup" stepKey="NavigateToFolder2">
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder2">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToFaviconMediaFolderActionGroup" stepKey="navigateToFolder3">
             <argument name="StoreFolder" value="{{AdminDesignConfigSection.storeLink}}"/>
         </actionGroup>
-        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage2">
             <argument name="Image" value="ImageUpload3"/>
         </actionGroup>
     </test>

From 7e87746f56a46c1be06111520030ca5b917bdec5 Mon Sep 17 00:00:00 2001
From: vprohorov <prohorov.vital@gmail.com>
Date: Tue, 12 Feb 2019 22:36:01 +0300
Subject: [PATCH 0208/1055] MAGETWO-62728: My Wishlist - quantity input box
 issue

- Adding min/max qty checks
- Adding js validation
---
 .../Wishlist/ViewModel/AllowedQuantity.php    | 80 +++++++++++++++++++
 .../frontend/layout/wishlist_index_index.xml  |  1 +
 .../frontend/templates/item/column/cart.phtml |  5 +-
 .../view/frontend/web/js/add-to-wishlist.js   | 57 ++++++-------
 4 files changed, 115 insertions(+), 28 deletions(-)
 create mode 100644 app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php

diff --git a/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php b/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php
new file mode 100644
index 0000000000000..5e4c6b39f3c36
--- /dev/null
+++ b/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\ViewModel;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\CatalogInventory\Model\StockRegistry;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * ViewModel for Wishlist Cart Block
+ */
+class AllowedQuantity implements ArgumentInterface
+{
+    /**
+     * @var StockRegistry
+     */
+    private $stockRegistry;
+
+    /**
+     * @var ItemInterface
+     */
+    private $item;
+
+    /**
+     * @param StockRegistry $stockRegistry
+     */
+    public function __construct(StockRegistry $stockRegistry)
+    {
+        $this->stockRegistry = $stockRegistry;
+    }
+
+    /**
+     * Set product configuration item
+     *
+     * @param ItemInterface $item
+     * @return self
+     */
+    public function setItem(ItemInterface $item): self
+    {
+        $this->item = $item;
+        return $this;
+    }
+
+    /**
+     * Get product configuration item
+     *
+     * @return ItemInterface
+     */
+    public function getItem(): ItemInterface
+    {
+        return $this->item;
+    }
+
+    /**
+     * Get min and max qty for wishlist form.
+     *
+     * @return array
+     */
+    public function getMinMaxQty(): array
+    {
+        $product = $this->getItem()->getProduct();
+        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
+        $params = [];
+
+        $params['minAllowed'] = (float)$stockItem->getMinSaleQty();
+        if ($stockItem->getMaxSaleQty()) {
+            $params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
+        } else {
+            $params['maxAllowed'] = (float)StockDataFilter::MAX_QTY_VALUE;
+        }
+
+        return $params;
+    }
+}
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..e9076021a5b73 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
@@ -40,6 +40,7 @@
                         </block>
                         <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.cart" template="Magento_Wishlist::item/column/cart.phtml" cacheable="false">
                             <arguments>
+                                <argument name="allowedQuantityViewModel" xsi:type="object">Magento\Wishlist\ViewModel\AllowedQuantity</argument>
                                 <argument name="title" translate="true" xsi:type="string">Add to Cart</argument>
                             </arguments>
                         </block>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
index 9ea0d1a823235..6cb32d70ee1d8 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
@@ -11,6 +11,9 @@
 /** @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
 $product = $item->getProduct();
+/** @var \Magento\Wishlist\ViewModel\AllowedQuantity $viewModel */
+$viewModel = $block->getData('allowedQuantityViewModel');
+$allowedQty = $viewModel->setItem($item)->getMinMaxQty();
 ?>
 <?php foreach ($block->getChildNames() as $childName): ?>
     <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
@@ -21,7 +24,7 @@ $product = $item->getProduct();
         <div class="field qty">
             <label class="label" for="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
             <div class="control">
-                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true}"
+                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true, 'validate-item-quantity':{'minAllowed':<?= /* @noEscape */ $allowedQty['minAllowed'] ?>,'maxAllowed':<?= /* @noEscape */ $allowedQty['maxAllowed'] ?>}}"
                name="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" value="<?= /* @noEscape */ (int)($block->getAddToCartQty($item) * 1) ?>">
             </div>
         </div>
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 b38c5c2cda3ad..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
@@ -63,12 +63,6 @@ define([
                 isFileUploaded = false,
                 self = this;
 
-            if (event.handleObj.selector == this.options.qtyInfo) { //eslint-disable-line eqeqeq
-                this._updateAddToWishlistButton({});
-                event.stopPropagation();
-
-                return;
-            }
             $(event.handleObj.selector).each(function (index, element) {
                 if ($(element).is('input[type=text]') ||
                     $(element).is('input[type=email]') ||
@@ -89,9 +83,7 @@ define([
                 }
             });
 
-            if (isFileUploaded) {
-                this.bindFormSubmit();
-            }
+            this.bindFormSubmit(isFileUploaded);
             this._updateAddToWishlistButton(dataToAdd);
             event.stopPropagation();
         },
@@ -189,34 +181,45 @@ define([
 
         /**
          * Bind form submit.
+         *
+         * @param {Boolean} isFileUploaded
          */
-        bindFormSubmit: function () {
+        bindFormSubmit: function (isFileUploaded) {
             var self = this;
 
             $('[data-action="add-to-wishlist"]').on('click', function (event) {
                 var element, params, form, action;
 
-                event.stopPropagation();
-                event.preventDefault();
+                if (!$($(self.options.qtyInfo).closest('form')).valid()) {
+                    event.stopPropagation();
+                    event.preventDefault();
 
-                element = $('input[type=file]' + self.options.customOptionsInfo);
-                params = $(event.currentTarget).data('post');
-                form = $(element).closest('form');
-                action = params.action;
-
-                if (params.data.id) {
-                    $('<input>', {
-                        type: 'hidden',
-                        name: 'id',
-                        value: params.data.id
-                    }).appendTo(form);
+                    return;
                 }
 
-                if (params.data.uenc) {
-                    action += 'uenc/' + params.data.uenc;
-                }
+                if (isFileUploaded) {
+
+                    element = $('input[type=file]' + self.options.customOptionsInfo);
+                    params = $(event.currentTarget).data('post');
+                    form = $(element).closest('form');
+                    action = params.action;
+
+                    if (params.data.id) {
+                        $('<input>', {
+                            type: 'hidden',
+                            name: 'id',
+                            value: params.data.id
+                        }).appendTo(form);
+                    }
 
-                $(form).attr('action', action).submit();
+                    if (params.data.uenc) {
+                        action += 'uenc/' + params.data.uenc;
+                    }
+
+                    $(form).attr('action', action).submit();
+                    event.stopPropagation();
+                    event.preventDefault();
+                }
             });
         }
     });

From fa49579fe1bf893349d78f5bc1c9661043784590 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 13 Feb 2019 08:00:06 +0200
Subject: [PATCH 0209/1055] Sorting by Websites not working in product grid in
 backoffice #20511

---
 .../Catalog/Ui/Component/Listing/Columns/Websites.php        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index f67585c6401f8..5dd1fc578d15f 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -50,13 +50,14 @@ public function __construct(
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
         StoreManagerInterface $storeManager,
-        Helper $resourceHelper,
+        Helper $resourceHelper = null,
         array $components = [],
         array $data = []
     ) {
         parent::__construct($context, $uiComponentFactory, $components, $data);
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $this->storeManager = $storeManager;
-        $this->_resourceHelper = $resourceHelper;
+        $this->_resourceHelper = $resourceHelper ?: $objectManager->get(Helper::class);
     }
 
     /**

From 8170bd78fc71757f78abb5a1a0bb06f8f9d9c621 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 13 Feb 2019 11:03:50 +0200
Subject: [PATCH 0210/1055] Sorting by Websites not working in product grid in
 backoffice #20511

---
 .../Catalog/Ui/Component/Listing/Columns/Websites.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index 5dd1fc578d15f..5571f6e70fa74 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -8,7 +8,7 @@
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use \Magento\Framework\DB\Helper;
+use Magento\Framework\DB\Helper;
 
 /**
  * @api
@@ -42,17 +42,17 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param StoreManagerInterface $storeManager
-     * @param Helper $resourceHelper
      * @param array $components
      * @param array $data
+     * @param Helper $resourceHelper
      */
     public function __construct(
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
         StoreManagerInterface $storeManager,
-        Helper $resourceHelper = null,
         array $components = [],
-        array $data = []
+        array $data = [],
+        Helper $resourceHelper = null
     ) {
         parent::__construct($context, $uiComponentFactory, $components, $data);
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();

From d09b512a284ea8c52cc2dcec8ca8350869a997e9 Mon Sep 17 00:00:00 2001
From: Oscar Recio <osrecio@gmail.com>
Date: Wed, 13 Feb 2019 10:22:14 +0100
Subject: [PATCH 0211/1055] Add Mexico Regions

---
 .../Setup/Patch/Data/AddDataForIndia.php      |   2 +-
 .../Setup/Patch/Data/AddDataForMexico.php     | 127 ++++++++++++++++++
 2 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php

diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
index 69d500960d3f0..8337d17051efa 100644
--- a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
@@ -29,7 +29,7 @@ class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
     private $dataInstallerFactory;
 
     /**
-     * AddDataForCroatia constructor.
+     * AddDataForIndia constructor.
      *
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php
new file mode 100644
index 0000000000000..32bdf90800d6b
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForMexico.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Directory\Setup\Patch\Data;
+
+use Magento\Directory\Setup\DataInstaller;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Adds Mexican States
+ */
+class AddDataForMexico implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var \Magento\Directory\Setup\DataInstallerFactory
+     */
+    private $dataInstallerFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        \Magento\Directory\Setup\DataInstallerFactory $dataInstallerFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->dataInstallerFactory = $dataInstallerFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        /** @var DataInstaller $dataInstaller */
+        $dataInstaller = $this->dataInstallerFactory->create();
+        $dataInstaller->addCountryRegions(
+            $this->moduleDataSetup->getConnection(),
+            $this->getDataForMexico()
+        );
+    }
+
+    /**
+     * Mexican states data.
+     *
+     * @return array
+     */
+    private function getDataForMexico()
+    {
+        return [
+            ['MX', 'AGU', 'Aguascalientes'],
+            ['MX', 'BCN', 'Baja California'],
+            ['MX', 'BCS', 'Baja California Sur'],
+            ['MX', 'CAM', 'Campeche'],
+            ['MX', 'CHP', 'Chiapas'],
+            ['MX', 'CHH', 'Chihuahua'],
+            ['MX', 'CMX', 'Ciudad de México'],
+            ['MX', 'COA', 'Coahuila'],
+            ['MX', 'COL', 'Colima'],
+            ['MX', 'DUR', 'Durango'],
+            ['MX', 'MEX', 'Estado de México'],
+            ['MX', 'GUA', 'Guanajuato'],
+            ['MX', 'GRO', 'Guerrero'],
+            ['MX', 'HID', 'Hidalgo'],
+            ['MX', 'JAL', 'Jalisco'],
+            ['MX', 'MIC', 'Michoacán'],
+            ['MX', 'MOR', 'Morelos'],
+            ['MX', 'NAY', 'Nayarit'],
+            ['MX', 'NLE', 'Nuevo León'],
+            ['MX', 'OAX', 'Oaxaca'],
+            ['MX', 'PUE', 'Puebla'],
+            ['MX', 'QUE', 'Querétaro'],
+            ['MX', 'ROO', 'Quintana Roo'],
+            ['MX', 'SLP', 'San Luis Potosí'],
+            ['MX', 'SIN', 'Sinaloa'],
+            ['MX', 'SON', 'Sonora'],
+            ['MX', 'TAB', 'Tabasco'],
+            ['MX', 'TAM', 'Tamaulipas'],
+            ['MX', 'TLA', 'Tlaxcala'],
+            ['MX', 'VER', 'Veracruz'],
+            ['MX', 'YUC', 'Yucatán'],
+            ['MX', 'ZAC', 'Zacatecas']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+            AddDataForAustralia::class,
+            AddDataForCroatia::class,
+            AddDataForIndia::class,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.0.4';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}

From d9c962ffe0088fbad9b0464b014ccd95f53870d5 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 13 Feb 2019 14:35:46 +0200
Subject: [PATCH 0212/1055] ENGCOM-3963: Static test fix.

---
 .../Form/Modifier/ConfigurablePanel.php       | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
index 6f373871bdb76..e0cc83922e03e 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Framework\UrlInterface;
 use Magento\Ui\Component\Container;
-use Magento\Ui\Component\Form;
 use Magento\Ui\Component\DynamicRows;
+use Magento\Ui\Component\Form;
 use Magento\Ui\Component\Modal;
-use Magento\Framework\UrlInterface;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 
 /**
  * Data provider for Configurable panel
@@ -90,7 +90,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -98,7 +98,7 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
@@ -197,7 +197,7 @@ public function modifyMeta(array $meta)
                                         'autoRender' => false,
                                         'componentType' => 'insertListing',
                                         'component' => 'Magento_ConfigurableProduct/js'
-                                            .'/components/associated-product-insert-listing',
+                                            . '/components/associated-product-insert-listing',
                                         'dataScope' => $this->associatedListingPrefix
                                             . static::ASSOCIATED_PRODUCT_LISTING,
                                         'externalProvider' => $this->associatedListingPrefix
@@ -328,14 +328,12 @@ protected function getButtonSet()
                                 'component' => 'Magento_Ui/js/form/components/button',
                                 'actions' => [
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'trigger',
                                         'params' => ['active', true],
                                     ],
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'openModal',
                                     ],
                                 ],
@@ -471,8 +469,7 @@ protected function getRows()
                         'sku',
                         __('SKU'),
                         [
-                            'validation' =>
-                                [
+                            'validation' => [
                                     'required-entry' => true,
                                     'max_text_length' => Sku::SKU_MAX_LENGTH,
                                 ],

From a572ae2a1c5c86519ac3e0fd1eaf4d3157e80ef7 Mon Sep 17 00:00:00 2001
From: Denys Saltanahmedov <d.saltanakhmedov@atwix.com>
Date: Wed, 13 Feb 2019 14:53:09 +0200
Subject: [PATCH 0213/1055] Fixing a bug with replace method in Advanced Prices
 in CSV Import #18761

---
 .../Model/Import/AdvancedPricing.php          | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index 2e17e734b1e60..b29b8fdecf897 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -368,8 +368,8 @@ protected function saveAndReplaceAdvancedPrices()
             $this->_cachedSkuToDelete = null;
         }
         $listSku = [];
+        $tierPrices = [];
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
-            $tierPrices = [];
             foreach ($bunch as $rowNum => $rowData) {
                 if (!$this->validateRow($rowData, $rowNum)) {
                     $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, $rowNum);
@@ -397,15 +397,8 @@ protected function saveAndReplaceAdvancedPrices()
                     ];
                 }
             }
-            if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
-                if ($listSku) {
-                    $this->processCountNewPrices($tierPrices);
-                    if ($this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
-                        $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
-                        $this->setUpdatedAt($listSku);
-                    }
-                }
-            } elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
+
+            if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
                 $this->processCountExistingPrices($tierPrices, self::TABLE_TIER_PRICE)
                     ->processCountNewPrices($tierPrices);
                 $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
@@ -414,6 +407,17 @@ protected function saveAndReplaceAdvancedPrices()
                 }
             }
         }
+
+        if (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $behavior) {
+            if ($listSku) {
+                $this->processCountNewPrices($tierPrices);
+                if ($this->deleteProductTierPrices(array_unique($listSku), self::TABLE_TIER_PRICE)) {
+                    $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
+                    $this->setUpdatedAt($listSku);
+                }
+            }
+        }
+
         return $this;
     }
 

From 50b78da7822d922b5b39e3f76790e91cfb8c9e04 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 13 Feb 2019 15:01:11 +0200
Subject: [PATCH 0214/1055] Refactoring the validator usage. Updating the
 Unit/Integration tests. Covering the new validator class by Unit Test

---
 .../Adminhtml/Product/Attribute/Save.php      |  38 -------
 .../Adminhtml/Product/Attribute/Validate.php  |  18 ++-
 .../Adminhtml/Product/Attribute/SaveTest.php  |  14 +++
 .../Product/Attribute/ValidateTest.php        | 107 ++++++++++++++++++
 .../Magento/Eav/Model/Entity/Attribute.php    |   7 +-
 .../Eav/Model/Validator/Attribute/Code.php    |  30 +++--
 app/code/Magento/Eav/Setup/EavSetup.php       |  23 ++--
 .../Model/Validator/Attribute/CodeTest.php    |  67 +++++++++++
 app/code/Magento/Ui/i18n/en_US.csv            |   1 +
 .../Adminhtml/Product/AttributeTest.php       |   2 +-
 .../Magento/Eav/Setup/EavSetupTest.php        |   2 +-
 11 files changed, 238 insertions(+), 71 deletions(-)
 create mode 100644 app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 78a25567eb195..853cc65270306 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -195,44 +195,6 @@ public function execute()
                 ? $model->getAttributeCode()
                 : $this->getRequest()->getParam('attribute_code');
             $attributeCode = $attributeCode ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
-            if (strlen($attributeCode) > 0) {
-                $attributeCodeIsValid = true;
-                $minLength = \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MIN_LENGTH;
-                $maxLength = \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MAX_LENGTH;
-
-                if (strlen($attributeCode) < $minLength || strlen($attributeCode) > $maxLength) {
-                    $this->messageManager->addErrorMessage(
-                        __(
-                            'An attribute code must not be less than %1 and more than %2 characters.',
-                            $minLength,
-                            $maxLength
-                        )
-                    );
-                    $attributeCodeIsValid = false;
-                }
-
-                $validatorAttrCode = new \Zend_Validate_Regex(
-                    ['pattern' => '/^[a-zA-Z]+[a-zA-Z0-9_]*$/u']
-                );
-                if (!$validatorAttrCode->isValid($attributeCode)) {
-                    $this->messageManager->addErrorMessage(
-                        __(
-                            'Attribute code "%1" is invalid. Please use only letters (a-z or A-Z), ' .
-                            'numbers (0-9) or underscore(_) in this field, first character should be a letter.',
-                            $attributeCode
-                        )
-                    );
-                    $attributeCodeIsValid = false;
-                }
-
-                if (!$attributeCodeIsValid) {
-                    return $this->returnResult(
-                        'catalog/*/edit',
-                        ['attribute_id' => $attributeId, '_current' => true],
-                        ['error' => true]
-                    );
-                }
-            }
             $data['attribute_code'] = $attributeCode;
 
             //validate frontend_input
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 50f58efae7127..02c12ad185ee8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
 use Magento\Framework\Serialize\Serializer\FormData;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
@@ -43,6 +44,11 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
      */
     private $formDataSerializer;
 
+    /**
+     * @var AttributeCodeValidator
+     */
+    private $attributeCodeValidator;
+
     /**
      * Constructor
      *
@@ -54,6 +60,7 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param array $multipleAttributeList
      * @param FormData|null $formDataSerializer
+     * @param AttributeCodeValidator|null $attributeCodeValidator
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -63,7 +70,8 @@ public function __construct(
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         array $multipleAttributeList = [],
-        FormData $formDataSerializer = null
+        FormData $formDataSerializer = null,
+        AttributeCodeValidator $attributeCodeValidator = null
     ) {
         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
         $this->resultJsonFactory = $resultJsonFactory;
@@ -71,6 +79,8 @@ public function __construct(
         $this->multipleAttributeList = $multipleAttributeList;
         $this->formDataSerializer = $formDataSerializer ?: ObjectManager::getInstance()
             ->get(FormData::class);
+        $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
+            AttributeCodeValidator::class);
     }
 
     /**
@@ -115,6 +125,12 @@ public function execute()
             $response->setError(true);
             $response->setProductAttribute($attribute->toArray());
         }
+
+        if (!$this->attributeCodeValidator->isValid($attributeCode)) {
+            $this->setMessageToResponse($response, $this->attributeCodeValidator->getMessages());
+            $response->setError(true);
+        }
+
         if ($this->getRequest()->has('new_attribute_set_name')) {
             $setName = $this->getRequest()->getParam('new_attribute_set_name');
             /** @var $attributeSet \Magento\Eav\Model\Entity\Attribute\Set */
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
index ced65b2d2e15d..30d3503e4640e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save;
+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
 use Magento\Framework\Serialize\Serializer\FormData;
 use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
 use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
@@ -94,6 +95,11 @@ class SaveTest extends AttributeTest
      */
     private $productAttributeMock;
 
+    /**
+     * @var AttributeCodeValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeCodeValidatorMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -138,6 +144,9 @@ protected function setUp()
         $this->formDataSerializerMock = $this->getMockBuilder(FormData::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->attributeCodeValidatorMock = $this->getMockBuilder(AttributeCodeValidator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
             ->setMethods(['getId', 'get'])
             ->getMockForAbstractClass();
@@ -171,6 +180,7 @@ protected function getModel()
             'groupCollectionFactory' => $this->groupCollectionFactoryMock,
             'layoutFactory' => $this->layoutFactoryMock,
             'formDataSerializer' => $this->formDataSerializerMock,
+            'attributeCodeValidator' => $this->attributeCodeValidatorMock
         ]);
     }
 
@@ -224,6 +234,10 @@ public function testExecute()
         $this->productAttributeMock
             ->method('getAttributeCode')
             ->willReturn('test_code');
+        $this->attributeCodeValidatorMock
+            ->method('isValid')
+            ->with('test_code')
+            ->willReturn(true);
         $this->requestMock->expects($this->once())
             ->method('getPostValue')
             ->willReturn($data);
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
index c6210f93e1290..742148b1bf7f1 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Attribute;
 
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Validate;
+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
 use Magento\Framework\Serialize\Serializer\FormData;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
@@ -67,6 +68,11 @@ class ValidateTest extends AttributeTest
      */
     private $formDataSerializerMock;
 
+    /**
+     * @var AttributeCodeValidator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeCodeValidatorMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -95,6 +101,9 @@ protected function setUp()
         $this->formDataSerializerMock = $this->getMockBuilder(FormData::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->attributeCodeValidatorMock = $this->getMockBuilder(AttributeCodeValidator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->contextMock->expects($this->any())
             ->method('getObjectManager')
@@ -117,6 +126,7 @@ protected function getModel()
                 'layoutFactory' => $this->layoutFactoryMock,
                 'multipleAttributeList' => ['select' => 'option'],
                 'formDataSerializer' => $this->formDataSerializerMock,
+                'attributeCodeValidator' => $this->attributeCodeValidatorMock,
             ]
         );
     }
@@ -141,6 +151,12 @@ public function testExecute()
         $this->attributeMock->expects($this->once())
             ->method('loadByCode')
             ->willReturnSelf();
+
+        $this->attributeCodeValidatorMock->expects($this->once())
+            ->method('isValid')
+            ->with('test_attribute_code')
+            ->willReturn(true);
+
         $this->requestMock->expects($this->once())
             ->method('has')
             ->with('new_attribute_set_name')
@@ -190,6 +206,11 @@ public function testUniqueValidation(array $options, $isError)
             ->with($serializedOptions)
             ->willReturn($options);
 
+        $this->attributeCodeValidatorMock->expects($this->once())
+            ->method('isValid')
+            ->with('test_attribute_code')
+            ->willReturn(true);
+
         $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->willReturn($this->attributeMock);
@@ -333,6 +354,11 @@ public function testEmptyOption(array $options, $result)
             ->method('loadByCode')
             ->willReturnSelf();
 
+        $this->attributeCodeValidatorMock->expects($this->once())
+            ->method('isValid')
+            ->with('test_attribute_code')
+            ->willReturn(true);
+
         $this->resultJsonFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->resultJson);
@@ -444,6 +470,10 @@ public function testExecuteWithOptionsDataError()
                 [\Magento\Eav\Model\Entity\Attribute\Set::class, [], $this->attributeSetMock]
             ]);
 
+        $this->attributeCodeValidatorMock
+            ->method('isValid')
+            ->willReturn(true);
+
         $this->attributeMock
             ->method('loadByCode')
             ->willReturnSelf();
@@ -463,4 +493,81 @@ public function testExecuteWithOptionsDataError()
 
         $this->getModel()->execute();
     }
+
+    /**
+     * Test execute with an invalid attribute code
+     *
+     * @dataProvider provideInvalidAttributeCodes
+     * @param string $attributeCode
+     * @param $result
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
+    public function testExecuteWithInvalidAttributeCode($attributeCode, $result)
+    {
+        $serializedOptions = '{"key":"value"}';
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['frontend_label', null, null],
+                ['frontend_input', 'select', 'multipleselect'],
+                ['attribute_code', null, $attributeCode],
+                ['new_attribute_set_name', null, 'test_attribute_set_name'],
+                ['message_key', Validate::DEFAULT_MESSAGE_KEY, 'message'],
+                ['serialized_options', '[]', $serializedOptions],
+            ]);
+
+        $this->formDataSerializerMock
+            ->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedOptions)
+            ->willReturn(["key" => "value"]);
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->attributeMock);
+
+        $this->attributeMock->expects($this->once())
+            ->method('loadByCode')
+            ->willReturnSelf();
+
+        $this->attributeCodeValidatorMock->expects($this->once())
+            ->method('isValid')
+            ->with($attributeCode)
+            ->willReturn(false);
+
+        $this->attributeCodeValidatorMock->expects($this->once())
+            ->method('getMessages')
+            ->willReturn(['Invalid Attribute Code.']);
+
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultJson);
+
+        $this->resultJson->expects($this->once())
+            ->method('setJsonData')
+            ->willReturnArgument(0);
+
+        $response = $this->getModel()->execute();
+        $responseObject = json_decode($response);
+
+        $this->assertEquals($responseObject, $result);
+    }
+
+    /**
+     * Providing invalid attribute codes
+     *
+     * @return array
+     */
+    public function provideInvalidAttributeCodes()
+    {
+        return [
+            'invalid attribute code' => [
+                '.attribute_code',
+                (object) [
+                    'error' => true,
+                    'message' => 'Invalid Attribute Code.',
+                ]
+            ]
+        ];
+    }
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 38e47cc98a524..4924b65896421 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -242,8 +242,11 @@ public function loadEntityAttributeIdBySet()
      */
     public function beforeSave()
     {
-        if (isset($this->_data['attribute_code'])) {
-            $this->attributeCodeValidator->isValid($this->_data['attribute_code']);
+        if (isset($this->_data['attribute_code'])
+            && !$this->attributeCodeValidator->isValid($this->_data['attribute_code'])
+        ) {
+            $errorMessages = implode("\n", $this->attributeCodeValidator->getMessages());
+            throw new LocalizedException(__($errorMessages));
         }
 
         // prevent overriding product data
diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
index 578816bc99abd..f3ee37721b8ce 100644
--- a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
@@ -17,29 +17,33 @@
  *
  * Validation EAV attribute code
  */
-class Code  extends AbstractValidator
+class Code extends AbstractValidator
 {
+    /**
+     * Validation pattern for attribute code
+     */
+    const VALIDATION_RULE_PATTERN = '/^[a-zA-Z]+[a-zA-Z0-9_]*$/u';
+
     /**
      * Validates the correctness of the attribute code
      *
      * @param string $attributeCode
      * @return bool
-     * @throws LocalizedException
+     * @throws \Zend_Validate_Exception
      */
     public function isValid($attributeCode): bool
     {
+        $errorMessages = [];
         /**
          * Check attribute_code for allowed characters
          */
         if (trim($attributeCode)
-            && !preg_match('/^[a-zA-Z]+[a-zA-Z0-9_]*$/', trim($attributeCode))
+            && !preg_match(self::VALIDATION_RULE_PATTERN, trim($attributeCode))
         ) {
-            throw new LocalizedException(
-                __(
-                    'Attribute code "%1" is invalid. Please use only letters (a-z), ' .
-                    'numbers (0-9) or underscore(_) in this field, first character should be a letter.',
-                    $attributeCode
-                )
+            $errorMessages[] = __(
+                'Attribute code "%1" is invalid. Please use only letters (a-z or A-Z), ' .
+                'numbers (0-9) or underscore (_) in this field, and the first character should be a letter.',
+                $attributeCode
             );
         }
 
@@ -54,13 +58,15 @@ public function isValid($attributeCode): bool
             ['min' => $minLength, 'max' => $maxLength]
         );
         if (!$isAllowedLength) {
-            throw new LocalizedException(__(
+            $errorMessages[] = __(
                 'An attribute code must not be less than %1 and more than %2 characters.',
                 $minLength,
                 $maxLength
-            ));
+            );
         }
 
-        return true;
+        $this->_addMessages($errorMessages);
+
+        return !$this->hasMessages();
     }
 }
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 77fd0e95de364..221c1a9a7de77 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -785,21 +785,6 @@ private function _getValue($array, $key, $default = null)
         return isset($array[$key]) ? $array[$key] : $default;
     }
 
-    /**
-     * Validate attribute data before insert into table
-     *
-     * @param  array $data
-     * @return true
-     * @throws LocalizedException
-     */
-    private function _validateAttributeData($data)
-    {
-        $attributeCode = isset($data['attribute_code']) ? $data['attribute_code'] : '';
-        $this->attributeCodeValidator->isValid($attributeCode);
-
-        return true;
-    }
-
     /**
      * Add attribute to an entity type
      *
@@ -809,6 +794,7 @@ private function _validateAttributeData($data)
      * @param string $code
      * @param array $attr
      * @return $this
+     * @throws LocalizedException
      */
     public function addAttribute($entityTypeId, $code, array $attr)
     {
@@ -819,7 +805,12 @@ public function addAttribute($entityTypeId, $code, array $attr)
             $this->attributeMapper->map($attr, $entityTypeId)
         );
 
-        $this->_validateAttributeData($data);
+        $attributeCode = isset($data['attribute_code']) ? $data['attribute_code'] : '';
+        if (!$this->attributeCodeValidator->isValid($attributeCode)) {
+            $errorMessage = implode("\n", $this->attributeCodeValidator->getMessages());
+
+            throw new LocalizedException(__($errorMessage));
+        }
 
         $sortOrder = isset($attr['sort_order']) ? $attr['sort_order'] : null;
         $attributeId = $this->getAttribute($entityTypeId, $code, 'attribute_id');
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php
new file mode 100644
index 0000000000000..9db290bcba3e1
--- /dev/null
+++ b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/**
+ * Test for \Magento\Eav\Model\Validator\Attribute\Code
+ */
+namespace Magento\Eav\Test\Unit\Model\Validator\Attribute;
+
+use Magento\Eav\Model\Validator\Attribute\Code;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class CodeTest
+ */
+class CodeTest extends TestCase
+{
+    /**
+     * Testing \Magento\Eav\Model\Validator\Attribute\Code::isValid
+     *
+     * @dataProvider isValidDataProvider
+     * @param string $attributeCode
+     * @param bool $expected
+     * @throws \Zend_Validate_Exception
+     */
+    public function testIsValid(string $attributeCode, bool $expected): void
+    {
+        $validator = new Code();
+        $this->assertEquals($expected, $validator->isValid($attributeCode));
+    }
+
+    /**
+     * Data provider for testIsValid
+     *
+     * @return array
+     */
+    public function isValidDataProvider(): array
+    {
+        return [
+            [
+                'Attribute_code',
+                true
+            ], [
+                'attribute_1',
+                true
+            ],[
+                'Attribute_1',
+                true
+            ], [
+                '_attribute_code',
+                false
+            ], [
+                'attribute.code',
+                false
+            ], [
+                '1attribute_code',
+                false
+            ], [
+                'more_than_60_chars_more_than_60_chars_more_than_60_chars_more',
+                false
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv
index d51ff98108376..d8021c3aa8087 100644
--- a/app/code/Magento/Ui/i18n/en_US.csv
+++ b/app/code/Magento/Ui/i18n/en_US.csv
@@ -78,6 +78,7 @@ Keyword,Keyword
 "Empty Value.","Empty Value."
 "Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.","Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field."
 "Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.","Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter."
+"Attribute code ""%1"" is invalid. Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter."
 "Please use only letters (a-z or A-Z), numbers (0-9), spaces and ""#"" in this field.","Please use only letters (a-z or A-Z), numbers (0-9), spaces and ""#"" in this field."
 "Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890."
 "Please enter a valid fax number (Ex: 123-456-7890).","Please enter a valid fax number (Ex: 123-456-7890)."
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
index fe08ec01a9715..e1d3e960593a9 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
@@ -157,7 +157,7 @@ public function testWrongAttributeCode()
         $message = $messages->getItemsByType('error')[0];
         $this->assertEquals(
             'Attribute code "_()&&&?" is invalid. Please use only letters (a-z or A-Z),'
-            . ' numbers (0-9) or underscore(_) in this field, first character should be a letter.',
+            . ' numbers (0-9) or underscore (_) in this field, and the first character should be a letter.',
             $message->getText()
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php b/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php
index 3e8e146144c36..a5843f20ad98a 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php
@@ -97,7 +97,7 @@ public function addAttributeThrowExceptionDataProvider()
      *
      * @dataProvider addInvalidAttributeThrowExceptionDataProvider
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first char
+     * @expectedExceptionMessage Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field,
      */
     public function testAddInvalidAttributeThrowException($attributeCode)
     {

From 6692e087dd2d5f2dcc4d16f35407ae6630ea5b2b Mon Sep 17 00:00:00 2001
From: Denys Saltanahmedov <d.saltanakhmedov@atwix.com>
Date: Wed, 13 Feb 2019 16:53:35 +0200
Subject: [PATCH 0215/1055] fixing static tests

---
 .../Model/Import/AdvancedPricing.php                   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index b29b8fdecf897..88bb8d4e3608f 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -185,6 +185,7 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * @param AdvancedPricing\Validator\Website $websiteValidator
      * @param AdvancedPricing\Validator\TierPrice $tierPriceValidator
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws \Exception
      */
     public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
@@ -255,6 +256,7 @@ public function getEntityTypeCode()
      * @param array $rowData
      * @param int $rowNum
      * @return bool
+     * @throws \Zend_Validate_Exception
      */
     public function validateRow(array $rowData, $rowNum)
     {
@@ -308,6 +310,7 @@ protected function _importData()
      * Save advanced pricing
      *
      * @return $this
+     * @throws \Exception
      */
     public function saveAdvancedPricing()
     {
@@ -319,6 +322,7 @@ public function saveAdvancedPricing()
      * Deletes Advanced price data from raw data.
      *
      * @return $this
+     * @throws \Exception
      */
     public function deleteAdvancedPricing()
     {
@@ -347,6 +351,7 @@ public function deleteAdvancedPricing()
      * Replace advanced pricing
      *
      * @return $this
+     * @throws \Exception
      */
     public function replaceAdvancedPricing()
     {
@@ -360,6 +365,7 @@ public function replaceAdvancedPricing()
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Exception
      */
     protected function saveAndReplaceAdvancedPrices()
     {
@@ -427,6 +433,7 @@ protected function saveAndReplaceAdvancedPrices()
      * @param array $priceData
      * @param string $table
      * @return $this
+     * @throws \Exception
      */
     protected function saveProductPrices(array $priceData, $table)
     {
@@ -458,6 +465,7 @@ protected function saveProductPrices(array $priceData, $table)
      * @param array $listSku
      * @param string $table
      * @return boolean
+     * @throws \Exception
      */
     protected function deleteProductTierPrices(array $listSku, $table)
     {
@@ -535,6 +543,7 @@ protected function getCustomerGroupId($customerGroup)
      * Retrieve product skus
      *
      * @return array
+     * @throws \Exception
      */
     protected function retrieveOldSkus()
     {
@@ -555,6 +564,7 @@ protected function retrieveOldSkus()
      * @param array $prices
      * @param string $table
      * @return $this
+     * @throws \Exception
      */
     protected function processCountExistingPrices($prices, $table)
     {

From a03aa67e100535f74c1a7ec502a1499f67ea3632 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 13 Feb 2019 17:20:54 +0200
Subject: [PATCH 0216/1055] MC-13950: Fix MFTF test

---
 .../Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
index eed9f80c251c8..a116a23dc02cd 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
@@ -14,7 +14,6 @@
             <argument name="orderId" type="string"/>
         </arguments>
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
-        <waitForPageLoad stepKey="waitForOrderGridLoad"/>
         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
         <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
         <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
@@ -74,4 +73,9 @@
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
     </actionGroup>
+
+    <actionGroup name="OpenOrderById" extends="filterOrderGridById">
+        <click selector="{{AdminDataGridTableSection.firstRow}}" after="clickOrderApplyFilters" stepKey="openOrderViewPage"/>
+        <waitForPageLoad after="openOrderViewPage" stepKey="waitForOrderViewPageOpened"/>
+    </actionGroup>
 </actionGroups>

From 5951f685da0ada37e8aadbaa6de08d75a9099ec9 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Wed, 13 Feb 2019 21:04:01 +0300
Subject: [PATCH 0217/1055] MAGETWO-51459: [FT] CreateCategoryEntityTest fail
 when system message about indexers update is displayed

- Fixed MFT test;
---
 .../app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php  | 2 ++
 .../Catalog/Test/Block/Product/ProductList/TopToolbar.php       | 2 +-
 .../Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index 2035e7e83200f..30a323eebb736 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -187,6 +187,8 @@ public function assignCategory($parentCategoryName, $childCategoryName)
      */
     public function expandAllCategories()
     {
+        $this->getTemplateBlock()->waitLoader();
         $this->_rootElement->find($this->expandAll)->click();
+        $this->getTemplateBlock()->waitLoader();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
index 090042140a548..48769126d88ea 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
@@ -48,7 +48,7 @@ public function getSelectSortType()
     public function getSortType()
     {
         $content = $this->_rootElement->find($this->sorter)->getText();
-        return explode("\n", $content);
+        return array_values(array_filter(array_map('trim', explode("\n", $content))));
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
index c6a66beac7c79..ea6808ee2a7f5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
@@ -96,6 +96,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
         </variation>
         <variation name="CreateCategoryEntityTestVariation5_Anchor_MostOfFields">
+            <data name="tag" xsi:type="string">test_type:acceptance_test</data>
             <data name="description" xsi:type="string">Create anchor subcategory with all fields</data>
             <data name="addCategory" xsi:type="string">addSubcategory</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>

From f53d78df6dbcdc1233acd89991579d40d07fd045 Mon Sep 17 00:00:00 2001
From: alexander-aleman <35915533+alexander-aleman@users.noreply.github.com>
Date: Thu, 14 Feb 2019 08:21:17 +0100
Subject: [PATCH 0218/1055] Pass $websiteId as a parameter instead of $storeId

The method getProductPriceData expects $websiteId as a parameter, but $storeId was given. It should be $websiteId since prices are website specific. Also see \Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapper where a similar method exists and $websiteId is used.
---
 .../Model/Adapter/BatchDataMapper/PriceFieldsProvider.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php
index 875d384a20596..56c84593256be 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php
@@ -72,13 +72,15 @@ public function __construct(
      */
     public function getFields(array $productIds, $storeId)
     {
+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+        
         $priceData = $this->dataProvider->getSearchableAttribute('price')
             ? $this->resourceIndex->getPriceIndexData($productIds, $storeId)
             : [];
 
         $fields = [];
         foreach ($productIds as $productId) {
-            $fields[$productId] = $this->getProductPriceData($productId, $storeId, $priceData);
+            $fields[$productId] = $this->getProductPriceData($productId, $websiteId, $priceData);
         }
 
         return $fields;

From a34d4f5e62b4bb0a459179ccd209af952b41489f Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 14 Feb 2019 12:12:53 +0300
Subject: [PATCH 0219/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Fix product name with special characters in invoice ans shipment pdf
---
 .../Model/Order/Pdf/Items/Invoice/DefaultInvoice.php     | 9 +++++++--
 .../Model/Order/Pdf/Items/Shipment/DefaultShipment.php   | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

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..9c183ed44c72a 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
@@ -66,11 +66,16 @@ public function draw()
         $lines = [];
 
         // draw Product name
-        $lines[0] = [['text' => $this->string->split($item->getName(), 35, true, true), 'feed' => 35]];
+        $lines[0] = [
+            [
+                'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
+                'feed' => 35
+            ]
+        ];
 
         // draw SKU
         $lines[0][] = [
-            'text' => $this->string->split($this->getSku($item), 17),
+            'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
             'feed' => 290,
             'align' => 'right',
         ];
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
index 6007e1dcf2b47..c175b9866fb8e 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
@@ -65,14 +65,19 @@ public function draw()
         $lines = [];
 
         // draw Product name
-        $lines[0] = [['text' => $this->string->split($item->getName(), 60, true, true), 'feed' => 100]];
+        $lines[0] = [
+            [
+                'text' => $this->string->split(html_entity_decode($item->getName()), 60, true, true),
+                'feed' => 100
+            ]
+        ];
 
         // draw QTY
         $lines[0][] = ['text' => $item->getQty() * 1, 'feed' => 35];
 
         // draw SKU
         $lines[0][] = [
-            'text' => $this->string->split($this->getSku($item), 25),
+            'text' => $this->string->split(html_entity_decode($this->getSku($item)), 25),
             'feed' => 565,
             'align' => 'right',
         ];

From f0d1bf7a3ae6c259a5ddc6ac2949ad079f0ef50c Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Thu, 14 Feb 2019 17:08:38 +0530
Subject: [PATCH 0220/1055] Fixed for only group product.

---
 .../luma/Magento_Catalog/web/css/source/_module.less       | 7 ++++++-
 1 file changed, 6 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 ba30763110d67..48fa5ecde302b 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
@@ -293,6 +293,12 @@
         }
     }
 
+    .page-product-grouped {
+        .box-tocart {
+            margin-top: @indent__s;
+        }
+    }
+
     .product-options-wrapper {
         .fieldset-product-options-inner {
             .legend {
@@ -391,7 +397,6 @@
 
     .box-tocart {
         &:extend(.abs-box-tocart all);
-        margin-top: @indent__s;
         
         .field.qty {
         }

From 5bf736481300478ed6ce2dfd3c3ac5dd6f19a5a9 Mon Sep 17 00:00:00 2001
From: Dusan Lukic <ldusan84@gmail.com>
Date: Thu, 14 Feb 2019 21:31:49 +0100
Subject: [PATCH 0221/1055] Throw an exception where category doesn't exist

---
 .../CatalogGraphQl/Model/Resolver/CategoryTree.php   | 12 +++++++-----
 .../Magento/GraphQl/Catalog/CategoryTest.php         |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
index 7e7b0db8240af..1783a5cd9a7e5 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php
@@ -11,6 +11,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
 /**
@@ -72,11 +73,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $rootCategoryId = $this->getCategoryId($args);
         $categoriesTree = $this->categoryTree->getTree($info, $rootCategoryId);
-        if (!empty($categoriesTree) && ($categoriesTree->count() > 0)) {
-            $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
-            return current($result);
-        } else {
-            return null;
+
+        if (empty($categoriesTree) || ($categoriesTree->count() == 0)) {
+            throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
         }
+
+        $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
+        return current($result);
     }
 }
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 17a7bec180585..c586665a16d51 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -123,7 +123,7 @@ public function testNonExistentCategoryWithProductCount()
 QUERY;
 
         $response = $this->graphQlQuery($query);
-        $expectedResponse = ['category' => null];
+        $expectedResponse = ['errors' => ['message' => 'Category doesn\'t exist']];
         $this->assertEquals($expectedResponse, $response);
     }
 

From 8d828dafbc1206a71a4e28c6d61df9103c474edc Mon Sep 17 00:00:00 2001
From: Dusan Lukic <ldusan84@gmail.com>
Date: Thu, 14 Feb 2019 23:17:51 +0100
Subject: [PATCH 0222/1055] Fixed api-functional test

---
 .../testsuite/Magento/GraphQl/Catalog/CategoryTest.php    | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 c586665a16d51..187d3b80e4126 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -10,11 +10,13 @@
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Framework\DataObject;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\TestFramework\ObjectManager;
 
+
 class CategoryTest extends GraphQlAbstract
 {
     /**
@@ -122,9 +124,9 @@ public function testNonExistentCategoryWithProductCount()
 }
 QUERY;
 
-        $response = $this->graphQlQuery($query);
-        $expectedResponse = ['errors' => ['message' => 'Category doesn\'t exist']];
-        $this->assertEquals($expectedResponse, $response);
+        $this->expectException(GraphQlNoSuchEntityException::class);
+        $this->expectExceptionMessage('GraphQL response contains errors: Category doesn\'t exist');
+        $this->graphQlQuery($query);
     }
 
     /**

From ce9e3ee8eb971c2ffb13ee9f917179e933b87bfe Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Fri, 15 Feb 2019 10:54:15 +0530
Subject: [PATCH 0223/1055] correct spelling

---
 app/code/Magento/Catalog/Api/ProductRenderListInterface.php     | 2 +-
 .../Catalog/Block/Product/View/Options/AbstractOptions.php      | 2 +-
 app/code/Magento/Checkout/Block/Cart/Totals.php                 | 2 +-
 app/code/Magento/Customer/Model/Attribute/Data/Postcode.php     | 2 +-
 .../Tinymce3/view/base/web/tiny_mce/classes/Formatter.js        | 2 +-
 .../Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js      | 2 +-
 .../Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js   | 2 +-
 .../Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js     | 2 +-
 app/code/Magento/Wishlist/Block/AbstractBlock.php               | 2 +-
 .../Catalog/Model/Product/Type/PriceWithDimensionTest.php       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
index f79efa4c814d7..508bdcb290e63 100644
--- a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
@@ -15,7 +15,7 @@ interface ProductRenderListInterface
 {
     /**
      * Collect and retrieve the list of product render info
-     * This info contains raw prices and formated prices, product name, stock status, store_id, etc
+     * This info contains raw prices and formatted prices, product name, stock status, store_id, etc
      * @see \Magento\Catalog\Api\Data\ProductRenderInfoDtoInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 181211a0fc4a2..2a410cba01c0e 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -134,7 +134,7 @@ public function getFormatedPrice()
     }
 
     /**
-     * Return formated price
+     * Return formatted price
      *
      * @param array $value
      * @param bool $flag
diff --git a/app/code/Magento/Checkout/Block/Cart/Totals.php b/app/code/Magento/Checkout/Block/Cart/Totals.php
index 375c564f29059..52eb5fa0ad6c4 100644
--- a/app/code/Magento/Checkout/Block/Cart/Totals.php
+++ b/app/code/Magento/Checkout/Block/Cart/Totals.php
@@ -177,7 +177,7 @@ public function needDisplayBaseGrandtotal()
     }
 
     /**
-     * Get formated in base currency base grand total value
+     * Get formatted in base currency base grand total value
      *
      * @return string
      */
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
index 380b8a4d3446f..a46663d86a184 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
@@ -104,7 +104,7 @@ public function restoreValue($value)
     }
 
     /**
-     * Return formated attribute value from entity model
+     * Return formatted attribute value from entity model
      *
      * @param string $format
      * @return string|array
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
index f74282afd32a6..b7266779d3a35 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/Formatter.js
@@ -1970,7 +1970,7 @@
 					node.appendChild(dom.doc.createTextNode(invisibleChar));
 					node = node.firstChild;
 
-					// Insert caret container after the formated node
+					// Insert caret container after the formatted node
 					dom.insertAfter(caretContainer, formatNode);
 
 					// Move selection to text node
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
index 2d9d859caa6fa..60dd358414be1 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_jquery_src.js
@@ -15796,7 +15796,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					node.appendChild(dom.doc.createTextNode(invisibleChar));
 					node = node.firstChild;
 
-					// Insert caret container after the formated node
+					// Insert caret container after the formatted node
 					dom.insertAfter(caretContainer, formatNode);
 
 					// Move selection to text node
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
index aaa207da3e4a9..ed0b7cb0e50a2 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_prototype_src.js
@@ -16646,7 +16646,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					node.appendChild(dom.doc.createTextNode(invisibleChar));
 					node = node.firstChild;
 
-					// Insert caret container after the formated node
+					// Insert caret container after the formatted node
 					dom.insertAfter(caretContainer, formatNode);
 
 					// Move selection to text node
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
index 8448152ed5d2f..1c53062dd9690 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/tiny_mce_src.js
@@ -16620,7 +16620,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					node.appendChild(dom.doc.createTextNode(invisibleChar));
 					node = node.firstChild;
 
-					// Insert caret container after the formated node
+					// Insert caret container after the formatted node
 					dom.insertAfter(caretContainer, formatNode);
 
 					// Move selection to text node
diff --git a/app/code/Magento/Wishlist/Block/AbstractBlock.php b/app/code/Magento/Wishlist/Block/AbstractBlock.php
index bb8138fb87a3e..981a0da1d241f 100644
--- a/app/code/Magento/Wishlist/Block/AbstractBlock.php
+++ b/app/code/Magento/Wishlist/Block/AbstractBlock.php
@@ -228,7 +228,7 @@ public function hasDescription($item)
     }
 
     /**
-     * Retrieve formated Date
+     * Retrieve formatted Date
      *
      * @param string $date
      * @deprecated
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
index 280e83a863325..a2906993a7c53 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
@@ -108,7 +108,7 @@ public function testGetFinalPrice()
     }
 
     /**
-     * Get formated price
+     * Get formatted price
      */
     public function testGetFormatedPrice()
     {

From 62ee4c55d8d8b26e5a7f0aefffc659554d0a3086 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 15 Feb 2019 10:46:17 +0200
Subject: [PATCH 0224/1055] MC-14938: MFTF test fix

---
 .../Mftf/ActionGroup/LoginToStorefrontActionGroup.xml  | 10 ++++++----
 .../OpenEditCustomerFromAdminActionGroup.xml           |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
index 7be36ffbd9bc4..90544dc2673a3 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
@@ -11,9 +11,11 @@
         <arguments>
             <argument name="Customer"/>
         </arguments>
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <fillField  stepKey="fillEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <waitForPageLoad time="30" stepKey="waitPageFullyLoaded"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="waitFormAppears"/>
+        <fillField userInput="{{Customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField userInput="{{Customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
index af918e8208566..e4c7161784c9e 100755
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -12,7 +12,7 @@
             <argument name="customer"/>
         </arguments>
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
         <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
         <fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
         <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>

From 4a214364eb0b3fb06cc9acd92747c67505fdf539 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Fri, 15 Feb 2019 14:42:08 +0300
Subject: [PATCH 0225/1055] MAGETWO-58219: Product Attribute Option Values for
 storeview instead of admin on product creation

- Changed logic of displaying attribute option values in admin panel
---
 .../DataProvider/Product/Form/Modifier/Eav.php   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

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
old mode 100755
new mode 100644
index 99f7122efa0a8..c96fe54a87620
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -35,6 +35,7 @@
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\CompositeConfigProcessor;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory as AttributeCollectionFactory;
+use Magento\Framework\App\State;
 
 /**
  * Class Eav
@@ -213,6 +214,11 @@ class Eav extends AbstractModifier
      */
     private $scopeConfig;
 
+    /**
+     * @var State
+     */
+    private $state;
+
     /**
      * Eav constructor.
      * @param LocatorInterface $locator
@@ -237,6 +243,7 @@ class Eav extends AbstractModifier
      * @param CompositeConfigProcessor|null $wysiwygConfigProcessor
      * @param ScopeConfigInterface|null $scopeConfig
      * @param AttributeCollectionFactory $attributeCollectionFactory
+     * @param State $state
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -261,7 +268,8 @@ public function __construct(
         $attributesToEliminate = [],
         CompositeConfigProcessor $wysiwygConfigProcessor = null,
         ScopeConfigInterface $scopeConfig = null,
-        AttributeCollectionFactory $attributeCollectionFactory = null
+        AttributeCollectionFactory $attributeCollectionFactory = null,
+        State $state = null
     ) {
         $this->locator = $locator;
         $this->catalogEavValidationRules = $catalogEavValidationRules;
@@ -288,6 +296,8 @@ public function __construct(
         ->get(ScopeConfigInterface::class);
         $this->attributeCollectionFactory = $attributeCollectionFactory
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeCollectionFactory::class);
+        $this->state = $state ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(State::class);
     }
 
     /**
@@ -676,7 +686,9 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         // TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done
         $attributeModel = $this->getAttributeModel($attribute);
         if ($attributeModel->usesSource()) {
-            $options = $attributeModel->getSource()->getAllOptions();
+            $options = ($this->state->getAreaCode() == \Magento\Framework\App\Area::AREA_ADMINHTML)
+                ? $attributeModel->getSource()->getAllOptions(true, true)
+                : $attributeModel->getSource()->getAllOptions();
             $meta = $this->arrayManager->merge($configPath, $meta, [
                 'options' => $this->convertOptionsValueToString($options),
             ]);

From c0f2632115e7058c034b4585e9d3281b424ed936 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 15 Feb 2019 15:02:45 +0200
Subject: [PATCH 0226/1055] Fix stastic test.

---
 .../Directory/Setup/Patch/Data/AddDataForIndia.php    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
index 8337d17051efa..47f4fb0a6c7f3 100644
--- a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForIndia.php
@@ -13,8 +13,7 @@
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class AddDataForIndia
- * @package Magento\Directory\Setup\Patch\Data
+ * Add Regions for India.
  */
 class AddDataForIndia implements DataPatchInterface, PatchVersionInterface
 {
@@ -43,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -103,7 +102,7 @@ private function getDataForIndia()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -113,7 +112,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -121,7 +120,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

From 996ba90910de26c707a54f3fdd7b77b854f8c0e7 Mon Sep 17 00:00:00 2001
From: Dusan Lukic <ldusan84@gmail.com>
Date: Fri, 15 Feb 2019 14:53:58 +0100
Subject: [PATCH 0227/1055] Small api-functional test fix

---
 .../testsuite/Magento/GraphQl/Catalog/CategoryTest.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 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 187d3b80e4126..4808f5d9b5374 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -10,7 +10,7 @@
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Framework\DataObject;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -124,7 +124,7 @@ public function testNonExistentCategoryWithProductCount()
 }
 QUERY;
 
-        $this->expectException(GraphQlNoSuchEntityException::class);
+        $this->expectException(ResponseContainsErrorsException::class);
         $this->expectExceptionMessage('GraphQL response contains errors: Category doesn\'t exist');
         $this->graphQlQuery($query);
     }

From d79eb085cabfb16ed8f4432f5cd25b00cf3ba686 Mon Sep 17 00:00:00 2001
From: "Rav [RedChamps]" <getravindersingh@gmail.com>
Date: Sat, 16 Feb 2019 10:38:57 +0530
Subject: [PATCH 0228/1055] Added refunded discount amount to the total revenue
 calculation and fixed Negative order amount in dashboard when viewing
 particular store data

---
 .../Reports/Model/ResourceModel/Order/Collection.php   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index fd9adbe734101..5c92fc4c3cdb5 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -773,6 +773,7 @@ public function addRevenueToSelect($convertCurrency = false)
             !$convertCurrency,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
+            $this->getConnection()->getIfNullSql('main_table.base_discount_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
         );
         $this->getSelect()->columns(['revenue' => $expr]);
@@ -795,6 +796,7 @@ public function addSumAvgTotals($storeId = 0)
             $storeId,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
+            $this->getConnection()->getIfNullSql('main_table.base_discount_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
         );
 
@@ -813,6 +815,7 @@ public function addSumAvgTotals($storeId = 0)
      * @param int $storeId
      * @param string $baseSubtotalRefunded
      * @param string $baseSubtotalCanceled
+     * @param string $baseDiscountRefunded
      * @param string $baseDiscountCanceled
      * @return string
      */
@@ -820,13 +823,14 @@ protected function getTotalsExpression(
         $storeId,
         $baseSubtotalRefunded,
         $baseSubtotalCanceled,
+        $baseDiscountRefunded,
         $baseDiscountCanceled
     ) {
         $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 - %2$s - %1$s - ABS(main_table.base_discount_amount) + %3$s + %4$s)'
+            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s + %4$s) '
                 . ' * main_table.base_to_global_rate)';
-        return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
+        return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountRefunded, $baseDiscountCanceled);
     }
 
     /**

From d1e71b96056f2b83d182c92120008837cd665b9f Mon Sep 17 00:00:00 2001
From: "Rav [RedChamps]" <getravindersingh@gmail.com>
Date: Sat, 16 Feb 2019 19:55:46 +0530
Subject: [PATCH 0229/1055] Fixed bug that total amount is showing negative
 when order with discount is partially refunded

---
 .../Reports/Model/ResourceModel/Order/Collection.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 5c92fc4c3cdb5..19549f7181aa9 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -773,8 +773,8 @@ public function addRevenueToSelect($convertCurrency = false)
             !$convertCurrency,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
-            $this->getConnection()->getIfNullSql('main_table.base_discount_refunded', 0),
-            $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
         );
         $this->getSelect()->columns(['revenue' => $expr]);
 
@@ -796,8 +796,8 @@ public function addSumAvgTotals($storeId = 0)
             $storeId,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
-            $this->getConnection()->getIfNullSql('main_table.base_discount_refunded', 0),
-            $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
         );
 
         $this->getSelect()->columns(
@@ -827,8 +827,8 @@ protected function getTotalsExpression(
         $baseDiscountCanceled
     ) {
         $template = ($storeId != 0)
-            ? '(main_table.base_subtotal - %2$s - %1$s - ABS(main_table.base_discount_amount) + %3$s + %4$s)'
-            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s + %4$s) '
+            ? '(main_table.base_subtotal - %2$s - %1$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s))'
+            : '((main_table.base_subtotal - %1$s - %2$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s)) '
                 . ' * main_table.base_to_global_rate)';
         return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountRefunded, $baseDiscountCanceled);
     }

From 6ae859aaa233261b03a6bccf946dccdb369926b6 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Sun, 17 Feb 2019 19:32:44 +0100
Subject: [PATCH 0230/1055] magento/magento2#12396: Total Amount cart rule
 without tax  - Added new condition type to give user opportunity to choose
 the configuration.

---
 app/code/Magento/SalesRule/Model/Rule/Condition/Address.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
index 89ec2b84572fc..cf6301cb31a9c 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
@@ -61,6 +61,7 @@ public function __construct(
     public function loadAttributeOptions()
     {
         $attributes = [
+            'base_subtotal_with_discount' => __('Subtotal (Excl. Tax)'),
             'base_subtotal' => __('Subtotal'),
             'total_qty' => __('Total Items Quantity'),
             'weight' => __('Total Weight'),

From ea4a5ec6a150474d7731418c995ded75a55f1bea Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Mon, 18 Feb 2019 13:06:36 +0300
Subject: [PATCH 0231/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Fix product name with special characters
---
 .../view/adminhtml/ui_component/product_listing.xml      | 1 +
 .../Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php     | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
index ad4a9d8103704..d2d6f098125ce 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -155,6 +155,7 @@
         <column name="sku" sortOrder="60">
             <settings>
                 <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
                 <label translate="true">SKU</label>
             </settings>
         </column>
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
index 11908864236f6..882fec2ab7c46 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
@@ -66,11 +66,16 @@ public function draw()
         $lines = [];
 
         // draw Product name
-        $lines[0] = [['text' => $this->string->split($item->getName(), 35, true, true), 'feed' => 35]];
+        $lines[0] = [
+            [
+                'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
+                'feed' => 35
+            ]
+        ];
 
         // draw SKU
         $lines[0][] = [
-            'text' => $this->string->split($this->getSku($item), 17),
+            'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
             'feed' => 255,
             'align' => 'right',
         ];

From e619c008b66854be09b093a149bb4b35d027218b Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Mon, 18 Feb 2019 17:20:29 +0300
Subject: [PATCH 0232/1055] MAGETWO-70232: [GITHUB]  Import customizable
 options adds it to another product if same SKU is filled#9457

- Fixed an issue with incorrect saving of imported custom options when product sku was changed;
---
 app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index 0941aa2478935..43d496c37ca69 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -58,7 +58,11 @@ public function execute($entity, $arguments = [])
             }
         }
         if ($options) {
+            $hasChangedSku = $entity->dataHasChangedFor('sku');
             foreach ($options as $option) {
+                if ($hasChangedSku) {
+                    $option->setProductSku($entity->getSku());
+                }
                 $this->optionRepository->save($option);
             }
         }

From 05aa8c5c06fde2fc7b5b77c6487a0e107feadbdf Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Tue, 19 Feb 2019 10:11:39 -0600
Subject: [PATCH 0233/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 app/etc/di.xml                                |   2 +-
 .../Framework/Lock/Backend/Zookeeper.php      | 185 ++++++++++++++++++
 .../Magento/Framework/Lock/Factory.php        |  90 +++++++++
 lib/internal/Magento/Framework/Lock/Proxy.php |  80 ++++++++
 4 files changed, 356 insertions(+), 1 deletion(-)
 create mode 100644 lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
 create mode 100644 lib/internal/Magento/Framework/Lock/Factory.php
 create mode 100644 lib/internal/Magento/Framework/Lock/Proxy.php

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 19543375aad58..d74377b6194c3 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -38,7 +38,7 @@
     <preference for="Magento\Framework\Locale\ListsInterface" type="Magento\Framework\Locale\TranslatedLists" />
     <preference for="Magento\Framework\Locale\AvailableLocalesInterface" type="Magento\Framework\Locale\Deployed\Codes" />
     <preference for="Magento\Framework\Locale\OptionInterface" type="Magento\Framework\Locale\Deployed\Options" />
-    <preference for="Magento\Framework\Lock\LockManagerInterface" type="Magento\Framework\Lock\Backend\Database" />
+    <preference for="Magento\Framework\Lock\LockManagerInterface" type="Magento\Framework\Lock\Proxy" />
     <preference for="Magento\Framework\Api\AttributeTypeResolverInterface" type="Magento\Framework\Reflection\AttributeTypeResolver" />
     <preference for="Magento\Framework\Api\Search\SearchResultInterface" type="Magento\Framework\Api\Search\SearchResult" />
     <preference for="Magento\Framework\Api\Search\SearchCriteriaInterface" type="Magento\Framework\Api\Search\SearchCriteria"/>
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
new file mode 100644
index 0000000000000..20f4dd26b8a08
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Phrase;
+
+/**
+ * LockManager using the Zookeeper for locks
+ */
+class Zookeeper implements LockManagerInterface
+{
+    /**
+     * Zookeeper provider
+     *
+     * @var \Zookeeper
+     */
+    private $zookeeper;
+
+    /**
+     * The base path to locks in Zookeeper
+     *
+     * @var string
+     */
+    private $path;
+
+    /**
+     * The host to connect to Zookeeper
+     *
+     * @var string
+     */
+    private $host;
+
+    /**
+     * How many seconds to wait before timing out on connections
+     *
+     * @var int
+     */
+    private $connectionTimeout = 2;
+
+    /**
+     * How many microseconds to wait before recheck connections or nodes
+     *
+     * @var float
+     */
+    private $sleepCycle = 100000;
+
+    /**
+     * The default permissions for Zookeeper nodes
+     *
+     * @var array
+     */
+    private $acl = [['perms'=>\Zookeeper::PERM_ALL, 'scheme' => 'world', 'id' => 'anyone']];
+
+    /**
+     * @param string $host The host to connect to Zookeeper
+     * @param string $path The base path to locks in Zookeeper
+     * @throws RuntimeException
+     */
+    public function __construct(string $host, string $path = '/magento/locks')
+    {
+        if (empty($path)) {
+            throw new RuntimeException(
+                new Phrase('The path needs to be a non-empty string.')
+            );
+        }
+
+        $this->host = $host;
+        $this->path = preg_replace('#\/*$#', '', $path) ?: '/';
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws RuntimeException
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        $skipDeadline = $timeout < 0;
+        $lockPath = $this->getFullPathToLock($name);
+        $deadline = microtime(true) + $timeout;
+
+        while($this->getProvider()->exists($lockPath)) {
+            if (!$skipDeadline && $deadline <= microtime(true)) {
+                return false;
+            }
+
+            usleep($this->sleepCycle);
+        }
+
+        if (!$this->getProvider()->create($lockPath, '1', $this->acl, \Zookeeper::EPHEMERAL)) {
+            throw new RuntimeException(new Phrase('Failed creating lock %1', [$lockPath]));
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function unlock(string $name): bool
+    {
+        $lockPath = $this->getFullPathToLock($name);
+
+        if (!$this->getProvider()->exists($lockPath)) {
+            return true;
+        }
+
+        return $this->getProvider()->delete($lockPath);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isLocked(string $name): bool
+    {
+        return (bool) $this->getProvider()->exists($this->getFullPathToLock($name));
+    }
+
+    /**
+     * Gets full path to lock by its name
+     *
+     * @param string $name
+     * @return string
+     */
+    private function getFullPathToLock(string $name): string
+    {
+        return $this->path . '/' . $name;
+    }
+
+    /**
+     * Initiolizes and returns Zookeeper provider
+     *
+     * @return \Zookeeper
+     * @throws RuntimeException
+     */
+    private function getProvider(): \Zookeeper
+    {
+        if (!$this->zookeeper) {
+            $this->zookeeper = new \Zookeeper($this->host);
+
+            $deadline = microtime(true) + $this->connectionTimeout;
+            while($this->zookeeper->getState() != \Zookeeper::CONNECTED_STATE) {
+                if ($deadline <= microtime(true)) {
+                    throw new RuntimeException(new Phrase('Zookeeper connection timed out!'));
+                }
+                usleep($this->sleepCycle);
+            }
+
+            if (!$this->createBasePath($this->path)) {
+                throw new RuntimeException(new Phrase('Failed creating base path %1', [$this->path]));
+            }
+        }
+
+        return $this->zookeeper;
+    }
+
+    /**
+     * Checks and creates base path recursively
+     *
+     * @param $path
+     * @return bool
+     */
+    private function createBasePath($path)
+    {
+        if ($this->zookeeper->exists($path)) {
+            return true;
+        }
+
+        if (!$this->createBasePath(dirname($path))) {
+            return false;
+        }
+
+        if ($this->zookeeper->create($path, '1', $this->acl)) {
+            return true;
+        }
+
+        return $this->zookeeper->exists($path);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Factory.php b/lib/internal/Magento/Framework/Lock/Factory.php
new file mode 100644
index 0000000000000..1414358ae42e9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Factory.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock;
+
+use Magento\Framework\Phrase;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Lock\Backend\Database as DatabaseLock;
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+
+/**
+ * The factory to create object that implements LockManagerInterface
+ */
+class Factory
+{
+    /**
+     * The Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * The Application deployment configuration
+     *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * DB lock provider name
+     *
+     * @const string
+     */
+    const LOCK_DB = 'db';
+
+    /**
+     * Zookeeper lock provider name
+     *
+     * @const string
+     */
+    const LOCK_ZOOKEEPER = 'zookeeper';
+
+    /**
+     * The list of lock providers with mapping on classes
+     *
+     * @var array
+     */
+    private $lockers = [
+        self::LOCK_DB => DatabaseLock::class,
+        self::LOCK_ZOOKEEPER => ZookeeperLock::class
+    ];
+
+
+    /**
+     * @param ObjectManagerInterface $objectManager The Object Manager instance
+     * @param DeploymentConfig $deploymentConfig The Application deployment configuration
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        DeploymentConfig $deploymentConfig
+    ) {
+        $this->objectManager = $objectManager;
+        $this->deploymentConfig = $deploymentConfig;
+    }
+
+    /**
+     * Creates an instance of LockManagerInterface using information from deployment config
+     *
+     * @return LockManagerInterface
+     * @throws RuntimeException
+     */
+    public function create(): LockManagerInterface
+    {
+        $provider = $this->deploymentConfig->get('locks/provider', self::LOCK_DB);
+        $config = $this->deploymentConfig->get('locks/config', []);
+
+        if (!isset($this->lockers[$provider])) {
+            throw new RuntimeException(new Phrase('Unknown locks provider.'));
+        }
+
+        return $this->objectManager->create($this->lockers[$provider], $config);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Proxy.php b/lib/internal/Magento/Framework/Lock/Proxy.php
new file mode 100644
index 0000000000000..e140078d05ab8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Proxy.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock;
+
+use Magento\Framework\Exception\RuntimeException;
+
+/**
+ * Proxy for LockManagers
+ */
+class Proxy implements LockManagerInterface
+{
+    /**
+     * The factory to create LockManagerInterface implementation
+     *
+     * @var Factory
+     */
+    private $factory;
+
+    /**
+     * A LockManagerInterface implementation
+     *
+     * @var LockManagerInterface
+     */
+    private $locker;
+
+    /**
+     * @param Factory $factory The factory to create LockManagerInterface implementation
+     */
+    public function __construct(Factory $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws RuntimeException
+     */
+    public function isLocked(string $name): bool
+    {
+        return $this->getLocker()->isLocked($name);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws RuntimeException
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        return $this->getLocker()->lock($name, $timeout);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws RuntimeException
+     */
+    public function unlock(string $name): bool
+    {
+        return $this->getLocker()->unlock($name);
+    }
+
+    /**
+     * Gets LockManagerInterface implementation using Factory
+     *
+     * @return LockManagerInterface
+     * @throws RuntimeException
+     */
+    private function getLocker(): LockManagerInterface
+    {
+        if (!$this->locker) {
+            $this->locker = $this->factory->create();
+        }
+
+        return $this->locker;
+    }
+}

From 7b352ce6c6b2ac0f4e1edf5bdd0d58a346eba3e3 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Tue, 19 Feb 2019 14:48:17 -0600
Subject: [PATCH 0234/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 .../Framework/Lock/Backend/Zookeeper.php      | 133 ++++++++++++++----
 .../{Factory.php => LockBackendFactory.php}   |   2 +-
 lib/internal/Magento/Framework/Lock/Proxy.php |   6 +-
 .../Framework/Lock/Test/Unit/ProxyTest.php    | 106 ++++++++++++++
 4 files changed, 215 insertions(+), 32 deletions(-)
 rename lib/internal/Magento/Framework/Lock/{Factory.php => LockBackendFactory.php} (98%)
 create mode 100644 lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php

diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index 20f4dd26b8a08..d813f209ab96e 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -30,6 +30,11 @@ class Zookeeper implements LockManagerInterface
      */
     private $path;
 
+    /**
+     * @var string
+     */
+    private $lockName = 'lock-';
+
     /**
      * The host to connect to Zookeeper
      *
@@ -58,6 +63,13 @@ class Zookeeper implements LockManagerInterface
      */
     private $acl = [['perms'=>\Zookeeper::PERM_ALL, 'scheme' => 'world', 'id' => 'anyone']];
 
+    /**
+     * The mapping list of the lock name with the full lock path
+     *
+     * @var array
+     */
+    private $locks = [];
+
     /**
      * @param string $host The host to connect to Zookeeper
      * @param string $path The base path to locks in Zookeeper
@@ -77,6 +89,9 @@ public function __construct(string $host, string $path = '/magento/locks')
 
     /**
      * {@inheritdoc}
+     * You can see the lock algorithm by the link
+     * @link https://zookeeper.apache.org/doc/r3.1.2/recipes.html#sc_recipes_Locks
+     *
      * @throws RuntimeException
      */
     public function lock(string $name, int $timeout = -1): bool
@@ -85,19 +100,29 @@ public function lock(string $name, int $timeout = -1): bool
         $lockPath = $this->getFullPathToLock($name);
         $deadline = microtime(true) + $timeout;
 
-        while($this->getProvider()->exists($lockPath)) {
+        if (!$this->checkAndCreateParentNode($lockPath)) {
+            throw new RuntimeException(new Phrase('Failed creating the path %1', [$lockPath]));
+        }
+
+        $lockKey = $this->getProvider()
+            ->create($lockPath, '1', $this->acl, \Zookeeper::EPHEMERAL | \Zookeeper::SEQUENCE);
+
+        if (!$lockKey) {
+            throw new RuntimeException(new Phrase('Failed creating lock %1', [$lockPath]));
+        }
+
+        while($this->isAnyLock($lockKey, $this->getIndex($lockKey))) {
             if (!$skipDeadline && $deadline <= microtime(true)) {
+                $this->getProvider()->delete($lockKey);
                 return false;
             }
 
             usleep($this->sleepCycle);
         }
 
-        if (!$this->getProvider()->create($lockPath, '1', $this->acl, \Zookeeper::EPHEMERAL)) {
-            throw new RuntimeException(new Phrase('Failed creating lock %1', [$lockPath]));
-        } else {
-            return true;
-        }
+        $this->locks[$name] = $lockKey;
+
+        return true;
     }
 
     /**
@@ -105,13 +130,11 @@ public function lock(string $name, int $timeout = -1): bool
      */
     public function unlock(string $name): bool
     {
-        $lockPath = $this->getFullPathToLock($name);
-
-        if (!$this->getProvider()->exists($lockPath)) {
+        if (!isset($this->locks[$name])) {
             return true;
         }
 
-        return $this->getProvider()->delete($lockPath);
+        return $this->getProvider()->delete($this->locks[$name]);
     }
 
     /**
@@ -119,7 +142,7 @@ public function unlock(string $name): bool
      */
     public function isLocked(string $name): bool
     {
-        return (bool) $this->getProvider()->exists($this->getFullPathToLock($name));
+        return $this->isAnyLock($this->getFullPathToLock($name));
     }
 
     /**
@@ -130,7 +153,7 @@ public function isLocked(string $name): bool
      */
     private function getFullPathToLock(string $name): string
     {
-        return $this->path . '/' . $name;
+        return $this->path . '/' . $name . '/' . $this->lockName;
     }
 
     /**
@@ -143,18 +166,14 @@ private function getProvider(): \Zookeeper
     {
         if (!$this->zookeeper) {
             $this->zookeeper = new \Zookeeper($this->host);
+        }
 
-            $deadline = microtime(true) + $this->connectionTimeout;
-            while($this->zookeeper->getState() != \Zookeeper::CONNECTED_STATE) {
-                if ($deadline <= microtime(true)) {
-                    throw new RuntimeException(new Phrase('Zookeeper connection timed out!'));
-                }
-                usleep($this->sleepCycle);
-            }
-
-            if (!$this->createBasePath($this->path)) {
-                throw new RuntimeException(new Phrase('Failed creating base path %1', [$this->path]));
+        $deadline = microtime(true) + $this->connectionTimeout;
+        while($this->zookeeper->getState() != \Zookeeper::CONNECTED_STATE) {
+            if ($deadline <= microtime(true)) {
+                throw new RuntimeException(new Phrase('Zookeeper connection timed out!'));
             }
+            usleep($this->sleepCycle);
         }
 
         return $this->zookeeper;
@@ -163,23 +182,81 @@ private function getProvider(): \Zookeeper
     /**
      * Checks and creates base path recursively
      *
-     * @param $path
+     * @param string $path
      * @return bool
+     * @throws RuntimeException
      */
-    private function createBasePath($path)
+    private function checkAndCreateParentNode(string $path): bool
     {
-        if ($this->zookeeper->exists($path)) {
+        $path = dirname($path);
+        if ($this->getProvider()->exists($path)) {
             return true;
         }
 
-        if (!$this->createBasePath(dirname($path))) {
+        if (!$this->checkAndCreateParentNode($path)) {
             return false;
         }
 
-        if ($this->zookeeper->create($path, '1', $this->acl)) {
+        if ($this->getProvider()->create($path, '1', $this->acl)) {
             return true;
         }
 
-        return $this->zookeeper->exists($path);
+        return $this->getProvider()->exists($path);
+    }
+
+    /**
+     * Gets int increment of lock key
+     *
+     * @param string $key
+     * @return int|null
+     */
+    private function getIndex(string $key)
+    {
+        if (!preg_match("/[0-9]+$/", $key, $matches))
+            return null;
+
+        return intval($matches[0]);
+    }
+
+    /**
+     * Checks if there is any sequence node under parent of $fullKey.
+     * At first checks that the $fullKey node is present, if not - returns false.
+     *
+     * If $indexKey is non-null and there is a smaller index that $indexKey then returns true,
+     * if all the nodes are larger than $indexKey then returns false.
+     *
+     * @param string $fullKey The full path without any sequence info
+     * @param int|null $indexKey The index to compare
+     * @return bool
+     * @throws RuntimeException
+     */
+    private function isAnyLock(string $fullKey, int $indexKey = null): bool
+    {
+        $parent = dirname($fullKey);
+
+        if (!$this->getProvider()->exists($parent)) {
+            return false;
+        }
+
+        $children = $this->getProvider()->getChildren($parent);
+
+        foreach($children as $childKey) {
+
+            if (is_null($indexKey)) {
+                return true;
+            }
+
+            $childIndex = $this->getIndex($childKey);
+
+            if (is_null($childIndex)) {
+                continue;
+            }
+
+            if ($childIndex < $indexKey) {
+                return true;
+            }
+        }
+
+        return false;
     }
 }
diff --git a/lib/internal/Magento/Framework/Lock/Factory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
similarity index 98%
rename from lib/internal/Magento/Framework/Lock/Factory.php
rename to lib/internal/Magento/Framework/Lock/LockBackendFactory.php
index 1414358ae42e9..4c4896cb35623 100644
--- a/lib/internal/Magento/Framework/Lock/Factory.php
+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
@@ -17,7 +17,7 @@
 /**
  * The factory to create object that implements LockManagerInterface
  */
-class Factory
+class LockBackendFactory
 {
     /**
      * The Object Manager instance
diff --git a/lib/internal/Magento/Framework/Lock/Proxy.php b/lib/internal/Magento/Framework/Lock/Proxy.php
index e140078d05ab8..b5f8eee0f2c4f 100644
--- a/lib/internal/Magento/Framework/Lock/Proxy.php
+++ b/lib/internal/Magento/Framework/Lock/Proxy.php
@@ -17,7 +17,7 @@ class Proxy implements LockManagerInterface
     /**
      * The factory to create LockManagerInterface implementation
      *
-     * @var Factory
+     * @var LockBackendFactory
      */
     private $factory;
 
@@ -29,9 +29,9 @@ class Proxy implements LockManagerInterface
     private $locker;
 
     /**
-     * @param Factory $factory The factory to create LockManagerInterface implementation
+     * @param LockBackendFactory $factory The factory to create LockManagerInterface implementation
      */
-    public function __construct(Factory $factory)
+    public function __construct(LockBackendFactory $factory)
     {
         $this->factory = $factory;
     }
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php
new file mode 100644
index 0000000000000..c71dad701d715
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Test\Unit;
+
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\Lock\Proxy;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\Lock\LockManagerInterface;
+
+/**
+ * @inheritdoc
+ */
+class ProxyTest extends TestCase
+{
+    /**
+     * @var LockBackendFactory|MockObject
+     */
+    private $factoryMock;
+
+    /**
+     * @var LockManagerInterface|MockObject
+     */
+    private $lockerMock;
+
+    /**
+     * @var Proxy
+     */
+    private $proxy;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->factoryMock = $this->createMock(LockBackendFactory::class);
+        $this->lockerMock = $this->getMockForAbstractClass(LockManagerInterface::class);
+        $this->proxy = new Proxy($this->factoryMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testIsLocked()
+    {
+        $lockName = 'testLock';
+        $this->factoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->lockerMock);
+        $this->lockerMock->expects($this->exactly(2))
+            ->method('isLocked')
+            ->with($lockName)
+            ->willReturn(true);
+
+        $this->assertTrue($this->proxy->isLocked($lockName));
+
+        // Call one more time to check that method Factory::create is called one time
+        $this->assertTrue($this->proxy->isLocked($lockName));
+    }
+
+    /**
+     * @return void
+     */
+    public function testLock()
+    {
+        $lockName = 'testLock';
+        $timeout = 123;
+        $this->factoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->lockerMock);
+        $this->lockerMock->expects($this->exactly(2))
+            ->method('lock')
+            ->with($lockName, $timeout)
+            ->willReturn(true);
+
+        $this->assertTrue($this->proxy->lock($lockName, $timeout));
+
+        // Call one more time to check that method Factory::create is called one time
+        $this->assertTrue($this->proxy->lock($lockName, $timeout));
+    }
+
+    /**
+     * @return void
+     */
+    public function testUnlock()
+    {
+        $lockName = 'testLock';
+        $this->factoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->lockerMock);
+        $this->lockerMock->expects($this->exactly(2))
+            ->method('unlock')
+            ->with($lockName)
+            ->willReturn(true);
+
+        $this->assertTrue($this->proxy->unlock($lockName));
+
+        // Call one more time to check that method Factory::create is called one time
+        $this->assertTrue($this->proxy->unlock($lockName));
+    }
+}

From a8f17290363aa157eb1ec77984b3df2201a97ea9 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Sat, 15 Sep 2018 15:23:08 +0200
Subject: [PATCH 0235/1055] Fixes variables in configuration not being replaced
 with actual values in the backend form fields.

---
 app/code/Magento/Config/Block/System/Config/Form.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 2a29fa33feb74..8378c058c1955 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -424,6 +424,10 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
                 $backendModel = $field->getBackendModel();
                 // Backend models which implement ProcessorInterface are processed by ScopeConfigInterface
                 if (!$backendModel instanceof ProcessorInterface) {
+                    if (array_key_exists($path, $this->_configData)) {
+                        $data = $this->_configData[$path];
+                    }
+
                     $backendModel->setPath($path)
                         ->setValue($data)
                         ->setWebsite($this->getWebsiteCode())

From 974a6a53ca7d5ad237654468177d182ff1972b4d Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Tue, 19 Feb 2019 15:34:35 -0600
Subject: [PATCH 0236/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php  | 2 +-
 lib/internal/Magento/Framework/Lock/LockBackendFactory.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index d813f209ab96e..884353eb63e5f 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -131,7 +131,7 @@ public function lock(string $name, int $timeout = -1): bool
     public function unlock(string $name): bool
     {
         if (!isset($this->locks[$name])) {
-            return true;
+            return false;
         }
 
         return $this->getProvider()->delete($this->locks[$name]);
diff --git a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
index 4c4896cb35623..ab839a6594a67 100644
--- a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
@@ -57,7 +57,6 @@ class LockBackendFactory
         self::LOCK_ZOOKEEPER => ZookeeperLock::class
     ];
 
-
     /**
      * @param ObjectManagerInterface $objectManager The Object Manager instance
      * @param DeploymentConfig $deploymentConfig The Application deployment configuration

From f1b43abc82c370ef4c48d684ae59313345c37893 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Wed, 20 Feb 2019 10:43:41 +0300
Subject: [PATCH 0237/1055] MAGETWO-58226: Calendar Custom Options are
 displayed broken on Storefront

- Preventing error messages below each select field for Customizable Options
---
 .../frontend/Magento/blank/web/css/source/_forms.less  | 10 ++++++++++
 .../frontend/Magento/luma/web/css/source/_forms.less   | 10 ++++++++++
 2 files changed, 20 insertions(+)

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 c9f3c3d72ef4c..6ad1f3bf38eb9 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_forms.less
@@ -101,6 +101,16 @@
         .lib-form-validation-note();
     }
 
+    .product-options-wrapper {
+        .date {
+            &.required {
+                div[for*='options'] {
+                    display: none !important;
+                }
+            }
+        }
+    }
+
     .field .tooltip {
         .lib-tooltip(right);
         .tooltip-content {
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 98dd57dead74c..78a50ba10c9bf 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -113,6 +113,16 @@
         .lib-form-validation-note();
     }
 
+    .product-options-wrapper {
+        .required {
+            div[for*='options'] {
+                &.mage-error {
+                    display: none !important;
+                }
+            }
+        }
+    }
+
     //  TEMP
 
     .field .tooltip {

From f4d1442ead35e67ef7a49e07fdc186a034752338 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 20 Feb 2019 11:53:03 +0200
Subject: [PATCH 0238/1055] Sorting by Websites not working in product grid in
 backoffice

---
 .../Mftf/Test/AdminSortingByWebsitesTest.xml  | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
new file mode 100644
index 0000000000000..54c107990c3c7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.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="AdminSortingByWebsitesTest">
+        <annotations>
+            <stories value="View sorting by websites"/>
+            <title value="Sorting by websites in Admin"/>
+            <description value="Sorting products by websites in Admin"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
+
+            <!--Create Website -->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
+                <argument name="newWebsiteName" value="Second Website"/>
+                <argument name="websiteCode" value="second_website"/>
+            </actionGroup>
+
+            <!--Create Store -->
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="Second Website"/>
+                <argument name="storeGroupName" value="Second Store"/>
+                <argument name="storeGroupCode" value="second_store"/>
+            </actionGroup>
+
+            <!--Create Store view -->
+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+            <waitForPageLoad stepKey="waitForSystemStorePage"/>
+            <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
+            <waitForPageLoad stepKey="waitForProductPageLoad"/>
+            <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
+            <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
+            <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
+            <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
+            <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
+            <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView" />
+            <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
+            <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
+            <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
+            <waitForPageLoad stepKey="waitForPageLoad2" time="180" />
+            <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" time="150" stepKey="waitForPageReolad"/>
+            <see userInput="You saved the store view." stepKey="seeSavedMessage" />
+
+            <!--Create a Simple Product 1 -->
+            <actionGroup ref="createSimpleProductAndAddToWebsite" stepKey="createSimpleProduct1">
+                <argument name="product" value="simpleProductForMassUpdate"/>
+                <argument name="website" value="Second Website"/>
+            </actionGroup>
+
+            <!--Create a Simple Product 2 -->
+            <actionGroup ref="createSimpleProductAndAddToWebsite" stepKey="createSimpleProduct2">
+                <argument name="product" value="simpleProductForMassUpdate2"/>
+                <argument name="website" value="Second Website"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete website -->
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
+                <argument name="websiteName" value="Second Website"/>
+            </actionGroup>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+
+            <!--Delete Products -->
+            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
+                <argument name="productName" value="simpleProductForMassUpdate.name"/>
+            </actionGroup>
+            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct2">
+                <argument name="productName" value="simpleProductForMassUpdate2.name"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
+        <waitForPageLoad stepKey="waitForCatalogProductGrid"/>
+
+        <!--Sort Ascending-->
+        <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Ukraine', 'Country of Manufacture')}}" stepKey="getFirstWebsitesSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Cameroon', 'Country of Manufacture')}}" stepKey="getSecondWebsitesSortAsc"/>
+        <assertLessThanOrEqual expected="$getSecondPriceSortAsc" actual="$getFirstPriceSortAsc" stepKey="checkPriceAscSortCorrect"/>
+        <!--Sort Descending-->
+        <click selector="{{AdminProductGridSection.columnHeader('Country of Manufacture')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Ukraine', 'Country of Manufacture')}}" stepKey="getFirstWebsitesSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Cameroon', 'Country of Manufacture')}}" stepKey="getSecondWebsitesSortDesc"/>
+        <assertGreaterThanOrEqual expected="$getSecondWebsitesSortDesc" actual="$getFirstWebsitesSortDesc" stepKey="checkWebsitesDescSortCorrect"/>
+    </test>
+</tests>

From cfa2e3ef16b8d215ecab208a830766c3c79830c1 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Wed, 20 Feb 2019 15:25:27 +0530
Subject: [PATCH 0239/1055] Correct spelling

---
 .../Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index dd09e40ac5b35..564969d9bb913 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -255,7 +255,7 @@ protected function _prepareForm()
     }
 
     /**
-     * Initialize form fileds values
+     * Initialize form fields values
      *
      * @return $this
      */

From bfb28abc6d51b4d38f01c9e43dc8670232e13877 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Wed, 20 Feb 2019 15:47:01 +0530
Subject: [PATCH 0240/1055] Correct spelling

---
 lib/internal/Magento/Framework/Setup/OldDbValidator.php | 2 +-
 lib/web/mage/adminhtml/globals.js                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Setup/OldDbValidator.php b/lib/internal/Magento/Framework/Setup/OldDbValidator.php
index 4c224a6c713ef..018b010e8fe4a 100644
--- a/lib/internal/Magento/Framework/Setup/OldDbValidator.php
+++ b/lib/internal/Magento/Framework/Setup/OldDbValidator.php
@@ -13,7 +13,7 @@
 /**
  * Old Validator for database
  *
- * Used in order to support backward compatability of modules that are installed
+ * Used in order to support backward compatibility of modules that are installed
  * in old way (with Install/Upgrade Schema/Data scripts)
  */
 class OldDbValidator implements UpToDateValidatorInterface
diff --git a/lib/web/mage/adminhtml/globals.js b/lib/web/mage/adminhtml/globals.js
index 12c97fdfcd2c5..683606e576497 100644
--- a/lib/web/mage/adminhtml/globals.js
+++ b/lib/web/mage/adminhtml/globals.js
@@ -12,7 +12,7 @@ define([
 
     /**
      * Set of a temporary methods used to provide
-     * backward compatability with a legacy code.
+     * backward compatibility with a legacy code.
      */
     window.setLocation = function (url) {
         window.location.href = url;

From 8d4710401b9f7b5702a4addfa573b79958f02d59 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Wed, 20 Feb 2019 15:55:32 +0530
Subject: [PATCH 0241/1055] Correct spelling

---
 app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
index 87b5b2f5fe8fe..038907c21224d 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
@@ -79,7 +79,7 @@ define([
 
     /**
      * Extracts and parses data stored in localStorage by the
-     * key specified in 'root' varaible.
+     * key specified in 'root' variable.
      *
      * @returns {Object}
      */

From 93da772ece99f9b332829a08e39c7f4dc9ceb92e Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 20 Feb 2019 13:01:32 +0200
Subject: [PATCH 0242/1055] Sorting by Websites not working in product grid in
 backoffice

---
 .../Test/Mftf/Test/AdminSortingByWebsitesTest.xml      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
index 54c107990c3c7..450d1f1cca39f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
@@ -82,13 +82,13 @@
 
         <!--Sort Ascending-->
         <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
-        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Ukraine', 'Country of Manufacture')}}" stepKey="getFirstWebsitesSortAsc"/>
-        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Cameroon', 'Country of Manufacture')}}" stepKey="getSecondWebsitesSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Main Website', 'Country of Manufacture')}}" stepKey="getFirstWebsitesSortAsc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Second Website', 'Country of Manufacture')}}" stepKey="getSecondWebsitesSortAsc"/>
         <assertLessThanOrEqual expected="$getSecondPriceSortAsc" actual="$getFirstPriceSortAsc" stepKey="checkPriceAscSortCorrect"/>
         <!--Sort Descending-->
-        <click selector="{{AdminProductGridSection.columnHeader('Country of Manufacture')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
-        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Ukraine', 'Country of Manufacture')}}" stepKey="getFirstWebsitesSortDesc"/>
-        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Cameroon', 'Country of Manufacture')}}" stepKey="getSecondWebsitesSortDesc"/>
+        <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Main Website', 'Country of Manufacture')}}" stepKey="getFirstWebsitesSortDesc"/>
+        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Second Website', 'Country of Manufacture')}}" stepKey="getSecondWebsitesSortDesc"/>
         <assertGreaterThanOrEqual expected="$getSecondWebsitesSortDesc" actual="$getFirstWebsitesSortDesc" stepKey="checkWebsitesDescSortCorrect"/>
     </test>
 </tests>

From 3dd1abf9fab853b77e9fc90fe76102f1062a21d1 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Wed, 20 Feb 2019 10:56:28 -0600
Subject: [PATCH 0243/1055] MC-4433: Convert SearchEntityResultsTest to MFTF

- Variations 1-5 complete
---
 .../StorefrontCatalogSearchActionGroup.xml    |  32 +++-
 .../Mftf/Test/SearchEntityResultsTest.xml     | 161 ++++++++++++++++++
 .../StorefrontProductActionGroup.xml          |  13 ++
 .../StorefrontProductInfoMainSection.xml      |   1 +
 .../Test/Mftf/Data/ProductData.xml            |  20 +++
 .../StorefrontQuickSearchResultsSection.xml   |   3 +
 6 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index 387a7547f4daf..da295a820b7e0 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -13,13 +13,43 @@
         <arguments>
             <argument name="phrase"/>
         </arguments>
-        <submitForm selector="#search_mini_form" parameterArray="['q' => '{{phrase}}']" stepKey="fillQuickSearch" />
+        <fillField stepKey="fillInput" selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{phrase}}"/>
+        <submitForm selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" parameterArray="[]" stepKey="submitQuickSearch" />
         <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
         <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
         <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
         <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
     </actionGroup>
 
+    <!-- Opens product from QuickSearch and performs assertions-->
+    <actionGroup name="StorefrontOpenProductFromQuickSearch">
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="productUrlKey" type="string"/>
+            <argument name="index" defaultValue="1"/>
+        </arguments>
+        <click stepKey="openProduct" selector="{{StorefrontQuickSearchResultsSection.productByIndex('1')}}"/>
+        <waitForPageLoad stepKey="waitForProductLoad"/>
+        <seeInCurrentUrl url="{{productUrlKey}}" stepKey="checkUrl"/>
+        <see stepKey="checkName" selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productName}}"/>
+    </actionGroup>
+
+
+    <!-- Adds product from Quicksearch page and perform assertions-->
+    <actionGroup name="StorefrontAddToCartFromQuickSearch">
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="index" defaultValue="1"/>
+        </arguments>
+        <moveMouseOver stepKey="hoverOverProduct" selector="{{StorefrontQuickSearchResultsSection.productByIndex('1')}}"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.productByIndex('1')}} {{StorefrontQuickSearchResultsSection.addToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontQuickSearchResultsSection.messageSection}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
+    </actionGroup>
+
+
+
+
     <!-- Open advanced search page -->
     <actionGroup name="StorefrontOpenAdvancedSearchActionGroup">
         <click selector="{{StorefrontFooterSection.AdvancedSearch}}" stepKey="clickAdvancedSearchLink" />
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
new file mode 100644
index 0000000000000..e7e2a138446e6
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="QuickSearchProductBySku">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find products"/>
+            <description value="Use Quick Search to find a product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14783"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="$createSimpleProduct.sku$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
+            <argument name="productName" value="$createSimpleProduct.name$"/>
+            <argument name="productUrlKey" value="$createSimpleProduct.custom_attributes[url_key]$"/>
+        </actionGroup>
+    </test>
+    <test name="QuickSearchAndAddToCart">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find a simple product and add it to cart"/>
+            <description value="Use Quick Search to find simple Product and Add to Cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14784"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="$createSimpleProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
+            <argument name="productName" value="$createSimpleProduct.name$"/>
+        </actionGroup>
+    </test>
+    <test name="QuickSearchAndAddToCartVirtual">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find a virtual product and add it to cart"/>
+            <description value="Use Quick Search to find virtual Product and Add to Cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14785"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteProduct" createDataKey="createVirtualProduct"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="$createVirtualProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
+            <argument name="productName" value="$createVirtualProduct.name$"/>
+        </actionGroup>
+    </test>
+    <test name="QuickSearchAndAddToCartConfigurable">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find a configurable product and add it to cart"/>
+            <description value="Use Quick Search to find configurable Product and Add to Cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14786"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="{{_defaultProduct.name}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
+            <argument name="productName" value="{{_defaultProduct.name}}"/>
+            <argument name="productUrlKey" value="{{_defaultProduct.urlKey}}"/>
+        </actionGroup>
+        <actionGroup ref="SelectSingleAttributeAndAddToCart" stepKey="addProductToCart">
+            <argument name="productName" value="{{_defaultProduct.name}}"/>
+            <argument name="attributeCode" value="{{colorProductAttribute.default_label}}"/>
+            <argument name="optionName" value="{{colorProductAttribute1.name}}"/>
+        </actionGroup>
+    </test>
+
+    <test name="QuickSearchAndAddToCartDownloadable">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find a downloadable product and add it to cart"/>
+            <description value="Use Quick Search to find downloadable Product and Add to Cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14787"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="DownloadableProductWithOneLink" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="downloadableLink1" stepKey="addDownloadableLink1">
+                <requiredEntity createDataKey="createProduct"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="$createProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
+            <argument name="productName" value="$createProduct.name$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
index 9be600c239c79..99aaa18398884 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
@@ -33,4 +33,17 @@
         </arguments>
         <seeElement selector="{{StorefrontProductInfoMainSection.attributeOptionByAttributeID(attributeCode, optionName)}}" stepKey="verifyOptionExists"/>
     </actionGroup>
+
+    <!-- Adds Single Option Configurable Product to cart-->
+    <actionGroup name="SelectSingleAttributeAndAddToCart">
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="attributeCode" type="string"/>
+            <argument name="optionName" type="string"/>
+        </arguments>
+        <selectOption selector="{{StorefrontProductInfoMainSection.attributeSelectByAttributeID(attributeCode)}}" userInput="{{optionName}}" stepKey="selectAttribute"/>
+        <click stepKey="addProduct" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForElementVisible selector="{{StorefrontQuickSearchResultsSection.messageSection}}" time="30" stepKey="waitForProductAdded"/>
+        <see selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index b64a52d7cea41..9fbc52f69a661 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -17,6 +17,7 @@
         <!-- Parameter is the order number of the attribute on the page (1 is the newest) -->
         <element name="nthAttributeOnPage" type="block" selector="tr:nth-of-type({{numElement}}) .data" parameterized="true"/>
         <element name="stockIndication" type="block" selector=".stock" />
+        <element name="attributeSelectByAttributeID" type="select" selector="//div[@class='fieldset']//div[//span[text()='{{attribute_code}}']]//select" parameterized="true"/>
         <element name="attributeOptionByAttributeID" type="select" selector="//div[@class='fieldset']//div[//span[text()='{{attribute_code}}']]//option[text()='{{optionName}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
index 4bed31d9f854e..72c0734dbe67a 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
@@ -19,6 +19,21 @@
         <data key="status">1</data>
         <data key="urlKey" unique="suffix">downloadableproduct</data>
     </entity>
+    <entity name="DownloadableProductWithOneLink" 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>
+        <data key="visibility">4</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+        <requiredEntity type="downloadable_link">downloadableLink1</requiredEntity>
+    </entity>
     <entity name="DownloadableProductWithTwoLink" type="product">
         <data key="sku" unique="suffix">downloadableproduct</data>
         <data key="type_id">downloadable</data>
@@ -48,4 +63,9 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
         <requiredEntity type="downloadable_link">apiDownloadableLink</requiredEntity>
     </entity>
+    <!--<entity name="InStockDownloadableProduct" extends="DownloadableProduct">-->
+        <!--<data key="visibility">4</data>-->
+        <!--<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>-->
+        <!--<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>-->
+    <!--</entity>-->
 </entities>
diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
index 9e04bbb12a796..5f54f5bce2f47 100644
--- a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
@@ -12,6 +12,9 @@
         <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="productByIndex" type="button" selector=".product-items li:nth-child({{var}}) .product-item-info" parameterized="true"/>
+        <element name="addToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <element name="messageSection" type="text" selector="div .message"/>
         <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']"/>

From 38ef69db1bc29ec157ab9401a2a1eed548f70485 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Wed, 20 Feb 2019 11:32:24 -0600
Subject: [PATCH 0244/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 .../Lock/Test/Unit/LockBackendFactoryTest.php | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php

diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
new file mode 100644
index 0000000000000..cf8444dc0a0ba
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Test\Unit;
+
+use Magento\Framework\Lock\Backend\Database as DatabaseLock;
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class LockBackendFactoryTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var LockBackendFactory
+     */
+    private $factory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->factory = new LockBackendFactory($this->objectManagerMock, $this->deploymentConfigMock);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage Unknown locks provider.
+     */
+    public function testCreateWithException()
+    {
+        $this->deploymentConfigMock->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(['locks/provider', LockBackendFactory::LOCK_DB], ['locks/config', []])
+            ->willReturnOnConsecutiveCalls('someProvider', []);
+
+        $this->factory->create();
+    }
+
+    /**
+     * @param string $lockProvider
+     * @param string $lockProviderClass
+     * @param array $config
+     * @dataProvider createDataProvider
+     */
+    public function testCreate(string $lockProvider, string $lockProviderClass, array $config)
+    {
+        $lockManagerMock = $this->getMockForAbstractClass(LockManagerInterface::class);
+        $this->deploymentConfigMock->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(['locks/provider', LockBackendFactory::LOCK_DB], ['locks/config', []])
+            ->willReturnOnConsecutiveCalls($lockProvider, $config);
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($lockProviderClass, $config)
+            ->willReturn($lockManagerMock);
+
+        $this->assertSame($lockManagerMock, $this->factory->create());
+    }
+
+    public function createDataProvider(): array
+    {
+        return [
+            [
+                'lockProvider' => LockBackendFactory::LOCK_DB,
+                'lockProviderClass' => DatabaseLock::class,
+                'config' => ['prefix' => 'somePrefix'],
+            ],
+            [
+                'lockProvider' => LockBackendFactory::LOCK_ZOOKEEPER,
+                'lockProviderClass' => ZookeeperLock::class,
+                'config' => ['host' => 'some host'],
+            ],
+        ];
+    }
+}

From c865bdc25ff73168e2c2e0e093787ed766a2d068 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 20 Feb 2019 19:45:43 +0200
Subject: [PATCH 0245/1055] ENGCOM-20434: refactoring, test coverage

---
 .../AdaptUrlRewritesToVisibilityAttribute.php | 122 +++++++++++
 ...writeOnChangeProductVisibilityObserver.php |  85 ++------
 ...lRewriteOnChangeVisibilityObserverTest.php | 194 ++++++++++++++++++
 .../_files/product_invisible_multistore.php   |  40 ++++
 .../product_invisible_multistore_rollback.php |  33 +++
 .../_files/products_invisible.php             |  38 ++++
 .../_files/products_invisible_rollback.php    |  37 ++++
 7 files changed, 478 insertions(+), 71 deletions(-)
 create mode 100644 app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore.php
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible.php
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible_rollback.php

diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
new file mode 100644
index 0000000000000..0cadbd0acf0c2
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Model\Products;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ *  Save/Delete UrlRewrites by Product ID's and visibility
+ */
+class AdaptUrlRewritesToVisibilityAttribute
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @var ProductUrlRewriteGenerator
+     */
+    private $urlRewriteGenerator;
+
+    /**
+     * @var UrlPersistInterface
+     */
+    private $urlPersist;
+
+    /**
+     * @var ProductUrlPathGenerator
+     */
+    private $urlPathGenerator;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     * @param ProductUrlRewriteGenerator $urlRewriteGenerator
+     * @param UrlPersistInterface $urlPersist
+     * @param ProductUrlPathGenerator|null $urlPathGenerator
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory,
+        ProductUrlRewriteGenerator $urlRewriteGenerator,
+        UrlPersistInterface $urlPersist,
+        ProductUrlPathGenerator $urlPathGenerator
+    ) {
+        $this->productCollectionFactory = $collectionFactory;
+        $this->urlRewriteGenerator = $urlRewriteGenerator;
+        $this->urlPersist = $urlPersist;
+        $this->urlPathGenerator = $urlPathGenerator;
+    }
+
+    /**
+     * @param array $productIds
+     * @param int $visibility
+     * @throws UrlAlreadyExistsException
+     */
+    public function execute(array $productIds, int $visibility): void
+    {
+        $products = $this->getProductsByIds($productIds);
+
+        /** @var Product $product */
+        foreach ($products as $product) {
+            if ($visibility == Visibility::VISIBILITY_NOT_VISIBLE) {
+                $this->urlPersist->deleteByData(
+                    [
+                        UrlRewrite::ENTITY_ID => $product->getId(),
+                        UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+                    ]
+                );
+            } elseif ($visibility !== Visibility::VISIBILITY_NOT_VISIBLE) {
+                $product->setVisibility($visibility);
+                $productUrlPath = $this->urlPathGenerator->getUrlPath($product);
+                $productUrlRewrite = $this->urlRewriteGenerator->generate($product);
+                $product->unsUrlPath();
+                $product->setUrlPath($productUrlPath);
+
+                try {
+                    $this->urlPersist->replace($productUrlRewrite);
+                } catch (UrlAlreadyExistsException $e) {
+                    throw new UrlAlreadyExistsException(
+                        __(
+                            'Can not change the visibility of the product with SKU equals "%1". URL key "%2" for specified store already exists.',
+                            $product->getSku(),
+                            $product->getUrlKey()
+                        ),
+                        $e,
+                        $e->getCode(),
+                        $e->getUrls()
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * @param array $productIds
+     * @return array
+     */
+    protected function getProductsByIds(array $productIds): array
+    {
+        $productCollection = $this->productCollectionFactory->create();
+        $productCollection->addAttributeToSelect(ProductInterface::VISIBILITY);
+        $productCollection->addAttributeToSelect('url_key');
+        $productCollection->addFieldToFilter(
+            'entity_id',
+            ['in' => array_unique($productIds)]
+        );
+
+        return $productCollection->getItems();
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
index 6006f75035409..56393c619f4ef 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
@@ -8,64 +8,34 @@
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Model\Product\Visibility;
-use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
-use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\CatalogUrlRewrite\Model\Products\AdaptUrlRewritesToVisibilityAttribute;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 
 /**
- * Class ProductProcessUrlRewriteSavingObserver
+ * Consider URL rewrites on change product visibility via mass action
  */
 class ProcessUrlRewriteOnChangeProductVisibilityObserver implements ObserverInterface
 {
     /**
-     * @var CollectionFactory
-     */
-    private $productCollectionFactory;
-
-    /**
-     * @var ProductUrlRewriteGenerator
-     */
-    private $urlRewriteGenerator;
-
-    /**
-     * @var UrlPersistInterface
+     * @var AdaptUrlRewritesToVisibilityAttribute
      */
-    private $urlPersist;
+    private $adaptUrlRewritesToVisibility;
 
     /**
-     * @var ProductUrlPathGenerator
+     * @param AdaptUrlRewritesToVisibilityAttribute $adaptUrlRewritesToVisibility
      */
-    private $urlPathGenerator;
-
-    /**
-     * @param CollectionFactory $collectionFactory
-     * @param ProductUrlRewriteGenerator $urlRewriteGenerator
-     * @param UrlPersistInterface $urlPersist
-     * @param ProductUrlPathGenerator|null $urlPathGenerator
-     */
-    public function __construct(
-        CollectionFactory $collectionFactory,
-        ProductUrlRewriteGenerator $urlRewriteGenerator,
-        UrlPersistInterface $urlPersist,
-        ProductUrlPathGenerator $urlPathGenerator
-    ) {
-        $this->productCollectionFactory = $collectionFactory;
-        $this->urlRewriteGenerator = $urlRewriteGenerator;
-        $this->urlPersist = $urlPersist;
-        $this->urlPathGenerator = $urlPathGenerator;
+    public function __construct(AdaptUrlRewritesToVisibilityAttribute $adaptUrlRewritesToVisibility)
+    {
+        $this->adaptUrlRewritesToVisibility = $adaptUrlRewritesToVisibility;
     }
 
     /**
      * Generate urls for UrlRewrites and save it in storage
      *
      * @param Observer $observer
-     * @return array
+     * @return void
      * @throws UrlAlreadyExistsException
      */
     public function execute(Observer $observer)
@@ -73,39 +43,12 @@ public function execute(Observer $observer)
         $event = $observer->getEvent();
         $attrData = $event->getAttributesData();
         $productIds = $event->getProductIds();
-        $storeId = $event->getStoreId();
-        $visibility = $attrData[ProductInterface::VISIBILITY] ?? null;
-
-        if (!$visibility) {
-            return [$attrData, $productIds, $storeId];
-        }
-
-        $productCollection = $this->productCollectionFactory->create();
-        $productCollection->addAttributeToSelect(ProductInterface::VISIBILITY);
-        $productCollection->addAttributeToSelect('url_key');
-        $productCollection->addFieldToFilter(
-            'entity_id',
-            ['in' => array_unique($productIds)]
-        );
+        $visibility = $attrData[ProductInterface::VISIBILITY] ?? 0;
 
-        foreach ($productCollection as $product) {
-            if ($visibility == Visibility::VISIBILITY_NOT_VISIBLE) {
-                $this->urlPersist->deleteByData(
-                    [
-                        UrlRewrite::ENTITY_ID => $product->getId(),
-                        UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-                    ]
-                );
-            } elseif ($visibility !== Visibility::VISIBILITY_NOT_VISIBLE) {
-                $product->setVisibility($visibility);
-                $productUrlPath = $this->urlPathGenerator->getUrlPath($product);
-                $productUrlRewrite = $this->urlRewriteGenerator->generate($product);
-                $product->unsUrlPath();
-                $product->setUrlPath($productUrlPath);
-                $this->urlPersist->replace($productUrlRewrite);
-            }
+        if (!$visibility || !$productIds) {
+            return;
         }
 
-        return [$attrData, $productIds, $storeId];
+        $this->adaptUrlRewritesToVisibility->execute($productIds, $visibility);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php
new file mode 100644
index 0000000000000..af9979309078f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogUrlRewrite\Observer;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation disabled
+ */
+class ProcessUrlRewriteOnChangeVisibilityObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ManagerInterface
+     */
+    private $eventManager;
+
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->eventManager = $this->objectManager->create(ManagerInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_rewrite_multistore.php
+     * @magentoAppIsolation enabled
+     */
+    public function testMakeProductInvisibleViaMassAction()
+    {
+        /** @var \Magento\Catalog\Model\Product $product*/
+        $product = $this->productRepository->get('product1');
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore(0);
+
+        $testStore = $storeManager->getStore('test');
+        $productFilter = [
+            UrlRewrite::ENTITY_TYPE => 'product',
+        ];
+
+        $expected = [
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => '1',
+            ],
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $testStore->getId(),
+            ]
+        ];
+
+        $actual = $this->getActualResults($productFilter);
+        foreach ($expected as $row) {
+            $this->assertContains($row, $actual);
+        }
+
+        $this->eventManager->dispatch(
+            'catalog_product_attribute_update_before',
+            [
+                'attributes_data' => [ ProductInterface::VISIBILITY => Visibility::VISIBILITY_NOT_VISIBLE ],
+                'product_ids' => [$product->getId()]
+            ]
+        );
+
+        $actual = $this->getActualResults($productFilter);
+        $this->assertCount(0, $actual);
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_invisible_multistore.php
+     * @magentoAppIsolation enabled
+     */
+    public function testMakeProductVisibleViaMassAction()
+    {
+        /** @var \Magento\Catalog\Model\Product $product*/
+        $product = $this->productRepository->get('product1');
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore(0);
+
+        $testStore = $storeManager->getStore('test');
+        $productFilter = [
+            UrlRewrite::ENTITY_TYPE => 'product',
+        ];
+
+        $actual = $this->getActualResults($productFilter);
+        $this->assertCount(0, $actual);
+
+        $this->eventManager->dispatch(
+            'catalog_product_attribute_update_before',
+            [
+                'attributes_data' => [ ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH ],
+                'product_ids' => [$product->getId()]
+            ]
+        );
+
+        $expected = [
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => '1',
+            ],
+            [
+                'request_path' => "product-1.html",
+                'target_path' => "catalog/product/view/id/" . $product->getId(),
+                'is_auto_generated' => 1,
+                'redirect_type' => 0,
+                'store_id' => $testStore->getId(),
+            ]
+        ];
+
+        $actual = $this->getActualResults($productFilter);
+        foreach ($expected as $row) {
+            $this->assertContains($row, $actual);
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/products_invisible.php
+     * @magentoAppIsolation enabled
+     */
+    public function testErrorOnDuplicatedUrlKey()
+    {
+        $skus = ['product1', 'product2'];
+        foreach ($skus as $sku) {
+            /** @var \Magento\Catalog\Model\Product $product */
+            $productIds[] = $this->productRepository->get($sku)->getId();
+        }
+        $this->expectException(UrlAlreadyExistsException::class);
+        $this->expectExceptionMessage('Can not change the visibility of the product with SKU equals "product2". URL key "product-1" for specified store already exists.');
+
+        $this->eventManager->dispatch(
+            'catalog_product_attribute_update_before',
+            [
+                'attributes_data' => [ ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH ],
+                'product_ids' => $productIds
+            ]
+        );
+    }
+
+    /**
+     * @param array $filter
+     * @return array
+     */
+    private function getActualResults(array $filter)
+    {
+        /** @var \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(\Magento\UrlRewrite\Model\UrlFinderInterface::class);
+        $actualResults = [];
+        foreach ($urlFinder->findAllByData($filter) as $url) {
+            $actualResults[] = [
+                'request_path' => $url->getRequestPath(),
+                'target_path' => $url->getTargetPath(),
+                'is_auto_generated' => (int)$url->getIsAutogenerated(),
+                'redirect_type' => $url->getRedirectType(),
+                'store_id' => $url->getStoreId()
+            ];
+        }
+        return $actualResults;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore.php
new file mode 100644
index 0000000000000..d50b29383b1ef
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()
+    ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
+
+require __DIR__ . '/../../Store/_files/store.php';
+
+/** @var $installer CategorySetup */
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$storeManager->setCurrentStore(0);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setStoreId(0)
+    ->setWebsiteIds([1])
+    ->setName('Product1')
+    ->setSku('product1')
+    ->setPrice(10)
+    ->setWeight(18)
+    ->setStockData(['use_config_manage_stock' => 0])
+    ->setUrlKey('product-1')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore_rollback.php
new file mode 100644
index 0000000000000..bcf399cb5e552
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_invisible_multistore_rollback.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('product1', true);
+    if ($product->getId()) {
+        $productRepository->delete($product);
+    }
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../Store/_files/store_rollback.php';
+require __DIR__ . '/../../Store/_files/second_store_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible.php
new file mode 100644
index 0000000000000..c72d9c8284db3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()
+    ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
+
+/** @var $installer CategorySetup */
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$skus = ['product1', 'product2'];
+foreach ($skus as $sku) {
+    /** @var $product \Magento\Catalog\Model\Product */
+    $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+    $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+        ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+        ->setStoreId(0)
+        ->setWebsiteIds([1])
+        ->setName('Product1')
+        ->setSku($sku)
+        ->setPrice(10)
+        ->setWeight(18)
+        ->setStockData(['use_config_manage_stock' => 0])
+        ->setUrlKey('product-1')
+        ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
+        ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
+    $productRepository->save($product);
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible_rollback.php
new file mode 100644
index 0000000000000..d3d17542aa6ab
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/products_invisible_rollback.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$skus = ['product1', 'product2'];
+foreach ($skus as $sku) {
+    try {
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (NoSuchEntityException $e) {
+    }
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../Store/_files/store_rollback.php';
+require __DIR__ . '/../../Store/_files/second_store_rollback.php';

From 6c69e73d4969f2d090c5cd38f561b1ee28b3342e Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Wed, 20 Feb 2019 11:54:00 -0600
Subject: [PATCH 0246/1055] MC-14990: The Recently Viewed Products* widget not
 displayed when more one product it was viewed

---
 .../Product/ProductFrontendAction/Synchronizer.php    |  2 +-
 .../ProductFrontendAction/SynchronizerTest.php        | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
index 72f66284e159a..24775a791e59f 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
@@ -143,7 +143,7 @@ private function getProductIdsByActions(array $actions)
         $productIds = [];
 
         foreach ($actions as $action) {
-            if (isset($action['product_id']) && is_int($action['product_id'])) {
+            if (isset($action['product_id'])) {
                 $productIds[] = $action['product_id'];
             }
         }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
index fce4a02622d9e..38bed83cb9504 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
@@ -80,6 +80,7 @@ protected function setUp()
 
     public function testFilterProductActions()
     {
+        $typeId = 'recently_compared_product';
         $productsData = [
             1 => [
                 'added_at' => 12,
@@ -87,7 +88,7 @@ public function testFilterProductActions()
             ],
             2 => [
                 'added_at' => 13,
-                'product_id' => 2,
+                'product_id' => '2',
             ],
             3 => [
                 'added_at' => 14,
@@ -126,10 +127,12 @@ public function testFilterProductActions()
         $collection->expects($this->once())
             ->method('addFilterByUserIdentities')
             ->with(1, 34);
-        $collection->expects($this->any())
+        $collection->expects($this->at(1))
             ->method('addFieldToFilter')
-            ->withConsecutive(['type_id'], ['product_id']);
-
+            ->with('type_id', $typeId);
+        $collection->expects($this->at(2))
+            ->method('addFieldToFilter')
+            ->with('product_id', [1, 2]);
         $iterator = new \IteratorIterator(new \ArrayIterator([$frontendAction]));
         $collection->expects($this->once())
             ->method('getIterator')

From 0f3c125972654768727dfa130c8badfd49e8cd68 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Wed, 20 Feb 2019 12:07:26 -0600
Subject: [PATCH 0247/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index 884353eb63e5f..02e2739545696 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -126,7 +126,8 @@ public function lock(string $name, int $timeout = -1): bool
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
+     * @throws RuntimeException
      */
     public function unlock(string $name): bool
     {
@@ -138,7 +139,8 @@ public function unlock(string $name): bool
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
+     * @throws RuntimeException
      */
     public function isLocked(string $name): bool
     {

From 4e348fd0a595579a4be08795c18f13c71ebecea0 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Wed, 20 Feb 2019 14:51:32 -0600
Subject: [PATCH 0248/1055] Fix Admin Customizable Options Dropdown sort_order
 issue

---
 .../Backend/view/adminhtml/web/template/dynamic-rows/grid.html  | 2 +-
 .../Ui/DataProvider/Product/Form/Modifier/CustomOptions.php     | 1 +
 .../Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js    | 1 +
 app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js     | 2 +-
 .../view/base/web/templates/dynamic-rows/templates/default.html | 2 +-
 .../Ui/view/base/web/templates/dynamic-rows/templates/grid.html | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
index fe30ca7e83f19..0033f4c071e42 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
+++ b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -69,7 +69,7 @@
 
                         <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                         <td if="elem.template"
-                            visible="elem.visible"
+                            visible="elem.visible() && elem.formElement !== 'hidden'"
                             disable="elem.disabled"
                             css="$parent.setClasses(elem)"
                             template="elem.template"
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 f8f82511cc12f..af43c84501f65 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
@@ -871,6 +871,7 @@ protected function getPositionFieldConfig($sortOrder)
                         'formElement' => Hidden::NAME,
                         'dataScope' => static::FIELD_SORT_ORDER_NAME,
                         'dataType' => Number::NAME,
+                        'visible' => false,
                         'sortOrder' => $sortOrder,
                     ],
                 ],
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
index 1d52fc78d7a85..cbbfbdb127ad7 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
@@ -543,6 +543,7 @@ define([
                     data = this.createHeaderTemplate(cell.config);
                     cell.config.labelVisible = false;
                     _.extend(data, {
+                        defaultLabelVisible: data.visible(),
                         label: cell.config.label,
                         name: cell.name,
                         required: !!cell.config.validation,
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
index 3987507ece54f..9a9d478904775 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
@@ -245,7 +245,7 @@ define([
                 label = _.findWhere(this.parentComponent().labels(), {
                     name: index
                 });
-                label.visible() !== state ? label.visible(state) : false;
+                label.defaultLabelVisible && label.visible(state);
             } else {
                 elems[curElem].visible(state);
             }
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
index 1a21e1b2f1c71..6da4f82fa8b9e 100644
--- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
@@ -41,7 +41,7 @@
                     <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                     <td if="elem.template"
                         css="$parent.setClasses(elem)"
-                        visible="elem.visible"
+                        visible="elem.visible() && elem.formElement !== 'hidden'"
                         disable="elem.disabled"
                         template="elem.template"/>
                     <!-- /ko -->
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
index d0b12549bd66d..e5d73a62b329e 100644
--- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
@@ -58,7 +58,7 @@
 
                     <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                     <td if="elem.template"
-                        visible="elem.visible"
+                        visible="elem.visible() && elem.formElement !== 'hidden'"
                         disable="elem.disabled"
                         css="$parent.setClasses(elem)"
                         template="elem.template"

From 9accdd4f278c999c3e1d7b005708494c738f5187 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Wed, 20 Feb 2019 15:35:22 -0600
Subject: [PATCH 0249/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 .../testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php  | 0
 lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php       | 2 +-
 .../Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php  | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
 create mode 100644 lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index 02e2739545696..d19ba0dd947b0 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -242,7 +242,7 @@ private function isAnyLock(string $fullKey, int $indexKey = null): bool
 
         $children = $this->getProvider()->getChildren($parent);
 
-        foreach($children as $childKey) {
+        foreach ($children as $childKey) {
 
             if (is_null($indexKey)) {
                 return true;
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
new file mode 100644
index 0000000000000..e69de29bb2d1d

From ba4f6baaea9cf2740f8e0c87ac2af192958742ce Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Wed, 20 Feb 2019 15:37:06 -0600
Subject: [PATCH 0250/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 .../Lock/Test/Unit/Backend/ZookeeperTest.php  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
index e69de29bb2d1d..c004179aa524a 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Test\Unit\Backend;
+
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperProvider;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class ZookeeperTest extends TestCase
+{
+    /**
+     * @var \Zookeeper|MockObject
+     */
+    private $zookeeperMock;
+
+    /**
+     * @var ZookeeperProvider
+     */
+    private $zookeeperProvider;
+
+    /**
+     * @var string
+     */
+    private $host = 'localhost:123';
+
+    /**
+     * @var string
+     */
+    private $path = '/some/path';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider($this->host, '/some/path/');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage The path needs to be a non-empty string.
+     */
+    public function testConstructionWithException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider('some host', '');
+    }
+
+
+}

From d1752d3cab4d04af1e1bbcf1b968450ed9c735eb Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Wed, 20 Feb 2019 16:00:40 -0600
Subject: [PATCH 0251/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 lib/internal/Magento/Framework/Lock/LockBackendFactory.php   | 4 ++++
 .../Framework/Lock/Test/Unit/Backend/ZookeeperTest.php       | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
index ab839a6594a67..e2119ca3eee11 100644
--- a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
@@ -84,6 +84,10 @@ public function create(): LockManagerInterface
             throw new RuntimeException(new Phrase('Unknown locks provider.'));
         }
 
+        if (self::LOCK_ZOOKEEPER === $provider && !extension_loaded(self::LOCK_ZOOKEEPER)) {
+            throw new RuntimeException(new Phrase('php extension Zookeeper is not installed.'));
+        }
+
         return $this->objectManager->create($this->lockers[$provider], $config);
     }
 }
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
index c004179aa524a..c22c49d3427c5 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
@@ -38,6 +38,9 @@ class ZookeeperTest extends TestCase
      */
     protected function setUp()
     {
+        if (!extension_loaded('zookeeper')) {
+            $this->markTestSkipped('Test was skipped because php extension Zookeeper is not installed.');
+        }
         $this->zookeeperProvider = new ZookeeperProvider($this->host, '/some/path/');
     }
 
@@ -49,6 +52,4 @@ public function testConstructionWithException()
     {
         $this->zookeeperProvider = new ZookeeperProvider('some host', '');
     }
-
-
 }

From 7710c226f8b5a193aedda196e34d14e3a13f96af Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Wed, 20 Feb 2019 16:18:23 -0600
Subject: [PATCH 0252/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 .../Lock/Test/Unit/LockBackendFactoryTest.php  | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
index cf8444dc0a0ba..f3b141e9f902b 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
@@ -78,19 +78,27 @@ public function testCreate(string $lockProvider, string $lockProviderClass, arra
         $this->assertSame($lockManagerMock, $this->factory->create());
     }
 
+    /**
+     * @return array
+     */
     public function createDataProvider(): array
     {
-        return [
-            [
+        $data = [
+            'db' => [
                 'lockProvider' => LockBackendFactory::LOCK_DB,
                 'lockProviderClass' => DatabaseLock::class,
                 'config' => ['prefix' => 'somePrefix'],
             ],
-            [
+        ];
+
+        if (extension_loaded('zookeeper')) {
+            $data['zookeeper'] = [
                 'lockProvider' => LockBackendFactory::LOCK_ZOOKEEPER,
                 'lockProviderClass' => ZookeeperLock::class,
                 'config' => ['host' => 'some host'],
-            ],
-        ];
+            ];
+        }
+
+        return $data;
     }
 }

From ecb572bc764ebd089e334c303bd386acb447ccec Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Thu, 21 Feb 2019 12:02:47 +0530
Subject: [PATCH 0253/1055] Fixed Inline block edit identifier validation.

---
 .../Cms/view/adminhtml/ui_component/cms_block_listing.xml        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
index 9f886f6f1345e..793fc7d26cb4a 100644
--- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
@@ -146,7 +146,6 @@
                 <editor>
                     <validation>
                         <rule name="required-entry" xsi:type="boolean">true</rule>
-                        <rule name="validate-xml-identifier" xsi:type="boolean">true</rule>
                     </validation>
                     <editorType>text</editorType>
                 </editor>

From 0ff3e0ea40d2558fd3afbf809d26403d066b25db Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Thu, 21 Feb 2019 16:02:26 +0300
Subject: [PATCH 0254/1055] MAGETWO-58226: Calendar Custom Options are
 displayed broken on Storefront

- Preventing error messages below each field of date type for Customizable Options
---
 .../frontend/Magento/blank/web/css/source/_forms.less  |  4 +++-
 .../frontend/Magento/luma/web/css/source/_forms.less   | 10 ++++++----
 2 files changed, 9 insertions(+), 5 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 6ad1f3bf38eb9..26f5ff89e99e3 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_forms.less
@@ -105,7 +105,9 @@
         .date {
             &.required {
                 div[for*='options'] {
-                    display: none !important;
+                    &.mage-error {
+                        display: none !important;
+                    }
                 }
             }
         }
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 78a50ba10c9bf..047ffd18d352f 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -114,10 +114,12 @@
     }
 
     .product-options-wrapper {
-        .required {
-            div[for*='options'] {
-                &.mage-error {
-                    display: none !important;
+        .date {
+            &.required {
+                div[for*='options'] {
+                    &.mage-error {
+                        display: none !important;
+                    }
                 }
             }
         }

From 767c86c9fd55649da52bfc267dea45ed09c38dff Mon Sep 17 00:00:00 2001
From: Simon Sprankel <simon@customgento.com>
Date: Thu, 21 Feb 2019 09:44:12 +0100
Subject: [PATCH 0255/1055] implemented UI component form test for usage with
 AbstractDataProvider

Signed-off-by: Simon Sprankel <simonsprankel@gmail.com>
---
 .../Ui/Test/Unit/Component/FormTest.php       | 62 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/Test/Unit/Component/FormTest.php b/app/code/Magento/Ui/Test/Unit/Component/FormTest.php
index 6951583291df9..6df69c7d0e48d 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/FormTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/FormTest.php
@@ -9,7 +9,6 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
-use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Ui\Component\Form;
 
 class FormTest extends \PHPUnit\Framework\TestCase
@@ -215,4 +214,65 @@ public function testGetDataSourceDataWithoutId()
 
         $this->assertEquals($dataSource, $this->model->getDataSourceData());
     }
+
+    public function testGetDataSourceDataWithAbstractDataProvider()
+    {
+        $requestFieldName = 'request_id';
+        $primaryFieldName = 'primary_id';
+        $fieldId = 44;
+        $row = ['key' => 'value', $primaryFieldName => $fieldId];
+        $data = [
+            'items' => [$row],
+        ];
+        $dataSource = [
+            'data' => [
+                'general' => $row
+            ],
+        ];
+
+        /** @var DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject $dataProviderMock */
+        $dataProviderMock =
+            $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class)
+                ->getMock();
+        $dataProviderMock->expects($this->once())
+            ->method('getRequestFieldName')
+            ->willReturn($requestFieldName);
+        $dataProviderMock->expects($this->once())
+            ->method('getPrimaryFieldName')
+            ->willReturn($primaryFieldName);
+
+        $this->contextMock->expects($this->any())
+            ->method('getDataProvider')
+            ->willReturn($dataProviderMock);
+        $this->contextMock->expects($this->once())
+            ->method('getRequestParam')
+            ->with($requestFieldName)
+            ->willReturn($fieldId);
+
+        /** @var Filter|\PHPUnit_Framework_MockObject_MockObject $filterMock */
+        $filterMock = $this->getMockBuilder(\Magento\Framework\Api\Filter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->filterBuilderMock->expects($this->once())
+            ->method('setField')
+            ->with($primaryFieldName)
+            ->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())
+            ->method('setValue')
+            ->with($fieldId)
+            ->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())
+            ->method('create')
+            ->willReturn($filterMock);
+
+        $dataProviderMock->expects($this->once())
+            ->method('addFilter')
+            ->with($filterMock);
+        $dataProviderMock->expects($this->once())
+            ->method('getData')
+            ->willReturn($data);
+
+        $this->assertEquals($dataSource, $this->model->getDataSourceData());
+    }
 }

From 992fa047536e4546cb0cfc672d99823c15f836ff Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 21 Feb 2019 17:46:39 +0200
Subject: [PATCH 0256/1055] MC-14943: MFTF test fix

---
 .../Test/Mftf/ActionGroup/AdminProductActionGroup.xml  | 10 ++++++----
 .../Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 3afdc41888c79..a4bad1e817735 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -180,12 +180,14 @@
         <arguments>
             <argument name="website" type="string"/>
         </arguments>
-        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="ScrollToWebsites"/>
-        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="ClickTpOpenProductInWebsite"/>
+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{ProductInWebsitesSection.website(website.name)}}" visible="false" stepKey="clickToOpenProductInWebsite"/>
         <waitForPageLoad stepKey="waitForPageOpened"/>
-        <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="SelectWebsite"/>
+        <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct"/>
-        <waitForPageLoad time='60' stepKey="waitForPageOpened1"/>
+        <waitForPageLoad time='60' stepKey="waitForProducrSaved"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSaveSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveSuccessMessage"/>
     </actionGroup>
 
     <actionGroup name="ProductSetAdvancedPricing">
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
index cfb2c7e6347c3..0960dfb47c368 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
@@ -11,6 +11,7 @@
         <arguments>
             <argument name="website"/>
         </arguments>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
         <click selector="{{AdminMainActionsSection.storeViewDropdown}}" stepKey="clickWebsiteSwitchDropdown"/>
         <waitForElementVisible selector="{{AdminMainActionsSection.websiteByName('Main Website')}}" stepKey="waitForWebsiteAreVisible"/>
         <click selector="{{AdminMainActionsSection.websiteByName(website.name)}}" stepKey="clickWebsiteByName"/>

From 1c608d7b54bf08d4fe592c2a0153502c9a9527d4 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Thu, 21 Feb 2019 22:08:19 +0200
Subject: [PATCH 0257/1055] ENGCOM-20434: refactoring, doc blocks adjustments

---
 .../Products/AdaptUrlRewritesToVisibilityAttribute.php      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
index 0cadbd0acf0c2..cf1a7ec76f016 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
@@ -61,6 +61,8 @@ public function __construct(
     }
 
     /**
+     * Process Url Rewrites according to the products visibility attribute
+     *
      * @param array $productIds
      * @param int $visibility
      * @throws UrlAlreadyExistsException
@@ -104,10 +106,12 @@ public function execute(array $productIds, int $visibility): void
     }
 
     /**
+     * Get Product Models by Id's
+     *
      * @param array $productIds
      * @return array
      */
-    protected function getProductsByIds(array $productIds): array
+    private function getProductsByIds(array $productIds): array
     {
         $productCollection = $this->productCollectionFactory->create();
         $productCollection->addAttributeToSelect(ProductInterface::VISIBILITY);

From 6584286dd68a29940dca3300dd3368fc2e9ec81e Mon Sep 17 00:00:00 2001
From: dharmesh vaja <dharmesh.vaja@rocketbazaar.com>
Date: Fri, 22 Feb 2019 11:33:41 +0530
Subject: [PATCH 0258/1055] Fixed issue-21396

---
 app/code/Magento/Customer/Block/Address/Grid.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index de6767a0ef92a..86085b3bb7c5b 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -237,6 +237,7 @@ private function getAddressCollection(): \Magento\Customer\Model\ResourceModel\A
             /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
             $collection = $this->addressCollectionFactory->create();
             $collection->setOrder('entity_id', 'desc')
+                ->addFieldToFilter('entity_id', array('nin' => array($this->getDefaultBilling(), $this->getDefaultShipping())))
                 ->setCustomerFilter([$this->getCustomer()->getId()]);
             $this->addressCollection = $collection;
         }

From 612a650492e51e17ed5f8974a93dedf4b4e05c32 Mon Sep 17 00:00:00 2001
From: Evgeny Petrov <evgeny_petrov@epam.com>
Date: Thu, 21 Feb 2019 12:03:19 +0300
Subject: [PATCH 0259/1055] MAGETWO-57934: [GitHub] Can't use "configurable" as
 group name in attribute sets M2.1 #6123

---
 .../Magento/ConfigurableProduct/etc/di.xml    |  7 +++
 .../Eav/Model/Entity/Attribute/Group.php      | 51 ++++++++++++-------
 .../Unit/Model/Entity/Attribute/GroupTest.php |  5 +-
 app/code/Magento/Eav/etc/di.xml               |  1 -
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index 0ae9ffde66f43..86717e42fa540 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -245,4 +245,11 @@
     <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>
+    <type name="Magento\Eav\Model\Entity\Attribute\Group">
+        <arguments>
+            <argument name="reservedSystemNames" xsi:type="array">
+                <item name="configurable" xsi:type="string">configurable</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
index 0b6ac2b998de7..0d24ea24deaec 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\Entity\Attribute;
 
+use Magento\Eav\Api\Data\AttributeGroupExtensionInterface;
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
+ * Entity attribute group model
+ *
  * @api
  * @method int getSortOrder()
  * @method \Magento\Eav\Model\Entity\Attribute\Group setSortOrder(int $value)
@@ -27,6 +32,11 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      */
     private $translitFilter;
 
+    /**
+     * @var array
+     */
+    private $reservedSystemNames;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -35,7 +45,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Filter\Translit $translitFilter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-     * @param array $data
+     * @param array $reservedSystemNames (optional)
+     * @param array $data (optional)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -45,6 +56,7 @@ public function __construct(
         \Magento\Framework\Filter\Translit $translitFilter,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        array $reservedSystemNames = [],
         array $data = []
     ) {
         parent::__construct(
@@ -54,8 +66,10 @@ public function __construct(
             $customAttributeFactory,
             $resource,
             $resourceCollection,
+            $reservedSystemNames,
             $data
         );
+        $this->reservedSystemNames = $reservedSystemNames;
         $this->translitFilter = $translitFilter;
     }
 
@@ -74,6 +88,7 @@ protected function _construct()
      * Checks if current attribute group exists
      *
      * @return bool
+     * @throws LocalizedException
      * @codeCoverageIgnore
      */
     public function itemExists()
@@ -85,6 +100,7 @@ public function itemExists()
      * Delete groups
      *
      * @return $this
+     * @throws LocalizedException
      * @codeCoverageIgnore
      */
     public function deleteGroups()
@@ -110,9 +126,10 @@ public function beforeSave()
                     ),
                     '-'
                 );
-                if (empty($attributeGroupCode)) {
-                    // in the following code md5 is not used for security purposes
-                    $attributeGroupCode = md5($groupName);
+                $isReservedSystemName = in_array(strtolower($attributeGroupCode), $this->reservedSystemNames);
+                if (empty($attributeGroupCode) || $isReservedSystemName) {
+                    // in the following code sha1 is not used for security purposes
+                    $attributeGroupCode = sha1(strtolower($groupName));
                 }
                 $this->setAttributeGroupCode($attributeGroupCode);
             }
@@ -121,7 +138,8 @@ public function beforeSave()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @codeCoverageIgnoreStart
      */
     public function getAttributeGroupId()
@@ -130,7 +148,7 @@ public function getAttributeGroupId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributeGroupName()
     {
@@ -138,7 +156,7 @@ public function getAttributeGroupName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributeSetId()
     {
@@ -146,7 +164,7 @@ public function getAttributeSetId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAttributeGroupId($attributeGroupId)
     {
@@ -154,7 +172,7 @@ public function setAttributeGroupId($attributeGroupId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAttributeGroupName($attributeGroupName)
     {
@@ -162,7 +180,7 @@ public function setAttributeGroupName($attributeGroupName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAttributeSetId($attributeSetId)
     {
@@ -170,9 +188,9 @@ public function setAttributeSetId($attributeSetId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
-     * @return \Magento\Eav\Api\Data\AttributeGroupExtensionInterface|null
+     * @return AttributeGroupExtensionInterface|null
      */
     public function getExtensionAttributes()
     {
@@ -180,14 +198,13 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
-     * @param \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
+     * @param AttributeGroupExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setExtensionAttributes(
-        \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
-    ) {
+    public function setExtensionAttributes(AttributeGroupExtensionInterface $extensionAttributes)
+    {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
 
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
index d4c91e98d9608..986ab517ceca1 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
@@ -40,6 +40,7 @@ protected function setUp()
             'resource' => $this->resourceMock,
             'translitFilter' => $translitFilter,
             'context' => $contextMock,
+            'reservedSystemNames' => ['configurable'],
         ];
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
@@ -67,7 +68,9 @@ public function attributeGroupCodeDataProvider()
     {
         return [
             ['General Group', 'general-group'],
-            ['///', md5('///')],
+            ['configurable', sha1('configurable')],
+            ['configurAble', sha1('configurable')],
+            ['///', sha1('///')],
         ];
     }
 }
diff --git a/app/code/Magento/Eav/etc/di.xml b/app/code/Magento/Eav/etc/di.xml
index a4c89dcfab2af..db6f9b0a64f9f 100644
--- a/app/code/Magento/Eav/etc/di.xml
+++ b/app/code/Magento/Eav/etc/di.xml
@@ -210,4 +210,3 @@
         </arguments>
     </type>
 </config>
-

From 0c7218b9889af1b11bba56fb8e0e0b6958ea4409 Mon Sep 17 00:00:00 2001
From: Oleksandr Kravchuk <swnsma@gmail.com>
Date: Fri, 22 Feb 2019 10:43:48 +0200
Subject: [PATCH 0260/1055] Fix static tests

---
 app/code/Magento/Ui/Component/Form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/Component/Form.php b/app/code/Magento/Ui/Component/Form.php
index b560097e490e0..dc6e7b5ca06ab 100644
--- a/app/code/Magento/Ui/Component/Form.php
+++ b/app/code/Magento/Ui/Component/Form.php
@@ -10,6 +10,7 @@
 use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
+ * Ui component Form
  * @api
  * @since 100.0.2
  */
@@ -53,7 +54,7 @@ public function getComponentName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDataSourceData()
     {

From 4703a2afeee0de44835c726c5824e6578cc91bd6 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 22 Feb 2019 10:56:46 +0200
Subject: [PATCH 0261/1055] MC-14943: MFTF test fix

---
 .../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 a4bad1e817735..3402b82fa6dc8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -181,7 +181,7 @@
             <argument name="website" type="string"/>
         </arguments>
         <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
-        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{ProductInWebsitesSection.website(website.name)}}" visible="false" stepKey="clickToOpenProductInWebsite"/>
+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{ProductInWebsitesSection.website(website)}}" visible="false" stepKey="clickToOpenProductInWebsite"/>
         <waitForPageLoad stepKey="waitForPageOpened"/>
         <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct"/>

From 5362c5a76d7b6dac663addada2aee67987cdf945 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Fri, 22 Feb 2019 14:50:27 +0200
Subject: [PATCH 0262/1055] Sorting by Websites not working in product grid in
 backoffice #20511

---
 .../Mftf/Test/AdminSortingByWebsitesTest.xml  | 111 ++++++++----------
 1 file changed, 51 insertions(+), 60 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
index 450d1f1cca39f..354955ba54402 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
@@ -15,80 +15,71 @@
             <description value="Sorting products by websites in Admin"/>
         </annotations>
         <before>
-            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
-
-            <!--Create Website -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create new website -->
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
                 <argument name="newWebsiteName" value="Second Website"/>
                 <argument name="websiteCode" value="second_website"/>
             </actionGroup>
-
-            <!--Create Store -->
-            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
-                <argument name="website" value="Second Website"/>
-                <argument name="storeGroupName" value="Second Store"/>
-                <argument name="storeGroupCode" value="second_store"/>
-            </actionGroup>
-
-            <!--Create Store view -->
-            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-            <waitForPageLoad stepKey="waitForSystemStorePage"/>
-            <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
-            <waitForPageLoad stepKey="waitForProductPageLoad"/>
-            <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
-            <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
-            <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-            <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-            <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
-            <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView" />
-            <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
-            <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
-            <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
-            <waitForPageLoad stepKey="waitForPageLoad2" time="180" />
-            <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" time="150" stepKey="waitForPageReolad"/>
-            <see userInput="You saved the store view." stepKey="seeSavedMessage" />
-
-            <!--Create a Simple Product 1 -->
-            <actionGroup ref="createSimpleProductAndAddToWebsite" stepKey="createSimpleProduct1">
-                <argument name="product" value="simpleProductForMassUpdate"/>
-                <argument name="website" value="Second Website"/>
-            </actionGroup>
-
-            <!--Create a Simple Product 2 -->
-            <actionGroup ref="createSimpleProductAndAddToWebsite" stepKey="createSimpleProduct2">
-                <argument name="product" value="simpleProductForMassUpdate2"/>
-                <argument name="website" value="Second Website"/>
-            </actionGroup>
         </before>
         <after>
-            <!--Delete website -->
-            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
                 <argument name="websiteName" value="Second Website"/>
             </actionGroup>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-
-            <!--Delete Products -->
-            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
-                <argument name="productName" value="simpleProductForMassUpdate.name"/>
-            </actionGroup>
-            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct2">
-                <argument name="productName" value="simpleProductForMassUpdate2.name"/>
-            </actionGroup>
-            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
+        <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
+        <!--Create a Simple Product -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
         <waitForPageLoad stepKey="waitForCatalogProductGrid"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+
+        <!--Save the product -->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitProductPageSave"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeProductSavedMessage"/>
+
+        <!-- Add this product to second website -->
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/>
+        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductPagetoSaveAgain"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
 
-        <!--Sort Ascending-->
+        <!--Create a Simple Product 2 -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <waitForPageLoad stepKey="waitForProductToggleToSelectSimpleProduct"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickSimpleProductFromDropDownList"/>
+
+        <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"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton2"/>
+        <waitForPageLoad stepKey="waitForSimpleProductToSave"/>
+        <!-- Verify customer see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid2"/>
+        <waitForPageLoad stepKey="waitForCatalogProductGrid2"/>
+
+        <!--Sorting works (By Websites) ASC-->
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultSortingWebsites"/>
         <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
-        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Main Website', 'Country of Manufacture')}}" stepKey="getFirstWebsitesSortAsc"/>
-        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Second Website', 'Country of Manufacture')}}" stepKey="getSecondWebsitesSortAsc"/>
-        <assertLessThanOrEqual expected="$getSecondPriceSortAsc" actual="$getFirstPriceSortAsc" stepKey="checkPriceAscSortCorrect"/>
-        <!--Sort Descending-->
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Main Website" stepKey="checkIfProduct1WebsitesAsc"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="Second Website" stepKey="checkIfProduct2WebsitesAsc"/>
+
+        <!--Sorting works (By Websites) DESC-->
         <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
-        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Main Website', 'Country of Manufacture')}}" stepKey="getFirstWebsitesSortDesc"/>
-        <grabTextFrom selector="{{AdminProductGridSection.productGridCell('Second Website', 'Country of Manufacture')}}" stepKey="getSecondWebsitesSortDesc"/>
-        <assertGreaterThanOrEqual expected="$getSecondWebsitesSortDesc" actual="$getFirstWebsitesSortDesc" stepKey="checkWebsitesDescSortCorrect"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Second Website" stepKey="checkIfProduct1WebsitesDesc"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="Main Website" stepKey="checkIfProduct2WebsitesDesc"/>
     </test>
 </tests>

From ffbf8e6da2f597dbb6d8ad6cfbe628903721648d Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Mon, 15 Oct 2018 15:55:13 +0300
Subject: [PATCH 0263/1055] MAGETWO-64838: Unable to create order from store
 front if customer address custom attribute is required.

- Fixed an issue witn incorrent work of file/image custom attributes on checkout;
---
 .../Controller/Address/File/Upload.php        | 146 ++++++
 .../Magento/Customer/Model/FileProcessor.php  |   5 +-
 .../base/web/js/form/element/file-uploader.js |   3 +-
 .../web/js/form/element/image-uploader.js     |   3 +-
 .../form/element/uploader/uploader.html       |  37 ++
 .../css/source/module/checkout/_checkout.less |   2 +
 .../checkout/fields/_file-uploader.less       | 450 ++++++++++++++++++
 .../Magento/luma/web/css/source/_forms.less   |   4 +
 .../CustomAttribute/PreprocessorInterface.php |  29 ++
 .../Webapi/ServiceInputProcessor.php          |  30 +-
 lib/web/css/source/lib/variables/_colors.less |  10 +
 11 files changed, 712 insertions(+), 7 deletions(-)
 create mode 100644 app/code/Magento/Customer/Controller/Address/File/Upload.php
 create mode 100644 app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
 create mode 100644 app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
 create mode 100644 lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php

diff --git a/app/code/Magento/Customer/Controller/Address/File/Upload.php b/app/code/Magento/Customer/Controller/Address/File/Upload.php
new file mode 100644
index 0000000000000..dbbea482b0e52
--- /dev/null
+++ b/app/code/Magento/Customer/Controller/Address/File/Upload.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Controller\Address\File;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Api\CustomAttributesDataInterface;
+use Magento\Customer\Api\AddressMetadataInterface;
+use Magento\Customer\Model\FileUploader;
+use Magento\Customer\Model\FileUploaderFactory;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Psr\Log\LoggerInterface;
+use Magento\Customer\Model\FileProcessorFactory;
+
+/**
+ * Class for upload files for customer custom address attributes
+ */
+class Upload extends Action implements HttpPostActionInterface
+{
+    /**
+     * @var FileUploaderFactory
+     */
+    private $fileUploaderFactory;
+
+    /**
+     * @var AddressMetadataInterface
+     */
+    private $addressMetadataService;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var FileProcessorFactory
+     */
+    private $fileProcessorFactory;
+
+    /**
+     * @param Context $context
+     * @param FileUploaderFactory $fileUploaderFactory
+     * @param AddressMetadataInterface $addressMetadataService
+     * @param LoggerInterface $logger
+     * @param FileProcessorFactory $fileProcessorFactory
+     */
+    public function __construct(
+        Context $context,
+        FileUploaderFactory $fileUploaderFactory,
+        AddressMetadataInterface $addressMetadataService,
+        LoggerInterface $logger,
+        FileProcessorFactory $fileProcessorFactory
+    ) {
+        $this->fileUploaderFactory = $fileUploaderFactory;
+        $this->addressMetadataService = $addressMetadataService;
+        $this->logger = $logger;
+        $this->fileProcessorFactory = $fileProcessorFactory;
+        parent::__construct($context);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        try {
+            $requestedFiles = $this->getRequest()->getFiles('custom_attributes');
+            if (empty($requestedFiles)) {
+                $result = $this->processError(__('No files for upload.'));
+            } else {
+                $attributeCode = key($requestedFiles);
+                $attributeMetadata = $this->addressMetadataService->getAttributeMetadata($attributeCode);
+
+                /** @var FileUploader $fileUploader */
+                $fileUploader = $this->fileUploaderFactory->create([
+                    'attributeMetadata' => $attributeMetadata,
+                    'entityTypeCode' => AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
+                    'scope' => CustomAttributesDataInterface::CUSTOM_ATTRIBUTES,
+                ]);
+
+                $errors = $fileUploader->validate();
+                if (true !== $errors) {
+                    $errorMessage = implode('</br>', $errors);
+                    $result = $this->processError(($errorMessage));
+                } else {
+                    $result = $fileUploader->upload();
+                }
+            }
+        } catch (LocalizedException $e) {
+            $result = $this->processError($e->getMessage(), $e->getCode());
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+            $result = $this->processError($e->getMessage(), $e->getCode());
+        }
+
+        $this->moveTmpFileToSuitableFolder($result);
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $resultJson->setData($result);
+        return $resultJson;
+    }
+
+    /**
+     * Move file from temporary folder to the 'customer_address' media folder
+     *
+     * @param array $fileInfo
+     * @throws LocalizedException
+     */
+    private function moveTmpFileToSuitableFolder(&$fileInfo)
+    {
+        $fileName = $fileInfo['file'];
+        $fileProcessor = $this->fileProcessorFactory
+            ->create(['entityTypeCode' => AddressMetadataInterface::ENTITY_TYPE_ADDRESS]);
+
+        $newFilePath = $fileProcessor->moveTemporaryFile($fileName);
+        $fileInfo['file'] = $newFilePath;
+        $fileInfo['url'] = $fileProcessor->getViewUrl(
+            $newFilePath,
+            'file'
+        );
+    }
+
+    /**
+     * Prepare result array for errors
+     *
+     * @param string $message
+     * @param int $code
+     * @return array
+     */
+    private function processError($message, $code = 0)
+    {
+        $result = [
+            'error' => $message,
+            'errorcode' => $code,
+        ];
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/FileProcessor.php b/app/code/Magento/Customer/Model/FileProcessor.php
index 6a8472758c169..e7e235b31fe49 100644
--- a/app/code/Magento/Customer/Model/FileProcessor.php
+++ b/app/code/Magento/Customer/Model/FileProcessor.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Customer\Model;
 
+/**
+ * Processor class for work with uploaded files
+ */
 class FileProcessor
 {
     /**
@@ -232,7 +235,7 @@ public function moveTemporaryFile($fileName)
             );
         }
 
-        $fileName = $dispersionPath . '/' . $fileName;
+        $fileName = $dispersionPath . '/' . $destinationFileName;
         return $fileName;
     }
 
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index 2c5bc1159dd3a..f28569caa0053 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -16,7 +16,8 @@ define([
     'Magento_Ui/js/form/element/abstract',
     'mage/backend/notification',
     'mage/translate',
-    'jquery/file-uploader'
+    'jquery/file-uploader',
+    'mage/adminhtml/tools'
 ], function ($, _, utils, uiAlert, validator, Element, notification, $t) {
     'use strict';
 
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
index 0ae09f14fa946..b490ac557e71b 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
@@ -11,8 +11,7 @@ define([
     'Magento_Ui/js/modal/alert',
     'Magento_Ui/js/lib/validation/validator',
     'Magento_Ui/js/form/element/file-uploader',
-    'mage/adminhtml/browser',
-    'mage/adminhtml/tools'
+    'mage/adminhtml/browser'
 ], function ($, _, utils, uiAlert, validator, Element, browser) {
     'use strict';
 
diff --git a/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
new file mode 100644
index 0000000000000..226ad2915bb61
--- /dev/null
+++ b/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
@@ -0,0 +1,37 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<div class="field-control" css="'_with-tooltip': $data.tooltip">
+    <div class="file-uploader" data-role="drop-zone" css="_loading: isLoading">
+        <div class="file-uploader-area">
+            <input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles"
+                   disable="disabled"/>
+            <label class="file-uploader-button action-default" attr="for: uid" translate="'Upload'"/>
+
+            <span class="file-uploader-spinner"/>
+            <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+        </div>
+
+        <render args="tooltipTpl" if="$data.tooltip"/>
+
+        <div class="field-note" if="$data.notice" attr="id: noticeId">
+            <span html="notice"/>
+        </div>
+
+        <each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"/>
+
+        <div if="isMultipleFiles" class="file-uploader-summary">
+            <label attr="for: uid"
+                   class="file-uploader-placeholder"
+                   css="'placeholder-' + placeholderType">
+                    <span class="file-uploader-placeholder-text"
+                          translate="'Click here or drag and drop to add files.'"/>
+            </label>
+        </div>
+    </div>
+    <render args="$data.service.template" if="$data.hasService()"/>
+</div>
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 3ea1f5b7f6842..ac5ab0d87bf62 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
@@ -7,6 +7,8 @@
 //  Variables
 //  _____________________________________________
 
+@import 'fields/_file-uploader.less';
+
 @checkout-wrapper__margin: @indent__base;
 @checkout-wrapper__columns: 16;
 
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
new file mode 100644
index 0000000000000..7b06186ef9ad3
--- /dev/null
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/fields/_file-uploader.less
@@ -0,0 +1,450 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Components -> Single File Uploader
+//  _____________________________________________
+
+//
+//  Variables
+//  ---------------------------------------------
+
+@icon-delete__content: '\e604';
+@icon-file__content: '\e626';
+
+
+@file-uploader-preview__border-color: @color-lighter-grayish;
+@file-uploader-preview__background-color: @color-white;
+@file-uploader-preview-focus__color: @color-blue2;
+
+@file-uploader-document-icon__color: @color-gray80;
+@file-uploader-document-icon__size: 7rem;
+@file-uploader-document-icon__z-index: @data-grid-file-uploader-image__z-index + 1;
+
+@file-uploader-video-icon__color: @color-gray80;
+@file-uploader-video-icon__size: 4rem;
+@file-uploader-video-icon__z-index: @data-grid-file-uploader-image__z-index + 1;
+
+@file-uploader-placeholder-icon__color: @color-gray80;
+@file-uploader-placeholder-icon__z-index: @data-grid-file-uploader-image__z-index + 1;
+
+@file-uploader-delete-icon__color: @color-brownie;
+@file-uploader-delete-icon__hover__color: @color-brownie-vanilla;
+@file-uploader-delete-icon__font-size: 1.6rem;
+
+@file-uploader-muted-text__color: @color-gray62;
+
+@file-uploader-preview__width: 150px;
+@file-uploader-preview__height: @file-uploader-preview__width;
+@file-uploader-preview__opacity: .7;
+
+@file-uploader-spinner-dimensions: 15px;
+
+@file-uploader-dragover__background: @color-gray83;
+@file-uploader-dragover-focus__color: @color-blue2;
+
+//  Grid uploader
+
+@data-grid-file-uploader-image__size: 5rem;
+@data-grid-file-uploader-image__z-index: 1;
+
+@data-grid-file-uploader-menu-button__width: 2rem;
+
+@data-grid-file-uploader-upload-icon__color: @color-darkie-gray;
+@data-grid-file-uploader-upload-icon__hover__color: @color-very-dark-gray;
+@data-grid-file-uploader-upload-icon__line-height: 48px;
+
+@data-grid-file-uploader-wrapper__size: @data-grid-file-uploader-image__size + 2rem;
+
+//
+//  Single file uploader
+//  ---------------------------------------------
+
+.file-uploader-area {
+    position: relative;
+
+    input[type='file'] {
+        cursor: pointer;
+        opacity: 0;
+        overflow: hidden;
+        position: absolute;
+        visibility: hidden;
+        width: 0;
+
+        &:focus {
+            + .file-uploader-button {
+                box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
+            }
+        }
+
+        &:disabled {
+            + .file-uploader-button {
+                cursor: default;
+                opacity: .5;
+                pointer-events: none;
+            }
+        }
+    }
+}
+
+.file-uploader-summary {
+    display: inline-block;
+    vertical-align: top;
+}
+
+.file-uploader-button {
+    background: @color-gray-darken0;
+    border: 1px solid @color-gray_light;
+    box-sizing: border-box;
+    color: @color-black_dark;
+    cursor: pointer;
+    display: inline-block;
+    font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    font-size: 1.4rem;
+    font-weight: 600;
+    line-height: 1.6rem;
+    margin: 0;
+    padding: 7px 15px;
+    vertical-align: middle;
+
+    &._is-dragover {
+        background: @file-uploader-dragover__background;
+        border: 1px solid @file-uploader-preview-focus__color;
+    }
+}
+
+.file-uploader-spinner {
+    background-image: url('@{baseDir}images/loader-1.gif');
+    background-position: 50%;
+    background-repeat: no-repeat;
+    background-size: @file-uploader-spinner-dimensions;
+    display: none;
+    height: 30px;
+    margin-left: @indent__s;
+    vertical-align: top;
+    width: @file-uploader-spinner-dimensions;
+}
+
+.file-uploader-preview {
+    .action-remove {
+        &:extend(.abs-action-reset all);
+        .lib-icon-font (
+                @icon-delete__content,
+            @_icon-font: @icons__font-name,
+            @_icon-font-size: @file-uploader-delete-icon__font-size,
+            @_icon-font-color: @file-uploader-delete-icon__color,
+            @_icon-font-color-hover: @file-uploader-delete-icon__hover__color,
+            @_icon-font-text-hide: true,
+            @_icon-font-display: block
+        );
+        bottom: 4px;
+        cursor: pointer;
+        display: block;
+        height: 27px;
+        left: 6px;
+        padding: 2px;
+        position: absolute;
+        text-decoration: none;
+        width: 25px;
+        z-index: 2;
+    }
+
+    &:hover {
+        .preview-image img,
+        .preview-link:before {
+            opacity: @file-uploader-preview__opacity;
+        }
+    }
+
+    .preview-link {
+        display: block;
+        height: 100%;
+    }
+
+    .preview-image img {
+        bottom: 0;
+        left: 0;
+        margin: auto;
+        max-height: 100%;
+        max-width: 100%;
+        position: absolute;
+        right: 0;
+        top: 0;
+        z-index: 1;
+    }
+
+    .preview-video {
+        .lib-icon-font(
+                @icon-file__content,
+            @_icon-font: @icons__font-name,
+            @_icon-font-size: @file-uploader-video-icon__size,
+            @_icon-font-color: @file-uploader-video-icon__color,
+            @_icon-font-color-hover: @file-uploader-video-icon__color
+        );
+
+        &:before {
+            left: 0;
+            margin-top: -@file-uploader-video-icon__size / 2;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            z-index: @file-uploader-video-icon__z-index;
+        }
+    }
+
+    .preview-document {
+        .lib-icon-font(
+                @icon-file__content,
+            @_icon-font: @icons__font-name,
+            @_icon-font-size: @file-uploader-document-icon__size,
+            @_icon-font-color: @file-uploader-document-icon__color,
+            @_icon-font-color-hover: @file-uploader-document-icon__color
+        );
+
+        &:before {
+            left: 0;
+            margin-top: -@file-uploader-document-icon__size / 2;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            z-index: @file-uploader-document-icon__z-index;
+        }
+    }
+}
+
+.file-uploader-preview,
+.file-uploader-placeholder {
+    background: @file-uploader-preview__background-color;
+    border: 1px solid @file-uploader-preview__border-color;
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    height: @file-uploader-preview__height;
+    line-height: 1;
+    margin: @indent__s @indent__m @indent__s 0;
+    overflow: hidden;
+    position: relative;
+    width: @file-uploader-preview__width;
+}
+
+.file-uploader {
+    &._loading {
+        .file-uploader-spinner {
+            display: inline-block;
+        }
+    }
+
+    .admin__field-note,
+    .admin__field-error {
+        margin-bottom: @indent__s;
+    }
+
+    .file-uploader-filename {
+        .lib-text-overflow();
+        max-width: @file-uploader-preview__width;
+        word-break: break-all;
+
+        &:first-child {
+            margin-bottom: @indent__s;
+        }
+    }
+
+    .file-uploader-meta {
+        color: @file-uploader-muted-text__color;
+    }
+
+    .admin__field-fallback-reset {
+        margin-left: @indent__s;
+    }
+
+    ._keyfocus & .action-remove {
+        &:focus {
+            box-shadow: 0 0 0 1px @file-uploader-preview-focus__color;
+        }
+    }
+}
+
+//  Placeholder for multiple uploader
+.file-uploader-placeholder {
+    &.placeholder-document {
+        .lib-icon-font(
+                @icon-file__content,
+            @_icon-font: @icons__font-name,
+            @_icon-font-size: 5rem,
+            @_icon-font-color: @file-uploader-placeholder-icon__color,
+            @_icon-font-color-hover: @file-uploader-placeholder-icon__color
+        );
+
+        &:before {
+            left: 0;
+            position: absolute;
+            right: 0;
+            top: 20px;
+            z-index: @file-uploader-placeholder-icon__z-index;
+        }
+    }
+
+    &.placeholder-image {
+        .lib-icon-font(
+                @icon-file__content,
+            @_icon-font: @icons__font-name,
+            @_icon-font-size: 5rem,
+            @_icon-font-color: @file-uploader-placeholder-icon__color,
+            @_icon-font-color-hover: @file-uploader-placeholder-icon__color
+        );
+
+        &:before {
+            left: 0;
+            position: absolute;
+            right: 0;
+            top: 20px;
+            z-index: @file-uploader-placeholder-icon__z-index;
+        }
+    }
+
+    &.placeholder-video {
+        .lib-icon-font(
+                @icon-file__content,
+            @_icon-font: @icons__font-name,
+            @_icon-font-size: 3rem,
+            @_icon-font-color: @file-uploader-placeholder-icon__color,
+            @_icon-font-color-hover: @file-uploader-placeholder-icon__color
+        );
+
+        &:before {
+            left: 0;
+            position: absolute;
+            right: 0;
+            top: 30px;
+            z-index: @file-uploader-placeholder-icon__z-index;
+        }
+    }
+}
+
+.file-uploader-placeholder-text {
+    bottom: 0;
+    color: @color-blue-dodger;
+    font-size: 1.1rem;
+    left: 0;
+    line-height: @line-height__base;
+    margin-bottom: 15%;
+    padding: 0 @indent__base;
+    position: absolute;
+    right: 0;
+    text-align: center;
+}
+
+//
+//  Grid image uploader
+//  ---------------------------------------------
+
+.data-grid-file-uploader {
+    min-width: @data-grid-file-uploader-wrapper__size;
+
+    &._loading {
+        .file-uploader-spinner {
+            display: block;
+        }
+
+        .file-uploader-button {
+            &:before {
+                display: none;
+            }
+        }
+    }
+
+    .file-uploader-image {
+        background: transparent;
+        bottom: 0;
+        left: 0;
+        margin: auto;
+        max-height: 100%;
+        max-width: 100%;
+        position: absolute;
+        right: 0;
+        top: 0;
+        z-index: @data-grid-file-uploader-image__z-index;
+
+        + .file-uploader-area {
+            .file-uploader-button {
+                &:before {
+                    display: none;
+                }
+            }
+        }
+    }
+
+    .file-uploader-area {
+        z-index: @data-grid-file-uploader-image__z-index + 1;
+    }
+
+    .file-uploader-spinner {
+        height: 100%;
+        margin: 0;
+        position: absolute;
+        top: 0;
+        width: 100%;
+    }
+
+    .file-uploader-button {
+        display: block;
+        height: @data-grid-file-uploader-upload-icon__line-height;
+        text-align: center;
+
+        .lib-icon-font (
+                @icon-file__content,
+            @_icon-font: @icons__font-name,
+            @_icon-font-size: 1.3rem,
+            @_icon-font-line-height: @data-grid-file-uploader-upload-icon__line-height,
+            @_icon-font-color: @data-grid-file-uploader-upload-icon__color,
+            @_icon-font-color-hover: @data-grid-file-uploader-upload-icon__hover__color,
+            @_icon-font-text-hide: true,
+            @_icon-font-display: block
+        );
+    }
+
+    .action-select-wrap {
+        float: left;
+
+        .action-select {
+            border: 1px solid @file-uploader-preview__border-color;
+            display: block;
+            height: @data-grid-file-uploader-image__size;
+            margin-left: -1px;
+            padding: 0;
+            width: @data-grid-file-uploader-menu-button__width;
+
+            &:after {
+                border-color: @data-grid-file-uploader-upload-icon__color transparent transparent transparent;
+                left: 50%;
+                margin: 0 0 0 -5px;
+            }
+
+            &:hover {
+                &:after {
+                    border-color: @data-grid-file-uploader-upload-icon__hover__color transparent transparent transparent;
+                }
+            }
+
+            > span {
+                display: none;
+            }
+        }
+
+        .action-menu {
+            left: 4rem;
+            right: auto;
+            z-index: @data-grid-file-uploader-image__z-index + 1;
+        }
+    }
+}
+
+.data-grid-file-uploader-inner {
+    border: 1px solid @file-uploader-preview__border-color;
+    float: left;
+    height: @data-grid-file-uploader-image__size;
+    position: relative;
+    width: @data-grid-file-uploader-image__size;
+}
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 98dd57dead74c..b92a2b5070b8f 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -104,6 +104,10 @@
         .select-styling();
     }
 
+    select.admin__control-multiselect {
+        height: auto;
+    }
+
     .field-error,
     div.mage-error[generated] {
         margin-top: 7px;
diff --git a/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
new file mode 100644
index 0000000000000..0f8743f057601
--- /dev/null
+++ b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Webapi\CustomAttribute;
+
+/**
+ * Interface for attribute preprocessor
+ */
+interface PreprocessorInterface
+{
+    /**
+     * Check if this attribute data should be prepared
+     *
+     * @param string $key
+     * @param mixed $attribute
+     * @return bool
+     */
+    public function shouldBePrepared($key, $attribute);
+
+    /**
+     * Prepare attribute object according to type rules
+     *
+     * @param string $key
+     * @param mixed $attribute
+     */
+    public function prepare($key, &$attribute);
+}
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index a9b553f6dd6f9..616cbd6596522 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -20,6 +20,7 @@
 use Magento\Framework\Reflection\MethodsMap;
 use Magento\Framework\Reflection\TypeProcessor;
 use Magento\Framework\Webapi\Exception as WebapiException;
+use Magento\Framework\Webapi\CustomAttribute\PreprocessorInterface;
 use Zend\Code\Reflection\ClassReflection;
 
 /**
@@ -72,6 +73,11 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
      */
     private $config;
 
+    /**
+     * @var PreprocessorInterface[]
+     */
+    private $customAttributePreprocessors;
+
     /**
      * Initialize dependencies.
      *
@@ -82,6 +88,7 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
      * @param MethodsMap $methodsMap
      * @param ServiceTypeToEntityTypeMap $serviceTypeToEntityTypeMap
      * @param ConfigInterface $config
+     * @param array $customAttributePreprocessors
      */
     public function __construct(
         TypeProcessor $typeProcessor,
@@ -90,7 +97,8 @@ public function __construct(
         CustomAttributeTypeLocatorInterface $customAttributeTypeLocator,
         MethodsMap $methodsMap,
         ServiceTypeToEntityTypeMap $serviceTypeToEntityTypeMap = null,
-        ConfigInterface $config = null
+        ConfigInterface $config = null,
+        array $customAttributePreprocessors = []
     ) {
         $this->typeProcessor = $typeProcessor;
         $this->objectManager = $objectManager;
@@ -101,6 +109,7 @@ public function __construct(
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ServiceTypeToEntityTypeMap::class);
         $this->config = $config
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ConfigInterface::class);
+        $this->customAttributePreprocessors = $customAttributePreprocessors;
     }
 
     /**
@@ -289,12 +298,11 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
         $dataObjectClassName = ltrim($dataObjectClassName, '\\');
 
         foreach ($customAttributesValueArray as $key => $customAttribute) {
+            $this->runCustomAttributePreprocessors($key, $customAttribute);
             if (!is_array($customAttribute)) {
                 $customAttribute = [AttributeValue::ATTRIBUTE_CODE => $key, AttributeValue::VALUE => $customAttribute];
             }
-
             list($customAttributeCode, $customAttributeValue) = $this->processCustomAttribute($customAttribute);
-
             $entityType = $this->serviceTypeToEntityTypeMap->getEntityType($dataObjectClassName);
             if ($entityType) {
                 $type = $this->customAttributeTypeLocator->getType(
@@ -331,6 +339,22 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
         return $result;
     }
 
+    /**
+     * Prepare attribute value by loaded attribute preprocessors
+     *
+     * @param string $key
+     * @param mixed $customAttribute
+     * @return bool
+     */
+    private function runCustomAttributePreprocessors($key, &$customAttribute)
+    {
+        foreach ($this->customAttributePreprocessors as $attributePreprocessor) {
+            if ($attributePreprocessor->shouldBePrepared($key, $customAttribute)) {
+                $attributePreprocessor->prepare($key, $customAttribute);
+            }
+        }
+    }
+
     /**
      * Derive the custom attribute code and value.
      *
diff --git a/lib/web/css/source/lib/variables/_colors.less b/lib/web/css/source/lib/variables/_colors.less
index 9c694468e9f62..ffb0e8e797d81 100644
--- a/lib/web/css/source/lib/variables/_colors.less
+++ b/lib/web/css/source/lib/variables/_colors.less
@@ -7,9 +7,13 @@
 //  Color variables
 //  _____________________________________________
 
+@color-blue-dodger: #008bdb;
+@color-black_dark: #333333;
+
 @color-white: #fff;
 @color-black: #000;
 
+@color-darkie-gray: #8a837f;
 @color-gray19: #303030;
 @color-gray20: #333;
 @color-gray34: #575757;
@@ -29,12 +33,16 @@
 @color-gray79: #c9c9c9;
 @color-gray80: #ccc;
 @color-gray82: #d1d1d1;
+@color-gray83: #d4d4d4;
 @color-gray89: #e3e3e3;
 @color-gray90: #e5e5e5;
 @color-gray91: #e8e8e8;
 @color-gray92: #ebebeb;
 @color-gray94: #f0f0f0;
 @color-gray95: #f2f2f2;
+@color-gray_light: #cccccc;
+@color-lighter-grayish: #cacaca;
+@color-very-dark-gray: #666;
 @color-white-smoke: #f5f5f5;
 @color-white-dark-smoke: #efefef;
 @color-white-fog: #f8f8f8;
@@ -80,6 +88,8 @@
 @color-pink1: #fae5e5;
 @color-dark-pink1: #800080; // Legacy pink
 
+@color-brownie: #514943;
+@color-brownie-vanilla: #736963;
 @color-brownie1: #6f4400;
 @color-brownie-light1: #c07600;
 

From 4cb3e37fc2a427ab1f0508a47d25803bb8b84c60 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 22 Feb 2019 15:21:54 +0200
Subject: [PATCH 0264/1055] MC-13948: [FT] [MFTF]
 AdminCartRulesAppliedForProductInCartTest fails because of bad design

---
 .../ActionGroup/AddProductToCartActionGroup.xml    | 10 +++++++---
 .../Mftf/ActionGroup/AdminProductActionGroup.xml   |  2 +-
 .../ActionGroup/AdminProductGridActionGroup.xml    |  7 ++++---
 .../AdminCartRulesAppliedForProductInCartTest.xml  | 14 ++++++++++----
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
index 692487c1d60cd..c06ecc689a089 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
@@ -11,9 +11,13 @@
         <arguments>
             <argument name="product" defaultValue="product"/>
         </arguments>
-        <amOnPage url="/{{product.name}}.html" stepKey="navigateProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
-        <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
-        <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
+        <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
+        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAddToCart}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAddToCart"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" time="30" stepKey="waitForProductAddedMessage"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{product.name}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
     </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 3afdc41888c79..9068fb56801c9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -15,7 +15,7 @@
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForElementVisible selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="waitForAddProductDropdown" time="30"/>
         <click selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="clickAddProductType"/>
-        <waitForPageLoad stepKey="waitForCreateProductPageLoad"/>
+        <waitForPageLoad time="30" stepKey="waitForCreateProductPageLoad"/>
         <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, product.type_id)}}" stepKey="seeNewProductUrl"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeNewProductTitle"/>
     </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index f0367fb72c6a2..da0e748a3d214 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -192,7 +192,7 @@
         </arguments>
         <!--TODO use other action group for filtering grid when MQE-539 is implemented -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
         <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
@@ -201,8 +201,9 @@
         <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
         <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
         <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
-        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
-        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmProductDelete"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="record(s) have been deleted." stepKey="seeSuccessMessage"/>
     </actionGroup>
 
     <actionGroup name="deleteProductByName" extends="deleteProductBySku">
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
index fbcc871a69b97..ab085dc5ae137 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
@@ -21,26 +21,30 @@
         </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>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
+
         <after>
             <!--Delete created data-->
             <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
 
-            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+            <actionGroup ref="deleteProductBySku" stepKey="deleteBundleProduct">
                 <argument name="sku" value="{{BundleProduct.sku}}"/>
             </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters"/>
+
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
                 <argument name="ruleName" value="{{PriceRuleWithCondition.name}}"/>
             </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters1"/>
 
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
@@ -57,12 +61,14 @@
         <pressKey selector="{{AdminProductFormSection.productSku}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="enter"/>
 
         <!--Off dynamic price and set value-->
+        <scrollToTopOfPage stepKey="scrollToTopOfThePageToSeePriceTypeElement"/>
         <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"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.selectCategory}}" stepKey="waitForElementLoaded"/>
         <click selector="{{AdminProductFormBundleSection.selectCategory}}" stepKey="selectCategory"/>
         <click selector="{{AdminProductFormBundleSection.categoriesLabel}}" stepKey="clickOnCategoriesLabelToCloseOptions"/>
 
@@ -92,7 +98,7 @@
         </actionGroup>
 
         <!--Go to Storefront and add product to cart and checkout from cart-->
-        <amOnPage url="/$$simpleProduct.name$$.html" stepKey="GoToProduct"/>
+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="2" stepKey="setQuantity"/>
         <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="AddProductToCard">
             <argument name="productName" value="$$simpleProduct.name$$"/>

From 596cabe7e59436bcae4b0d4d2347aedba746537a Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Fri, 22 Feb 2019 08:27:08 -0600
Subject: [PATCH 0265/1055] MC-4433: Convert SearchEntityResultsTest to MFTF

- variations 6-15 complete
---
 .../StorefrontProductCartActionGroup.xml      |  11 +
 .../ActionGroup/AdminProductActionGroup.xml   |   8 +
 .../AdminProductAttributeActionGroup.xml      |  53 +++
 .../Mftf/Data/ProductAttributeSetData.xml     |   6 +
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  12 +
 .../AdminProductFormAttributeSection.xml      |  17 +-
 .../Mftf/Section/AdminProductFormSection.xml  |   3 +-
 .../StorefrontCatalogSearchActionGroup.xml    |  20 +-
 .../Mftf/Test/SearchEntityResultsTest.xml     | 394 +++++++++++++++++-
 .../StorefrontQuickSearchResultsSection.xml   |   3 +-
 10 files changed, 513 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index e36730a87b41a..8813ad97e54d3 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -38,4 +38,15 @@
         <waitForElementVisible selector="{{StorefrontMinicartSection.productCount}}" stepKey="waitProductCount"/>
         <see userInput="You added {{productName}} to your shopping cart." selector="{{StorefrontMessagesSection.success}}" stepKey="seeSuccessMessage"/>
     </actionGroup>
+
+    <!-- Add Bundle Product to Cart from product Page-->
+    <actionGroup name="StorefrontAddBundleProductFromProductToCartActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomizeAndAddToCart"/>
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="clickAddBundleProductToCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.productCount}}" stepKey="waitProductCount"/>
+        <see userInput="You added {{productName}} to your shopping cart." selector="{{StorefrontMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+    </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 3afdc41888c79..8358549efb25a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -19,6 +19,14 @@
         <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, product.type_id)}}" stepKey="seeNewProductUrl"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeNewProductTitle"/>
     </actionGroup>
+    
+    <!--Navigate to create product page directly via ID-->
+    <actionGroup name="goToProductPageViaID">
+        <arguments>
+            <argument name="productId" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductEditPage.url(productId)}}" stepKey="goToProduct"/>
+    </actionGroup>
 
     <!--Fill main fields in create product form-->
     <actionGroup name="fillMainProductForm">
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index 0082b376bc4a6..8466a670d3637 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -65,6 +65,59 @@
         <click selector="{{AdminProductFormNewAttributeSection.saveAttribute}}" stepKey="saveAttribute1"/>
     </actionGroup>
 
+    <!-- Creates attribute and attribute set from the product page-->
+    <actionGroup name="AdminProductPageCreateAttributeSetWithAttribute">
+        <arguments>
+            <argument name="attributeName" type="string"/>
+            <argument name="attributeSetName" type="string"/>
+            <argument name="attributeType" type="string" defaultValue="TextField"/>
+        </arguments>
+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
+        <see userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
+        <click selector="{{AdminProductFormAttributeSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
+        <fillField selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" userInput="{{attributeName}}" stepKey="fillAttributeLabel"/>
+        <selectOption selector="{{AdminProductFormNewAttributeSection.attributeType}}" userInput="{{attributeType}}" stepKey="selectAttributeType"/>
+        <click selector="{{AdminProductFormNewAttributeSection.saveInNewSet}}" stepKey="saveAttribute"/>
+        <fillField selector="{{AdminProductFormNewAttributeNewSetSection.setName}}" userInput="{{attributeSetName}}" stepKey="fillSetName"/>
+        <click selector="{{AdminProductFormNewAttributeNewSetSection.accept}}" stepKey="acceptPopup"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingToFinish"/>
+        <!-- Product page will hang if there is no reload-->
+        <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForReload"/>
+    </actionGroup>
+
+    <!-- Create attribute and set with given search weight and defaultValue from the Edit Product Page -->
+    <actionGroup name="AdminCreateAttributeWithSearchWeight" extends="AdminProductPageCreateAttributeSetWithAttribute" insertAfter="selectAttributeType">
+        <arguments>
+            <argument name="weight" type="string" defaultValue="1"/>
+            <argument name="defaultValue" type="string" defaultValue="default"/>
+        </arguments>
+        <click selector="{{AdminProductFormNewAttributeAdvancedSection.sectionHeader}}" stepKey="openAdvancedSection"/>
+        <fillField selector="{{AdminProductFormNewAttributeAdvancedSection.defaultValue}}" userInput="{{defaultValue}}" stepKey="inputDefault"/>
+        <click selector="{{AdminProductFormNewAttributeStorefrontSection.sectionHeader}}" stepKey="openStorefrontSection"/>
+        <checkOption selector="{{AdminProductFormNewAttributeStorefrontSection.useInSearch}}" stepKey="checkUseInSearch"/>
+        <waitForElementVisible selector="{{AdminProductFormNewAttributeStorefrontSection.searchWeight}}" stepKey="waitForSearchWeight"/>
+        <selectOption selector="{{AdminProductFormNewAttributeStorefrontSection.searchWeight}}" userInput="{{weight}}" stepKey="selectWeight"/>
+    </actionGroup>
+    
+    <actionGroup name="AdminProductPageSelectAttributeSet">
+        <arguments>
+            <argument name="attributeSetName" type="string"/>
+        </arguments>
+        <click stepKey="openDropdown" selector="{{AdminProductFormSection.attributeSet}}"/>
+        <fillField stepKey="filter" selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{attributeSetName}}"/>
+        <click stepKey="clickResult" selector="{{AdminProductFormSection.attributeSetFilterResult}}"/>
+    </actionGroup>
+
+    <actionGroup name="AdminProductPageFillTextAttributeValue">
+        <arguments>
+            <argument name="attributeName" type="string"/>
+            <argument name="value" type="string"/>
+        </arguments>
+        <click stepKey="openSection" selector="{{AdminProductAttributeSection.attributeSectionHeader}}"/>
+        <fillField stepKey="fillValue" selector="{{AdminProductAttributeSection.textAttribute(attributeName)}}" userInput="{{value}}"/>
+    </actionGroup>
+
     <actionGroup name="changeUseForPromoRuleConditionsProductAttribute">
         <arguments>
             <argument name="option" type="string"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
index 713c453bb7ad4..6d4314a6d865f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
@@ -20,4 +20,10 @@
         <data key="attributeGroupId">7</data>
         <data key="sortOrder">1</data>
     </entity>
+    <entity name="AddToSetBlank" type="ProductAttributeSet">
+        <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="attributeSetId">0</data>
+        <data key="attributeGroupId">0</data>
+        <data key="sortOrder">0</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 d136661e917cb..8847548e9d12d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -729,4 +729,16 @@
         <data key="attributeGroupId">13</data>
         <data key="sortOrder">0</data>
     </entity>
+    <entity name="productAlphabeticalA" type="product" extends="_defaultProduct">
+        <data key="name" unique="suffix">AAA Product</data>
+    </entity>
+    <entity name="productAlphabeticalB" type="product" extends="_defaultProduct">
+        <data key="name" unique="suffix">BBB Product</data>
+    </entity>
+    <entity name="productWithSpecialCharacters" type="product" extends="_defaultProduct">
+        <data key="name" unique="suffix">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=~` </data>
+    </entity>
+    <entity name="productWith130CharName" type="product" extends="_defaultProduct">
+        <data key="name" unique="suffix">ProductWith128Chars 1234567891123456789112345678911234567891123456789112345678911234567891123456789112345678 endnums</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
index e159a4ce5c0b6..a2a349ed67611 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAttributeSection.xml
@@ -17,8 +17,23 @@
         <element name="addValue" type="button" selector="//button[@data-action='add_new_row']" timeout="30"/>
         <element name="optionViewName" type="text" selector="//table[@data-index='attribute_options_select']//span[contains(text(), '{{arg}}')]" parameterized="true" timeout="30"/>
         <element name="optionValue" type="input" selector="(//input[contains(@name, 'option[value]')])[{{arg}}]" timeout="30" parameterized="true"/>
-        <element name="manageTitlesHeader" type="button" selector="//div[@class='fieldset-wrapper-title']//span[contains(text(), 'Manage Titles')]" timeout="30/"/>
+        <element name="manageTitlesHeader" type="button" selector="//div[@class='fieldset-wrapper-title']//span[contains(text(), 'Manage Titles')]" timeout="30"/>
         <element name="manageTitlesViewName" type="text" selector="//div[@data-index='manage-titles']//span[contains(text(), '{{arg}}')]" timeout="30" parameterized="true"/>
         <element name="saveAttribute" type="button" selector="button#save" timeout="30"/>
+        <element name="saveInNewSet" type="button" selector="button#saveInNewSet" timeout="10"/>
+    </section>
+    <section name="AdminProductFormNewAttributeAdvancedSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='advanced_fieldset']"/>
+        <element name="defaultValue" type="textarea" selector="input[name='default_value_text']"/>
+    </section>
+    <section name="AdminProductFormNewAttributeStorefrontSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='front_fieldset']"/>
+        <element name="useInSearch" type="checkbox" selector="div[data-index='is_searchable'] .admin__field-control label"/>
+        <element name="searchWeight" type="select" selector="select[name='search_weight']"/>
+    </section>
+    <section name="AdminProductFormNewAttributeNewSetSection">
+        <element name="setName" type="button" selector="//div[contains(@class, 'modal-inner-wrap') and .//*[contains(., 'Enter Name for New Attribute Set')]]//input[contains(@class, 'admin__control-text')]"/>
+        <element name="accept" type="button" selector="//div[contains(@class, 'modal-inner-wrap') and .//*[contains(., 'Enter Name for New Attribute Set')]]//button[contains(@class, 'action-accept')]"/>
+        <element name="cancel" type="button" selector="//div[contains(@class, 'modal-inner-wrap') and .//*[contains(., 'Enter Name for New Attribute Set')]]//button[contains(@class, 'action-dismiss')]"/>
     </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 e2338f85c0118..53c1907d64768 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -194,7 +194,8 @@
     </section>
     <section name="AdminProductAttributeSection">
         <element name="attributeSectionHeader" type="button" selector="//div[@data-index='attributes']" timeout="30"/>
+        <element name="textAttribute" type="text" selector="//input[@name='product[{{arg}}]']" parameterized="true"/>
         <element name="dropDownAttribute" type="select" selector="//select[@name='product[{{arg}}]']" parameterized="true" timeout="30"/>
-        <element name="attributeSection" type="div" selector="//div[@data-index='attributes']/div[contains(@class, 'admin__collapsible-content _show')]" timeout="30"/>
+        <element name="attributeSection" type="block" selector="//div[@data-index='attributes']/div[contains(@class, 'admin__collapsible-content _show')]" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index da295a820b7e0..634c117e6207d 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -11,7 +11,7 @@
     <!-- Quick search the phrase and check if the result page contains correct information -->
     <actionGroup name="StorefrontCheckQuickSearchActionGroup">
         <arguments>
-            <argument name="phrase"/>
+            <argument name="phrase" type="string"/>
         </arguments>
         <fillField stepKey="fillInput" selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{phrase}}"/>
         <submitForm selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" parameterArray="[]" stepKey="submitQuickSearch" />
@@ -26,27 +26,37 @@
         <arguments>
             <argument name="productName" type="string"/>
             <argument name="productUrlKey" type="string"/>
-            <argument name="index" defaultValue="1"/>
         </arguments>
-        <click stepKey="openProduct" selector="{{StorefrontQuickSearchResultsSection.productByIndex('1')}}"/>
+        <click stepKey="openProduct" selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}}"/>
         <waitForPageLoad stepKey="waitForProductLoad"/>
         <seeInCurrentUrl url="{{productUrlKey}}" stepKey="checkUrl"/>
         <see stepKey="checkName" selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productName}}"/>
     </actionGroup>
 
+    <!-- Asserts that search results do not contain nay results-->
+    <actionGroup name="StorefrontCheckSearchIsEmpty">
+        <see stepKey="checkEmpty" selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="Your search returned no results"/>
+    </actionGroup>
 
     <!-- Adds product from Quicksearch page and perform assertions-->
     <actionGroup name="StorefrontAddToCartFromQuickSearch">
         <arguments>
             <argument name="productName" type="string"/>
-            <argument name="index" defaultValue="1"/>
         </arguments>
         <moveMouseOver stepKey="hoverOverProduct" selector="{{StorefrontQuickSearchResultsSection.productByIndex('1')}}"/>
-        <click selector="{{StorefrontQuickSearchResultsSection.productByIndex('1')}} {{StorefrontQuickSearchResultsSection.addToCartBtn}}" stepKey="addToCart"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}} {{StorefrontQuickSearchResultsSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontQuickSearchResultsSection.messageSection}}" time="30" stepKey="waitForProductAdded"/>
         <see selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
     </actionGroup>
 
+    <actionGroup name="StorefrontQuickSearchCheckProductNameInGrid">
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="index" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontQuickSearchResultsSection.productByIndex(index)}}" userInput="{{productName}}" stepKey="seeProductName"/>
+    </actionGroup>
+
 
 
 
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
index e7e2a138446e6..3a4b82dc45dbd 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -15,7 +15,8 @@
             <description value="Use Quick Search to find a product"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-14783"/>
-            <group value="Catalog"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -36,6 +37,236 @@
             <argument name="productUrlKey" value="$createSimpleProduct.custom_attributes[url_key]$"/>
         </actionGroup>
     </test>
+    <test name="QuickSearchProductByName" extends="QuickSearchProductBySku">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find products via Name"/>
+            <description value="Use Quick Search to find a product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14791"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <!-- Overwrite search to use name -->
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="$createSimpleProduct.name$"/>
+        </actionGroup>
+    </test>
+    <test name="QuickSearchProductByNameWithSpecialChars" extends="QuickSearchProductBySku">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="Quick Search can find products with names that contain special characters"/>
+            <description value="Use Quick Search to find a product by name"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14792"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="productWithSpecialCharacters" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <!-- Overwrite search to use name -->
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="$createSimpleProduct.name$"/>
+        </actionGroup>
+    </test>
+    <test name="QuickSearchEmptyResults">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should not get search results on query that doesn't return anything"/>
+            <description value="Use invalid query to return no products"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14793"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="ThisShouldn'tReturnAnything"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmpty"/>
+    </test>
+    <test name="QuickSearchWithTwoCharsEmptyResults" extends="QuickSearchEmptyResults">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should not get search results on query that only contains two characters"/>
+            <description value="Use of 2 character query to return no products"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14794"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,2); return ret;" stepKey="getFirstTwoLetters" before="searchStorefront"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="{$getFirstTwoLetters}"/>
+        </actionGroup>
+    </test>
+    <test name="QuickSearchProductByNameWithThreeLetters" extends="QuickSearchProductBySku">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find products by their first three letters"/>
+            <description value="Use Quick Search to find a product using only first three letters"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="NEEDS ZEPHYR TEST"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,3); return ret;" stepKey="getFirstThreeLetters" before="searchStorefront"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="{$getFirstThreeLetters}"/>
+        </actionGroup>
+    </test>
+    <test name="QuickSearchProductBy128CharQuery" extends="QuickSearchProductBySku">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search product with long names, using first 128 letters"/>
+            <description value="Use Quick Search to find a product with name of 130 length with query of only 128"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14795"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="productWith130CharName" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,128); return ret;" stepKey="get128Letters" before="searchStorefront"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="{$get128Letters}"/>
+        </actionGroup>
+    </test>
+
+
+
+
+    <test name="QuickSearchTwoProductsWithSameWeight">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="Quick Search should sort products with the same weight appropriately"/>
+            <description value="Use Quick Search to find a two products with the same weight"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14796"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="productAlphabeticalA" stepKey="product1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAlphabeticalB" stepKey="product2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+
+
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+            <actionGroup ref="goToProductPageViaID" stepKey="goToProduct1">
+                <argument name="productId" value="$product1.id$"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateAttributeWithSearchWeight" stepKey="createProduct1Attribute">
+                <argument name="attributeType" value="Text Field"/>
+                <argument name="attributeName" value="$product1.name$"/>
+                <argument name="attributeSetName" value="$product1.name$"/>
+                <argument name="weight" value="1"/>
+                <argument name="defaultValue" value="{{_defaultProduct.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttributeSet1">
+                <argument name="attributeSetName" value="$product1.name$"/>
+            </actionGroup>
+            <!--fill in default-->
+            <actionGroup ref="saveProductForm" stepKey="saveProduct1a"/>
+            <actionGroup ref="AdminProductPageFillTextAttributeValue" stepKey="fillDefault1">
+                <argument name="attributeName" value="$product1.name$"/>
+                <argument name="value" value="{{_defaultProduct.name}}"/>
+            </actionGroup>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct1b"/>
+            <!-- Create and Assign Attribute to product2-->
+            <actionGroup ref="goToProductPageViaID" stepKey="goToProduct2">
+                <argument name="productId" value="$product2.id$"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateAttributeWithSearchWeight" stepKey="createProduct2Attribute">
+                <argument name="attributeType" value="Text Field"/>
+                <argument name="attributeName" value="$product2.name$"/>
+                <argument name="attributeSetName" value="$product2.name$"/>
+                <argument name="weight" value="1"/>
+                <argument name="defaultValue" value="{{_defaultProduct.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttributeSet2">
+                <argument name="attributeSetName" value="$product2.name$"/>
+            </actionGroup>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct2a"/>
+            <!--fill in default-->
+            <actionGroup ref="AdminProductPageFillTextAttributeValue" stepKey="fillDefault2">
+                <argument name="attributeName" value="$product2.name$"/>
+                <argument name="value" value="{{_defaultProduct.name}}"/>
+            </actionGroup>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct2b"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
+            <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="{{_defaultProduct.name}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="assertProduct1Position">
+            <argument name="productName" value="$product1.name$"/>
+            <argument name="index" value="2"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="assertProduct2Position">
+            <argument name="productName" value="$product2.name$"/>
+            <argument name="index" value="1"/>
+        </actionGroup>
+    </test>
+
+    <test name="QuickSearchTwoProductsWithDifferentWeight" extends="QuickSearchTwoProductsWithSameWeight">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="Quick Search should sort products with the different weight appropriately"/>
+            <description value="Use Quick Search to find a two products with the different weight"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14797"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminCreateAttributeWithSearchWeight" stepKey="createProduct1Attribute">
+                <argument name="attributeType" value="Text Field"/>
+                <argument name="attributeName" value="$product1.name$"/>
+                <argument name="weight" value="5"/>
+                <argument name="defaultValue" value="{{_defaultProduct.name}}"/>
+            </actionGroup>
+        </before>
+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="assertProduct1Position">
+            <argument name="productName" value="$product1.name$"/>
+            <argument name="index" value="1"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="assertProduct2Position">
+            <argument name="productName" value="$product2.name$"/>
+            <argument name="index" value="2"/>
+        </actionGroup>
+    </test>
+
+
+
+
     <test name="QuickSearchAndAddToCart">
         <annotations>
             <stories value="Search Product on Storefront"/>
@@ -43,7 +274,8 @@
             <description value="Use Quick Search to find simple Product and Add to Cart"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-14784"/>
-            <group value="Catalog"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -70,7 +302,8 @@
             <description value="Use Quick Search to find virtual Product and Add to Cart"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-14785"/>
-            <group value="Catalog"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -97,7 +330,8 @@
             <description value="Use Quick Search to find configurable Product and Add to Cart"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-14786"/>
-            <group value="Catalog"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -127,7 +361,6 @@
             <argument name="optionName" value="{{colorProductAttribute1.name}}"/>
         </actionGroup>
     </test>
-
     <test name="QuickSearchAndAddToCartDownloadable">
         <annotations>
             <stories value="Search Product on Storefront"/>
@@ -135,7 +368,8 @@
             <description value="Use Quick Search to find downloadable Product and Add to Cart"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-14787"/>
-            <group value="Catalog"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -158,4 +392,152 @@
             <argument name="productName" value="$createProduct.name$"/>
         </actionGroup>
     </test>
+    <test name="QuickSearchAndAddToCartGrouped">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find a grouped product and add it to cart"/>
+            <description value="Use Quick Search to find grouped Product and Add to Cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14787"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="simple1"/>
+            <createData entity="ApiGroupedProduct" stepKey="createProduct"/>
+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
+                <requiredEntity createDataKey="createProduct"/>
+                <requiredEntity createDataKey="simple1"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="$createProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
+            <argument name="productName" value="$createProduct.name$"/>
+        </actionGroup>
+    </test>
+    <test name="QuickSearchAndAddToCartBundleDynamic">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find a Bundle Dynamic product and add it to cart"/>
+            <description value="Use Quick Search to find Bundle Dynamic Product and Add to Cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14789"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!--Create dynamic product-->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
+                <requiredEntity createDataKey="createBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="createProduct"/>
+                <field key="qty">10</field>
+            </createData>
+            <!--Finish bundle creation-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="goToProductEditPage"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="$createBundleProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
+            <argument name="productName" value="$createBundleProduct.name$"/>
+            <argument name="productUrlKey" value="$createBundleProduct.custom_attributes[url_key]$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddBundleProductFromProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="productName" value="$createBundleProduct.name$"/>
+        </actionGroup>
+    </test>
+
+    <test name="QuickSearchAndAddToCartBundleFixed">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to find a Bundle Fixed product and add it to cart"/>
+            <description value="Use Quick Search to find Bundle Fixed Product and Add to Cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14788"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!--Create fixed product-->
+            <!--Create 2 simple products-->
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            <!-- Create the bundle product based -->
+            <createData entity="ApiFixedBundleProduct" stepKey="createBundleProduct"/>
+            <createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <field key="required">false</field>
+            </createData>
+            <createData entity="CheckboxOption" stepKey="createBundleOption1_2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+
+            <!--Finish bundle creation-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="goToProductEditPage"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        </before>
+        <!--<after>-->
+        <!--<deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>-->
+        <!--<deleteData stepKey="deleteProduct" createDataKey="createProduct"/>-->
+        <!--<deleteData stepKey="deleteCategory" createDataKey="createCategory"/>-->
+        <!--</after>-->
+        <!--<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>-->
+        <!--<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">-->
+        <!--<argument name="phrase" value="$createBundleProduct.name$"/>-->
+        <!--</actionGroup>-->
+        <!--<actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">-->
+        <!--<argument name="productName" value="$createBundleProduct.name$"/>-->
+        <!--<argument name="productUrlKey" value="$createBundleProduct.custom_attributes[url_key]$"/>-->
+        <!--</actionGroup>-->
+        <!--<actionGroup ref="StorefrontAddBundleProductFromProductToCartActionGroup" stepKey="addProductToCart">-->
+        <!--<argument name="productName" value="$createBundleProduct.name$"/>-->
+        <!--</actionGroup>-->
+    </test>
+
+
+
+
 </tests>
diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
index 5f54f5bce2f47..3ecfceb224b7e 100644
--- a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
@@ -13,7 +13,8 @@
         <element name="searchTextBoxButton" type="button" selector="button[class='action search']"/>
         <element name="productLink" type="select" selector="a[class='product-item-link']"/>
         <element name="productByIndex" type="button" selector=".product-items li:nth-child({{var}}) .product-item-info" parameterized="true"/>
-        <element name="addToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <element name="productByName" type="button" selector="//div[contains(@class, 'product-item-info') and .//*[contains(., '{{var}}')]]" parameterized="true"/>
+        <element name="addToCartBtn" type="button" selector="//button[contains(@class, 'tocart')]"/>
         <element name="messageSection" type="text" selector="div .message"/>
         <element name="asLowAsLabel" type="text" selector=".minimal-price-link > span"/>
         <element name="textArea" type="text" selector="li[class='item']"/>

From e0b510adacd721750839d02162e4189bc38a3e03 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Fri, 22 Feb 2019 08:44:38 -0600
Subject: [PATCH 0266/1055] MC-4433: Convert SearchEntityResultsTest to MFTF

- Refactored and fixed variations 15-16
---
 .../ActionGroup/AdminProductAttributeActionGroup.xml   |  4 ++--
 .../Test/Mftf/Section/AdminProductFormSection.xml      |  3 ++-
 .../Test/Mftf/Test/SearchEntityResultsTest.xml         | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index 8466a670d3637..3bd3754d0888a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -109,13 +109,13 @@
         <click stepKey="clickResult" selector="{{AdminProductFormSection.attributeSetFilterResult}}"/>
     </actionGroup>
 
-    <actionGroup name="AdminProductPageFillTextAttributeValue">
+    <actionGroup name="AdminProductPageFillTextAttributeValueByName">
         <arguments>
             <argument name="attributeName" type="string"/>
             <argument name="value" type="string"/>
         </arguments>
         <click stepKey="openSection" selector="{{AdminProductAttributeSection.attributeSectionHeader}}"/>
-        <fillField stepKey="fillValue" selector="{{AdminProductAttributeSection.textAttribute(attributeName)}}" userInput="{{value}}"/>
+        <fillField stepKey="fillValue" selector="{{AdminProductAttributeSection.textAttributeByName(attributeName)}}" userInput="{{value}}"/>
     </actionGroup>
 
     <actionGroup name="changeUseForPromoRuleConditionsProductAttribute">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 53c1907d64768..fa670b9efc447 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -194,7 +194,8 @@
     </section>
     <section name="AdminProductAttributeSection">
         <element name="attributeSectionHeader" type="button" selector="//div[@data-index='attributes']" timeout="30"/>
-        <element name="textAttribute" type="text" selector="//input[@name='product[{{arg}}]']" parameterized="true"/>
+        <element name="textAttributeByCode" type="text" selector="//input[@name='product[{{arg}}]']" parameterized="true"/>
+        <element name="textAttributeByName" type="text" selector="//div[@data-index='attributes']//fieldset[contains(@class, 'admin__field') and .//*[contains(.,'{{var}}')]]//input" parameterized="true"/>
         <element name="dropDownAttribute" type="select" selector="//select[@name='product[{{arg}}]']" parameterized="true" timeout="30"/>
         <element name="attributeSection" type="block" selector="//div[@data-index='attributes']/div[contains(@class, 'admin__collapsible-content _show')]" timeout="30"/>
     </section>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
index 3a4b82dc45dbd..96cd4b831a226 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -170,11 +170,10 @@
             <createData entity="productAlphabeticalB" stepKey="product2">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
 
-
-
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+            <!-- Create and Assign Attribute to product1-->
             <actionGroup ref="goToProductPageViaID" stepKey="goToProduct1">
                 <argument name="productId" value="$product1.id$"/>
             </actionGroup>
@@ -190,7 +189,7 @@
             </actionGroup>
             <!--fill in default-->
             <actionGroup ref="saveProductForm" stepKey="saveProduct1a"/>
-            <actionGroup ref="AdminProductPageFillTextAttributeValue" stepKey="fillDefault1">
+            <actionGroup ref="AdminProductPageFillTextAttributeValueByName" stepKey="fillDefault1">
                 <argument name="attributeName" value="$product1.name$"/>
                 <argument name="value" value="{{_defaultProduct.name}}"/>
             </actionGroup>
@@ -211,7 +210,7 @@
             </actionGroup>
             <actionGroup ref="saveProductForm" stepKey="saveProduct2a"/>
             <!--fill in default-->
-            <actionGroup ref="AdminProductPageFillTextAttributeValue" stepKey="fillDefault2">
+            <actionGroup ref="AdminProductPageFillTextAttributeValueByName" stepKey="fillDefault2">
                 <argument name="attributeName" value="$product2.name$"/>
                 <argument name="value" value="{{_defaultProduct.name}}"/>
             </actionGroup>
@@ -250,6 +249,7 @@
             <actionGroup ref="AdminCreateAttributeWithSearchWeight" stepKey="createProduct1Attribute">
                 <argument name="attributeType" value="Text Field"/>
                 <argument name="attributeName" value="$product1.name$"/>
+                <argument name="attributeSetName" value="$product1.name$"/>
                 <argument name="weight" value="5"/>
                 <argument name="defaultValue" value="{{_defaultProduct.name}}"/>
             </actionGroup>

From e65ab0f1ea6b67e943187f474a1aa8d672b6ca5f Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 22 Feb 2019 17:32:22 +0200
Subject: [PATCH 0267/1055] MC-13948: [FT] [MFTF]
 AdminCartRulesAppliedForProductInCartTest fails because of bad design

---
 .../Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
index c06ecc689a089..a544be434f9c5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
@@ -11,7 +11,7 @@
         <arguments>
             <argument name="product" defaultValue="product"/>
         </arguments>
-        <amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url(product.custom_attributes[url_key])}}" stepKey="goToProductPage"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
         <waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>

From dfd8d9da988206ba518a85d606cf4ae530eeb776 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 22 Feb 2019 15:04:12 -0600
Subject: [PATCH 0268/1055] MC-15033: Configurable product gallery does not
 prepend images with multiple attributes

- fix fotorama selector
---
 .../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 c1208944d0d55..1c0555c589b56 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
@@ -1225,7 +1225,7 @@ define([
             var justAnImage = images[0],
                 initialImages = this.options.mediaGalleryInitial,
                 imagesToUpdate,
-                gallery,
+                gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
                 isInitial;
 
             if (isInProductView) {

From c39751f8cc06a1654e6f57418672b4e63c6be247 Mon Sep 17 00:00:00 2001
From: Dharmesh Vaja <dharmesh.vaja@krishtechnolabs.com>
Date: Mon, 25 Feb 2019 12:10:15 +0530
Subject: [PATCH 0269/1055] Updated code

---
 app/code/Magento/Customer/Block/Address/Grid.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index 86085b3bb7c5b..492343acfe306 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -236,9 +236,9 @@ private function getAddressCollection(): \Magento\Customer\Model\ResourceModel\A
             }
             /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
             $collection = $this->addressCollectionFactory->create();
-            $collection->setOrder('entity_id', 'desc')
-                ->addFieldToFilter('entity_id', array('nin' => array($this->getDefaultBilling(), $this->getDefaultShipping())))
-                ->setCustomerFilter([$this->getCustomer()->getId()]);
+            $collection->setOrder('entity_id', 'desc');
+            $collection->addFieldToFilter('entity_id', array('nin' => array($this->getDefaultBilling(), $this->getDefaultShipping())));
+            $collection->setCustomerFilter([$this->getCustomer()->getId()]);
             $this->addressCollection = $collection;
         }
         return $this->addressCollection;

From d04482cbeb43abc70a8ddbed12096097a235b986 Mon Sep 17 00:00:00 2001
From: Evgeny Petrov <evgeny_petrov@epam.com>
Date: Mon, 25 Feb 2019 11:25:14 +0300
Subject: [PATCH 0270/1055] MAGETWO-57934: [GitHub] Can't use "configurable" as
 group name in attribute sets M2.1 #6123

---
 app/code/Magento/Eav/Model/Entity/Attribute/Group.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
index 0d24ea24deaec..1f718f4277cc5 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
@@ -45,8 +45,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Filter\Translit $translitFilter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-     * @param array $reservedSystemNames (optional)
      * @param array $data (optional)
+     * @param array $reservedSystemNames (optional)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -56,8 +56,8 @@ public function __construct(
         \Magento\Framework\Filter\Translit $translitFilter,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $reservedSystemNames = [],
-        array $data = []
+        array $data = [],
+        array $reservedSystemNames = []
     ) {
         parent::__construct(
             $context,
@@ -66,7 +66,6 @@ public function __construct(
             $customAttributeFactory,
             $resource,
             $resourceCollection,
-            $reservedSystemNames,
             $data
         );
         $this->reservedSystemNames = $reservedSystemNames;

From 703e9a4df4b6ab32b52d438b8509d26b1f9a460a Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Mon, 25 Feb 2019 08:43:37 -0600
Subject: [PATCH 0271/1055] MC-4433: Convert SearchEntityResultsTest to MFTF

- Finished Variations
---
 .../ActionGroup/AdminProductActionGroup.xml   |   4 +
 .../AdminProductAttributeSetActionGroup.xml   |   3 +
 .../Test/Mftf/Data/ProductAttributeData.xml   |  14 ++
 .../StorefrontCatalogSearchActionGroup.xml    |  10 +-
 .../Mftf/Test/SearchEntityResultsTest.xml     | 129 ++++++++++++++----
 .../Data/ConfigurableProductOptionData.xml    |   5 +
 .../StorefrontQuickSearchResultsSection.xml   |   1 +
 7 files changed, 139 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 8358549efb25a..c679271ae063b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -85,6 +85,10 @@
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
 
+    <actionGroup name="toggleProductEnabled">
+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="toggleEnabled"/>
+    </actionGroup>
+
     <!--Upload image for product-->
     <actionGroup name="addProductImage">
         <arguments>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
index a4d4f92035c18..eb49458463546 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
@@ -45,6 +45,9 @@
         <fillField selector="{{AdminProductAttributeSetSection.name}}" userInput="{{label}}" stepKey="fillName"/>
         <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave1"/>
     </actionGroup>
+    <actionGroup name="goToAttributeGridPage">
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
+    </actionGroup>
     <actionGroup name="goToAttributeSetByName">
         <arguments>
             <argument name="name" type="string"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index d51e9441f71ef..4ddf76b2af98e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -52,6 +52,20 @@
         <data key="used_for_sort_by">true</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
+    <entity name="hiddenDropdownAttributeWithOptions" extends="productAttributeWithTwoOptions">
+        <data key="is_searchable">false</data>
+        <data key="is_visible_in_advanced_search">false</data>
+        <data key="is_visible_on_front">false</data>
+        <data key="is_filterable">false</data>
+        <data key="is_filterable_in_search">false</data>
+        <data key="used_in_product_listing">false</data>
+        <data key="is_used_for_promo_rules">false</data>
+        <data key="is_comparable">false</data>
+        <data key="is_used_in_grid">false</data>
+        <data key="is_visible_in_grid">false</data>
+        <data key="is_filterable_in_grid">false</data>
+        <data key="used_for_sort_by">false</data>
+    </entity>
     <entity name="productDropDownAttribute" type="ProductAttribute">
         <data key="attribute_code" unique="suffix">attribute</data>
         <data key="frontend_input">select</data>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index 634c117e6207d..df9af771d2c08 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -57,9 +57,13 @@
         <see selector="{{StorefrontQuickSearchResultsSection.productByIndex(index)}}" userInput="{{productName}}" stepKey="seeProductName"/>
     </actionGroup>
 
-
-
-
+    <actionGroup name="StorefrontQuickSearchCheckProductNameNotInGrid">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <dontSee selector="{{StorefrontQuickSearchResultsSection.allResults}}" userInput="{{productName}}" stepKey="dontSeeProductName"/>
+    </actionGroup>
+    
     <!-- Open advanced search page -->
     <actionGroup name="StorefrontOpenAdvancedSearchActionGroup">
         <click selector="{{StorefrontFooterSection.AdvancedSearch}}" stepKey="clickAdvancedSearchLink" />
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
index 96cd4b831a226..db837a7a7df2b 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -149,9 +149,6 @@
         </actionGroup>
     </test>
 
-
-
-
     <test name="QuickSearchTwoProductsWithSameWeight">
         <annotations>
             <stories value="Search Product on Storefront"/>
@@ -234,7 +231,6 @@
             <argument name="index" value="1"/>
         </actionGroup>
     </test>
-
     <test name="QuickSearchTwoProductsWithDifferentWeight" extends="QuickSearchTwoProductsWithSameWeight">
         <annotations>
             <stories value="Search Product on Storefront"/>
@@ -264,9 +260,6 @@
         </actionGroup>
     </test>
 
-
-
-
     <test name="QuickSearchAndAddToCart">
         <annotations>
             <stories value="Search Product on Storefront"/>
@@ -473,7 +466,6 @@
             <argument name="productName" value="$createBundleProduct.name$"/>
         </actionGroup>
     </test>
-
     <test name="QuickSearchAndAddToCartBundleFixed">
         <annotations>
             <stories value="Search Product on Storefront"/>
@@ -519,25 +511,114 @@
             <amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="goToProductEditPage"/>
             <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
         </before>
-        <!--<after>-->
-        <!--<deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>-->
-        <!--<deleteData stepKey="deleteProduct" createDataKey="createProduct"/>-->
-        <!--<deleteData stepKey="deleteCategory" createDataKey="createCategory"/>-->
-        <!--</after>-->
-        <!--<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>-->
-        <!--<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">-->
-        <!--<argument name="phrase" value="$createBundleProduct.name$"/>-->
-        <!--</actionGroup>-->
-        <!--<actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">-->
-        <!--<argument name="productName" value="$createBundleProduct.name$"/>-->
-        <!--<argument name="productUrlKey" value="$createBundleProduct.custom_attributes[url_key]$"/>-->
-        <!--</actionGroup>-->
-        <!--<actionGroup ref="StorefrontAddBundleProductFromProductToCartActionGroup" stepKey="addProductToCart">-->
-        <!--<argument name="productName" value="$createBundleProduct.name$"/>-->
-        <!--</actionGroup>-->
+        <after>
+            <deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <argument name="phrase" value="$createBundleProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
+        <argument name="productName" value="$createBundleProduct.name$"/>
+        <argument name="productUrlKey" value="$createBundleProduct.custom_attributes[url_key]$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddBundleProductFromProductToCartActionGroup" stepKey="addProductToCart">
+        <argument name="productName" value="$createBundleProduct.name$"/>
+        </actionGroup>
     </test>
 
+    <test name="QuickSearchConfigurableChildren">
+        <annotations>
+            <stories value="Search Product on Storefront"/>
+            <title value="User should be able to use Quick Search to a configurable product's child products"/>
+            <description value="Use Quick Search to find a configurable product with enabled/disable children"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14798"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-15101"/>
+            </skip>
+        </annotations>
+        <before>
+            <!-- Create the category -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <!-- Create blank AttributeSet-->
+            <createData entity="CatalogAttributeSet" stepKey="attributeSet"/>
+
+            <!-- Create an attribute with two options to be used in the first child product -->
+            <createData entity="hiddenDropdownAttributeWithOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
 
+            <!-- Assign attribute to set -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="goToAttributeGridPage" stepKey="goToPage"/>
+            <actionGroup ref="goToAttributeSetByName" stepKey="goToSet">
+                <argument name="name" value="$attributeSet.attribute_set_name$"/>
+            </actionGroup>
+            <actionGroup ref="AssignAttributeToGroup" stepKey="assignToAttributeSetAndGroup">
+                <argument name="group" value="Product Details"/>
+                <argument name="attribute" value="$createConfigProductAttribute.attribute_code$"/>
+            </actionGroup>
+            <actionGroup ref="SaveAttributeSet" stepKey="savePage"/>
 
+            <!-- Get the first option of the attribute we created -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
 
+            <!-- Create a simple product,give it the attributeSet and attribute with the first option -->
+            <createData entity="ApiSimpleOneHidden" stepKey="createConfigChildProduct1">
+                <field key="attribute_set_id">$attributeSet.attribute_set_id$</field>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <updateData entity="ApiSimpleProductUpdateDescription" stepKey="updateSimpleProduct1" createDataKey="createConfigChildProduct1"/>
+
+            <!-- Create the configurable product, give it the attributeSet and add it to the category -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <field key="attribute_set_id">$attributeSet.attribute_set_id$</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Create the configurable product -->
+            <createData entity="ConfigurableProductOneOption" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <!-- Add the first simple product to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+        </before>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+            <argument name="phrase" value="$createConfigProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="seeProductInGrid">
+            <argument name="productName" value="$createConfigProduct.name$"/>
+            <argument name="index" value="1"/>
+        </actionGroup>
+
+        <!-- Disable Child Product -->
+        <actionGroup ref="goToProductPageViaID" stepKey="goToChildProduct">
+            <argument name="productId" value="$createConfigChildProduct1.id$"/>
+        </actionGroup>
+        <actionGroup ref="toggleProductEnabled" stepKey="disableProduct"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPageAgain"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefrontAgain">
+            <argument name="phrase" value="$createConfigProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="dontSeeProductAnymore">
+            <argument name="productName" value="$createConfigProduct.name$"/>
+        </actionGroup>
+    </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
index f231d74b70dad..a1a499f33eda0 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
@@ -8,6 +8,11 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ConfigurableProductOneOption" type="ConfigurableProductOption">
+        <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
+        <data key="label">option</data>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+    </entity>
     <entity name="ConfigurableProductTwoOptions" type="ConfigurableProductOption">
         <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
         <data key="label">option</data>
diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
index 3ecfceb224b7e..5d56dc2d21c40 100644
--- a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
@@ -11,6 +11,7 @@
     <section name="StorefrontQuickSearchResultsSection">
         <element name="searchTextBox" type="text" selector="#search"/>
         <element name="searchTextBoxButton" type="button" selector="button[class='action search']"/>
+        <element name="allResults" type="block" selector=".column.main"/>
         <element name="productLink" type="select" selector="a[class='product-item-link']"/>
         <element name="productByIndex" type="button" selector=".product-items li:nth-child({{var}}) .product-item-info" parameterized="true"/>
         <element name="productByName" type="button" selector="//div[contains(@class, 'product-item-info') and .//*[contains(., '{{var}}')]]" parameterized="true"/>

From a168c95b1cd71448bb001d0378caf9998628044f Mon Sep 17 00:00:00 2001
From: Denis Kopylov <dkopylov@magenius.team>
Date: Mon, 25 Feb 2019 19:06:22 +0300
Subject: [PATCH 0272/1055] [FIX] Add review summary to wishlist
 (https://github.com/magento/magento2/issues/21419)

---
 .../Block/Customer/Wishlist/Item/Column/Actions.php |  1 +
 .../Block/Customer/Wishlist/Item/Column/Comment.php |  1 +
 .../Block/Customer/Wishlist/Item/Column/Edit.php    |  1 +
 .../Block/Customer/Wishlist/Item/Column/Info.php    |  1 +
 .../Block/Customer/Wishlist/Item/Column/Remove.php  |  1 +
 .../view/frontend/layout/wishlist_index_index.xml   | 13 +++++++------
 .../frontend/templates/item/column/actions.phtml    |  2 +-
 .../frontend/templates/item/column/comment.phtml    |  2 +-
 .../view/frontend/templates/item/column/edit.phtml  |  2 +-
 .../view/frontend/templates/item/column/name.phtml  |  2 +-
 .../frontend/templates/item/column/remove.phtml     |  2 +-
 .../frontend/templates/item/column/review.phtml     | 10 ++++++++++
 12 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
index cafb6a5291481..0cf6b6a9867d1 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @deprecated Empty class
  * @since 100.0.2
  */
 class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
index 2d75956858a0a..5f40e96bfa6ff 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @deprecated Empty class
  * @since 100.0.2
  */
 class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
index 53ca78c63524d..c4e94ec503175 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @deprecated Empty class
  * @since 100.0.2
  */
 class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
index 33fb0f7325cdd..f83c122910ebd 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @deprecated Empty class
  * @since 100.0.2
  */
 class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
index 57703b9300db8..3e6f225842e01 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @deprecated Empty class
  * @since 100.0.2
  */
 class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
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..8696d178d89d7 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
@@ -17,7 +17,8 @@
                 <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"/>
-                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info" name="customer.wishlist.item.name" template="Magento_Wishlist::item/column/name.phtml" cacheable="false"/>
+                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.name" template="Magento_Wishlist::item/column/name.phtml" cacheable="false"/>
+                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.review" template="Magento_Wishlist::item/column/review.phtml" cacheable="false"/>
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.price" template="Magento_Wishlist::item/column/price.phtml" cacheable="false">
                         <block class="Magento\Catalog\Pricing\Render" name="product.price.render.wishlist">
                             <arguments>
@@ -29,11 +30,11 @@
                         </block>
                         <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Options" name="customer.wishlist.item.options" cacheable="false"/>
                     </block>
-                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Actions" name="customer.wishlist.item.inner" template="Magento_Wishlist::item/column/actions.phtml" cacheable="false">
+                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.inner" template="Magento_Wishlist::item/column/actions.phtml" cacheable="false">
                         <arguments>
                             <argument name="css_class" xsi:type="string">product-item-inner</argument>
                         </arguments>
-                        <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Comment" name="customer.wishlist.item.comment" template="Magento_Wishlist::item/column/comment.phtml" cacheable="false">
+                        <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.comment" template="Magento_Wishlist::item/column/comment.phtml" cacheable="false">
                             <arguments>
                                 <argument name="title" translate="true" xsi:type="string">Product Details and Comment</argument>
                             </arguments>
@@ -44,12 +45,12 @@
                             </arguments>
                         </block>
 
-                        <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Actions" name="customer.wishlist.item.actions" template="Magento_Wishlist::item/column/actions.phtml" cacheable="false">
+                        <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.actions" template="Magento_Wishlist::item/column/actions.phtml" cacheable="false">
                             <arguments>
                                 <argument name="css_class" xsi:type="string">product-item-actions</argument>
                             </arguments>
-                            <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Edit" name="customer.wishlist.item.edit" template="Magento_Wishlist::item/column/edit.phtml" before="-" cacheable="false"/>
-                            <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Remove" name="customer.wishlist.item.remove" template="Magento_Wishlist::item/column/remove.phtml" cacheable="false"/>
+                            <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.edit" template="Magento_Wishlist::item/column/edit.phtml" before="-" cacheable="false"/>
+                            <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.remove" template="Magento_Wishlist::item/column/remove.phtml" cacheable="false"/>
                         </block>
                     </block>
                 </block>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
index 0b50df8c59fbb..7fa55a839b2ea 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Actions $block */
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
 ?>
 <?php $children = $block->getChildNames(); ?>
 <?php if ($children): ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
index 17e2404ee23cf..45bd7494fed4f 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Comment $block  */
+/* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block  */
 
 /* @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
index 1898ef6fc0d66..81d770d556734 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Edit $block */
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
 
 /** @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
index 265f4635a6be3..53c5f35f886ea 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info $block */
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
 
 /** @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
index 57ae439d9995b..0bd78ba38ba58 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Remove $block */
+/* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
 ?>
 
 <a href="#" data-role="remove" data-post-remove='<?= /* @noEscape */ $block->getItemRemoveParams($block->getItem()) ?>' title="<?= $block->escapeHtmlAttr(__('Remove Item')) ?>" class="btn-remove action delete">
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
new file mode 100644
index 0000000000000..9120cc9fa684e
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
+$product = $block->getItem()->getProduct();
+?>
+<?= $block->getReviewsSummaryHtml($product, 'short') ?>

From dda8a1e9ddff1c4850187600ed14d056e6d6d872 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 25 Feb 2019 18:09:22 +0200
Subject: [PATCH 0273/1055] MC-13848: [FT] [MFTF]
 StorefrontPurchaseProductWithCustomOptionsTest fails because of bad design

---
 ...ntPurchaseProductWithCustomOptionsTest.xml | 108 +++++++++---------
 1 file changed, 53 insertions(+), 55 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index 951afa2ddb68b..a3bce2d4fe2f2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -20,30 +20,36 @@
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--Create Simple Product with Custom Options-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">17</field>
+            </createData>
+            <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithOption"/>
+            <!-- Logout customer before in case of it logged in from previous test -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
         </before>
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!-- Delete product and category -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderListingFilters"/>
+            <actionGroup ref="logout" stepKey="logoutAdmin"/>
+            <!-- Logout customer -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
         </after>
 
-        <!--Create Simple Product with Custom Options-->
+        <!-- Login Customer Storefront -->
 
-        <createData entity="_defaultCategory" stepKey="createCategory"/>
-        <createData entity="_defaultProduct" stepKey="createProduct">
-            <requiredEntity createDataKey="createCategory"/>
-            <field key="price">17</field>
-        </createData>
-        <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithOption"/>
-
-        <!-- Login Customer Storeront -->
-
-        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
-        <fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomerOnStorefront">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
 
         <!-- Checking the correctness of displayed prices for user parameters -->
 
-        <amOnPage url="{{StorefrontHomePage.url}}$createProduct.custom_attributes[url_key]$.html" stepKey="amOnProduct3Page"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
 
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionField.title, ProductOptionField.price)}}" stepKey="checkFieldProductOption"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionArea.title, '1.7')}}" stepKey="checkAreaProductOption"/>
@@ -80,7 +86,7 @@
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="finalProductPrice"/>
 
         <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
-            <argument name="productName" value="$createProduct.name$"/>
+            <argument name="productName" value="$$createProduct.name$$"/>
         </actionGroup>
 
         <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
@@ -92,21 +98,21 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
         <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
 
-        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$createProduct.name$" stepKey="seeProductInCart"/>
-
-        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($createProduct.name$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" visible="false" stepKey="exposeProductOptions"/>
-
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
-        <seeElement selector="{{CheckoutPaymentSection.ProductOptionLinkActiveByProductItemName($createProduct.name$, productWithOptions.file)}}" stepKey="seeProductOptionFileInputLink1"/>
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
-        <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, $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" />
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
+
+        <conditionalClick selector="{{CheckoutPaymentSection.ProductOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
+
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
+        <seeElement selector="{{CheckoutPaymentSection.ProductOptionLinkActiveByProductItemName($$createProduct.name$$, productWithOptions.file)}}" stepKey="seeProductOptionFileInputLink1"/>
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
+        <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, $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"/>
         <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
@@ -124,13 +130,11 @@
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
-        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-        <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
-        <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
-        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <actionGroup ref="filterOrderGridById" stepKey="filterByOrderId">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
 
         <!-- Checking the correctness of displayed custom options for user parameters on Order -->
 
@@ -168,24 +172,18 @@
 
         <!-- Go to Customer Order Page and Checking the correctness of displayed custom options for user parameters on Order -->
 
-        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnProduct4Page"/>
+        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnOrderPage"/>
 
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($$createProduct.name$$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
         <seeElement selector="{{StorefrontCustomerOrderSection.productCustomOptionsLink($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" stepKey="seeStorefontOrderProductOptionFileLink1"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
-        <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, $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 -->
-
-        <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-        <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
+        <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, $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" />
     </test>
 </tests>

From 29860ff68091362d1fb9e8568fe1b88eebed5bcf Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Mon, 25 Feb 2019 11:08:38 -0600
Subject: [PATCH 0274/1055] MC-4433: Convert SearchEntityResultsTest to MFTF

- Fixed TestCaseID
---
 .../Test/Mftf/Test/SearchEntityResultsTest.xml              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
index db837a7a7df2b..bd465b1570848 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -119,7 +119,7 @@
             <title value="User should be able to use Quick Search to find products by their first three letters"/>
             <description value="Use Quick Search to find a product using only first three letters"/>
             <severity value="MAJOR"/>
-            <testCaseId value="NEEDS ZEPHYR TEST"/>
+            <testCaseId value="MC-15034"/>
             <group value="CatalogSearch"/>
             <group value="mtf_migrated"/>
         </annotations>
@@ -391,7 +391,7 @@
             <title value="User should be able to use Quick Search to find a grouped product and add it to cart"/>
             <description value="Use Quick Search to find grouped Product and Add to Cart"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MC-14787"/>
+            <testCaseId value="MC-14788"/>
             <group value="CatalogSearch"/>
             <group value="mtf_migrated"/>
         </annotations>
@@ -472,7 +472,7 @@
             <title value="User should be able to use Quick Search to find a Bundle Fixed product and add it to cart"/>
             <description value="Use Quick Search to find Bundle Fixed Product and Add to Cart"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MC-14788"/>
+            <testCaseId value="MC-14790"/>
             <group value="CatalogSearch"/>
             <group value="mtf_migrated"/>
         </annotations>

From a5bdc38d3531bf93cd46fdc4e5e4f6bbe5056b32 Mon Sep 17 00:00:00 2001
From: Ananth Iyer <iyerananth3@gmail.com>
Date: Mon, 25 Feb 2019 23:48:59 +0530
Subject: [PATCH 0275/1055] Disable dropdown in JavaScript and CSS Settings in
 developer configuration

---
 app/code/Magento/Backend/etc/adminhtml/system.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 0fb7d89f924de..c48e4a2b0aa9d 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -169,15 +169,15 @@
             </group>
             <group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>JavaScript Settings</label>
-                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Merge JavaScript Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable JavaScript Bundling</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify JavaScript Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>
@@ -185,11 +185,11 @@
             </group>
             <group id="css" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>CSS Settings</label>
-                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Merge CSS Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify CSS Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>

From 5c93ba2d7924291e704032969b9b9390cdc7fcca Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Mon, 25 Feb 2019 12:25:56 -0600
Subject: [PATCH 0276/1055] MC-4903: Convert UpdateProductUrlRewriteEntityTest
 to MFTF

---
 .../AdminUrlRewriteActionGroup.xml            | 13 +++++
 .../AdminUrlRewriteGridActionGroup.xml        | 14 ++++++
 .../Test/Mftf/Data/UrlRewriteData.xml         | 27 +++++++++++
 .../Test/Mftf/MetaData/url_rewrite-meta.xml   | 20 ++++++++
 ...tUrlRewriteAndAddTemporaryRedirectTest.xml | 48 +++++++++++++++++++
 5 files changed, 122 insertions(+)
 create mode 100644 app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
 create mode 100644 app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
 create mode 100644 app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml

diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
index 71475acd8b066..5886b40c4547b 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
@@ -75,4 +75,17 @@
         <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
     </actionGroup>
+    <actionGroup name="AdminUpdateUrlRewrite">
+        <arguments>
+            <argument name="requestPath" type="string"/>
+            <argument name="redirectTypeValue" type="string"/>
+            <argument name="description" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
+        <click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
+        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue('redirectTypeValue')}}" stepKey="selectRedirectTypeValue"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml
index f053d18e79c3e..221dd7f9d316e 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteGridActionGroup.xml
@@ -72,4 +72,18 @@
         <waitForPageLoad stepKey="waitForPageToLoad3"/>
         <see selector="{{AdminUrlRewriteIndexSection.successMessage}}" userInput="You deleted the URL rewrite." stepKey="seeSuccessMessage"/>
     </actionGroup>
+    <actionGroup name="AdminSearchAndSelectUrlRewriteInGrid">
+        <arguments>
+            <argument name="requestPath" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteEditPage"/>
+        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{requestPath}}" stepKey="fillRedirectPathFilter"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <click selector="{{AdminUrlRewriteIndexSection.editButton('1')}}" stepKey="clickOnEditButton"/>
+        <waitForPageLoad stepKey="waitForEditPageToLoad"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
new file mode 100644
index 0000000000000..942882be259f9
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
@@ -0,0 +1,27 @@
+<?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="defaultUrlRewrite" type="urlRewrite">
+        <data key="request_path" unique="prefix">test-test-test.html</data>
+        <data key="target_path">http://www.example.com/</data>
+        <data key="redirect_type">302</data>
+        <data key="redirect_type_label">Temporary (302)</data>
+        <data key="store_id">1</data>
+        <data key="store">Default Store View</data>
+    </entity>
+    <entity name="updateUrlRewrite" type="urlRewrite">
+        <data key="request_path" unique="prefix">test-aspx-test.aspx</data>
+        <data key="target_path">http://www.example.com/</data>
+        <data key="redirect_type">302</data>
+        <data key="redirect_type_label">Temporary (302)</data>
+        <data key="store_id">1</data>
+        <data key="store">Default Store View</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml b/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
new file mode 100644
index 0000000000000..84cf00ac08999
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-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="CreateUrlRewrite" dataType="urlRewrite" type="create" auth="adminFormKey" url="/admin/url_rewrite/save/" method="POST" successRegex="/messages-message-success/">
+        <!--<object key="urlRewrite" dataType="urlRewrite">-->
+        <field key="store_id">integer</field>
+        <field key="redirect_type">integer</field>
+        <field key="request_path">string</field>
+        <field key="target_path">string</field>
+        <field key="description">string</field>
+        <!--</object>-->
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml
new file mode 100644
index 0000000000000..cbb3680f37345
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.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="AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest">
+        <annotations>
+            <stories value="Update URL rewrite"/>
+            <title value="Update Product URL Rewrites"/>
+            <description value="Login as Admin and update product UrlRewrite and add Temporary redirect type "/>
+            <testCaseId value="MC-5351"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="defaultSimpleProduct" stepKey="createProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search and Select Edit option for created product in grid -->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="editUrlRewrite">
+            <argument name="requestPath" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Open UrlRewrite Edit page and update the fields  -->
+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
+            <argument name="requestPath" value="{{defaultUrlRewrite.request_path}}"/>
+            <argument name="redirectTypeValue" value="Temporary (302)"/>
+            <argument name="description" value="Update Product Url Rewrite"/>
+        </actionGroup>
+
+        <!-- Assert product Url Rewrite in StoreFront -->
+        <actionGroup ref="AssertStorefrontProductRedirect" stepKey="assertProductUrlRewriteInStoreFront">
+            <argument name="productName" value="$$createProduct.name$$"/>
+            <argument name="productSku" value="$$createProduct.sku$$"/>
+            <argument name="productRequestPath" value="{{defaultUrlRewrite.request_path}}"/>
+        </actionGroup>
+    </test>
+</tests>

From c695c007c3a1d0b3fa0511204e4ef8347e485e26 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Mon, 25 Feb 2019 16:26:27 -0600
Subject: [PATCH 0277/1055] MC-4455: Convert CreateDuplicateUrlProductEntity to
 MFTF

---
 .../ActionGroup/AdminProductActionGroup.xml   | 25 +++++++++++++++
 .../Test/AdminCreateDuplicateProductTest.xml  | 31 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 3afdc41888c79..d2d95d811c43d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -430,4 +430,29 @@
         <click selector="{{AdminAddUpSellProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
     </actionGroup>
+    <actionGroup name="createDuplicateProduct">
+        <arguments>
+            <argument name="product" defaultValue="$$createSimpleProduct$$" />
+            <argument name="quantity" defaultValue="defaultSimpleProduct.quantity"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductIndexPage"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickOnAddNewProduct"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{quantity}}" stepKey="fillProductQty"/>
+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="selectStockStatus"/>
+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="scrollToSectionHeader"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{product.custom_attributes[url_key]}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollTopPageProduct"/>
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveProductButton" />
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <waitForPageLoad stepKey="waitForProductToSave"/>
+        <see selector="{{AdminProductFormSection.successMessage}}"  userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
new file mode 100644
index 0000000000000..81a0916be6e77
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
@@ -0,0 +1,31 @@
+<?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="AdminCreateDuplicateProductTest">
+        <annotations>
+            <stories value="Create Product"/>
+            <title value="CreateDuplicateUrlProductEntityTestVariation1"/>
+            <description value="Login as admin and create duplicate Product"/>
+            <testCaseId value="MC-14714"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+        </after>
+
+        <!-- Create duplicate Product and Save the Product -->
+        <actionGroup ref="createDuplicateProduct" stepKey="createDuplicateProduct"/>
+    </test>
+</tests>

From 7127e16d5386956f5fa7b91f58c0995d15d52a36 Mon Sep 17 00:00:00 2001
From: dharmesh vaja <dharmesh.vaja@rocketbazaar.com>
Date: Tue, 26 Feb 2019 11:54:13 +0530
Subject: [PATCH 0278/1055] Fixed-Additional addresses DataTable Pagination
 count displaying wrong

---
 .../Magento/Customer/Test/Unit/Block/Address/GridTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 31bcc37612302..9c511efd22c4b 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -81,7 +81,7 @@ protected function setUp()
     public function testGetChildHtml()
     {
         $customerId = 1;
-
+        $outputString = 'OutputString';
         /** @var \Magento\Framework\View\Element\BlockInterface|\PHPUnit_Framework_MockObject_MockObject $block */
         $block = $this->getMockBuilder(\Magento\Framework\View\Element\BlockInterface::class)
             ->setMethods(['setCollection'])
@@ -113,7 +113,7 @@ public function testGetChildHtml()
         $block->expects($this->atLeastOnce())->method('setCollection')->with($addressCollection)->willReturnSelf();
         $this->gridBlock->setNameInLayout('NameInLayout');
         $this->gridBlock->setLayout($layout);
-        $this->assertEquals('OutputString', $this->gridBlock->getChildHtml('pager'));
+        $this->assertEquals($outputString, $this->gridBlock->getChildHtml('pager'));
     }
 
     /**

From 43e684f07a831481fd71e50d0d35196bedb4c9b7 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 26 Feb 2019 10:04:19 +0100
Subject: [PATCH 0279/1055] Place order concept

---
 .../Model/Resolver/PlaceOrder.php             | 87 ++++++++++++++++++
 .../Magento/QuoteGraphQl/etc/schema.graphqls  | 13 +++
 .../Magento/GraphQl/Quote/PlaceOrderTest.php  | 91 +++++++++++++++++++
 3 files changed, 191 insertions(+)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
new file mode 100644
index 0000000000000..cb5fcf0dad5ab
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
@@ -0,0 +1,87 @@
+<?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\Exception\LocalizedException;
+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\Quote\Api\CartManagementInterface;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+/**
+ * @inheritdoc
+ */
+class PlaceOrder implements ResolverInterface
+{
+    /**
+     * @var CartManagementInterface
+     */
+    private $cartManagement;
+
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     * @param CartManagementInterface $cartManagement
+     * @param OrderRepositoryInterface $orderRepository
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser,
+        CartManagementInterface $cartManagement,
+        OrderRepositoryInterface $orderRepository
+    ) {
+        $this->getCartForUser = $getCartForUser;
+        $this->cartManagement = $cartManagement;
+        $this->orderRepository = $orderRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($args['input']['cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        }
+        $maskedCartId = $args['input']['cart_id'];
+
+        $currentUserId = $context->getUserId();
+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
+
+        try {
+            $orderId = $this->cartManagement->placeOrder($cart->getId());
+            $order = $this->orderRepository->get($orderId);
+
+            // TODO: populate with data
+            return [
+                'order' => [
+                    'order_id' => $order->getIncrementId()
+                ]
+            ];
+        } catch (LocalizedException $exception) {
+            throw new GraphQlInputException(
+                __('Unable to place order: %message', ['message' => $exception->getMessage()])
+            );
+        } catch (\Exception $exception) {
+            throw new GraphQlInputException(
+                __('Unable to place order. An internal error occurred')
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 2050a2d3ca790..263fef1feb361 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -14,6 +14,7 @@ type Mutation {
     setShippingAddressesOnCart(input: SetShippingAddressesOnCartInput): SetShippingAddressesOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingAddressesOnCart")
     setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetBillingAddressOnCart")
     setShippingMethodsOnCart(input: SetShippingMethodsOnCartInput): SetShippingMethodsOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingMethodsOnCart")
+    placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
 }
 
 input AddSimpleProductsToCartInput {
@@ -102,6 +103,10 @@ input ShippingMethodForAddressInput {
     method_code: String!
 }
 
+input PlaceOrderInput {
+    cart_id: String!
+}
+
 type SetBillingAddressOnCartOutput {
     cart: Cart!
 }
@@ -118,6 +123,10 @@ type ApplyCouponToCartOutput {
     cart: Cart!
 }
 
+type PlaceOrderOutput {
+    order: Order!
+}
+
 type Cart {
     cart_id: String
     items: [CartItemInterface]
@@ -242,3 +251,7 @@ type CartItemSelectedOptionValuePrice {
     units: String!
     type: PriceTypeEnum!
 }
+
+type Order {
+    order_id: String
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php
new file mode 100644
index 0000000000000..4871830e087ec
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * 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 placing an order
+ */
+class PlaceOrderTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    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_check_payment.php
+     */
+    public function testPlaceOrder()
+    {
+        $reservedOrderId = 'test_order_1';
+        $this->quoteResource->load(
+            $this->quote,
+            $reservedOrderId,
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query =<<<QUERY
+mutation {
+  placeOrder(input: {cart_id: "$maskedQuoteId"}) {
+    order {
+      order_id
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}

From 528ed2e4036c89132d203ae0d1cf6e601680dff4 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 26 Feb 2019 13:04:58 +0300
Subject: [PATCH 0280/1055] MAGETWO-96127: [2.3.x] Catalog grid page number
 resets after Save and Close action.

- Go to the first page only when filters fully initialized.
---
 .../Magento/Ui/view/base/web/js/grid/paging/paging.js    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
index d90d13b1a0d09..26ee4ad213458 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
@@ -43,9 +43,9 @@ define([
 
             imports: {
                 pageSize: '${ $.sizesConfig.name }:value',
-                current: '${ $.currentConfig.name }:value',
                 totalSelected: '${ $.selectProvider }:totalSelected',
-                totalRecords: '${ $.provider }:data.totalRecords'
+                totalRecords: '${ $.provider }:data.totalRecords',
+                filters: '${ $.provider }:params.filters'
             },
 
             exports: {
@@ -191,8 +191,9 @@ define([
          * @returns {Paging} Chainable.
          */
         goFirst: function () {
-            this.current = 1;
-
+            if (typeof this.filters !== 'undefined') {
+                this.current = 1;
+            }
             return this;
         },
 

From 6a87bfe6787842550e33a9465c2750238c7a7da0 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 26 Feb 2019 12:52:43 +0200
Subject: [PATCH 0281/1055] MC-13844: [FT] [MFTF]
 AdminAvailabilityCreditMemoWithNoPaymentTest fails because of bad design

---
 .../ProductsQtyReturnAfterOrderCancelTest.xml |  1 -
 .../ActionGroup/AdminInvoiceActionGroup.xml   | 15 +++++--
 .../ActionGroup/AdminOrderActionGroup.xml     |  3 +-
 .../AdminInvoiceMainActionsSection.xml        |  2 +-
 ...vailabilityCreditMemoWithNoPaymentTest.xml | 44 ++++++++-----------
 ...ectnessInvoicedItemInBundleProductTest.xml |  2 +-
 .../Test/Mftf/Test/AdminCreateInvoiceTest.xml |  1 -
 .../Test/Mftf/Test/AdminTaxReportGridTest.xml |  3 +-
 8 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
index 03e1d1b260ffd..456be43f80b8d 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
@@ -76,7 +76,6 @@
         <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"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index c814a886a2b33..0061411d576e2 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -44,7 +44,6 @@
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
         <waitForPageLoad stepKey="waitForNewInvoicePageLoad"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForSuccessMessageLoad"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
         <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
@@ -58,9 +57,17 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
     </actionGroup>
 
-    <actionGroup name="submitInvoiceIntoOrder">
+    <actionGroup name="StartCreateInvoiceFromOrderPage">
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
+        <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeNewInvoiceUrl"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoicePageTitle"/>
+    </actionGroup>
+
+    <actionGroup name="SubmitInvoice">
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageInvoice"/>
-        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPageInvoice"/>
     </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 aea04c8abfa60..0e09f3933c1aa 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -18,7 +18,8 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
-        <click selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" stepKey="selectDefaultStoreView"/>
+        <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>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
index bc7fc8145af33..011500fac3f69 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.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="AdminInvoiceMainActionsSection">
-        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary"/>
+        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary" timeout="60"/>
         <element name="openNewCreditMemoFromInvoice" type="button" selector=".action-default.scalable.credit-memo"/>
         <element name="submitNewRefundFromInvoice" type="button" selector=".action-default.scalable.save.submit-button refund primary"/>
     </section>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
index 9180636db7821..e405173429b2c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
@@ -25,6 +25,7 @@
             </createData>
             <!-- Enable *Free Shipping* -->
             <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -33,62 +34,53 @@
             <createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="Simple_US_Customer.email"/>
+            </actionGroup>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <actionGroup ref="logout" stepKey="logOut"/>
         </after>
 
-        <!-- Flush Magento Cache -->
-        <magentoCLI stepKey="flushCache" command="cache:flush"/>
-
         <!--Proceed to Admin panel > SALES > Orders. Created order should be in Processing status-->
-        <amOnPage url="{{AdminOrderCreatePage.url}}" stepKey="navigateToSalesOrderPage"/>
-        <waitForPageLoad stepKey="waitForSalesOrderPageLoaded"/>
-
-        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
-        <waitForElementVisible stepKey="waitForNewOrderPageOpened" selector="{{NewOrderSection.submitOrder}}"/>
-        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+        <actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage"/>
 
         <!--Check if order can be submitted without the required fields including email address-->
-        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="seeNewOrderPageTitle"/>
-        <actionGroup ref="addSimpleProductToOrder" stepKey="addFirstProductToOrder" after="scrollToTopOfOrderFormPage">
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addFirstProductToOrder">
             <argument name="product" value="$$createProduct$$"/>
         </actionGroup>
 
         <!--Click *Custom Price* link, enter 0 and click *Update Items and Quantities* button-->
         <click selector="{{AdminOrderFormItemsSection.customPriceCheckbox}}" stepKey="clickCustomPriceCheckbox"/>
-        <waitForElementVisible stepKey="waitForPriceFieldAppears" selector="{{AdminOrderFormItemsSection.customPriceField}}"/>
+        <waitForElementVisible selector="{{AdminOrderFormItemsSection.customPriceField}}" stepKey="waitForPriceFieldAppears"/>
         <fillField selector="{{AdminOrderFormItemsSection.customPriceField}}" userInput="0" stepKey="fillCustomPriceField"/>
         <click selector="{{AdminOrderFormItemsSection.updateItemsAndQuantities}}" stepKey="clickUpdateItemsAndQuantitiesButton"/>
 
         <!--Fill customer group and customer email-->
-        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="clickUpdateItemsAndQuantitiesButton"/>
-        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail"/>
 
         <!--Fill customer address information-->
-        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
             <argument name="customer" value="Simple_US_Customer"/>
             <argument name="address" value="US_Address_TX"/>
         </actionGroup>
 
         <!-- Select Free shipping -->
-        <actionGroup ref="orderSelectFreeShipping" stepKey="selectFreeShippingOption" after="fillCustomerAddress"/>
+        <actionGroup ref="orderSelectFreeShipping" stepKey="selectFreeShippingOption"/>
 
         <!--Click *Submit Order* button-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="selectFreeShippingOption"/>
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
 
         <!--Click *Invoice* button-->
-        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
-        <waitForPageLoad stepKey="waitForInvoicePageOpened"/>
-
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoiceSaved"/>
-        <see userInput="The invoice has been created." stepKey="seeCorrectMessage"/>
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
 
         <!--Verify that *Credit Memo* button is displayed-->
         <seeElement selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="seeCreditMemo"/>
         <click selector="{{AdminOrderFormItemsSection.creditMemo}}" stepKey="clickCreditMemoItem"/>
         <waitForPageLoad stepKey="waitForCreditMemoPageLoaded"/>
-        <see stepKey="seeNewMemoPage" userInput="New Memo"/>
-        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeUrlOnPage"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoPageTitle"/>
+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewMemoUrlOnPage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
index 7c83f35468ce6..f869841153aea 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
@@ -81,7 +81,7 @@
         <fillField selector="{{AdminInvoiceItemsSection.qtyToInvoiceColumn}}" userInput="5" stepKey="ChangeQtyToInvoice"/>
         <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQunatity"/>
         <waitForPageLoad stepKey="waitPageToBeLoaded"/>
-        <actionGroup ref="submitInvoiceIntoOrder" stepKey="submitInvoice"/>
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
 
         <!--Verify invoiced items qty in ship tab-->
         <actionGroup ref="goToShipmentIntoOrder" stepKey="goToShipment"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
index 099cf7fbce914..ce66409ed9b3c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -71,7 +71,6 @@
         <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoicePageLoad"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
         <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
index 4741898b0ab86..628d189823a52 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminTaxReportGridTest.xml
@@ -136,9 +136,8 @@
         <waitForPageLoad stepKey="waitForInvoicePageOpened"/>
 
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoiceSaved"/>
 
-        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction" after="waitForInvoiceSaved"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl" after="clickShipAction"/>
         <!--Submit Shipment-->
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment" after="seeOrderShipmentUrl"/>

From 417df233c08e27258712075dc29e1ad520fec174 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 26 Feb 2019 14:10:39 +0300
Subject: [PATCH 0282/1055] MAGETWO-96127: [2.3.x] Catalog grid page number
 resets after Save and Close action.

- Remove unnecessary code.
---
 .../Ui/view/base/web/js/grid/paging/paging.js       | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
index 26ee4ad213458..11fdbad21d251 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
@@ -32,15 +32,6 @@ define([
                 }
             },
 
-            currentConfig: {
-                component: 'Magento_Ui/js/grid/paging/paging',
-                name: '${ $.name }_current',
-                storageConfig: {
-                    provider: '${ $.storageConfig.provider }',
-                    namespace: '${ $.storageConfig.namespace }'
-                }
-            },
-
             imports: {
                 pageSize: '${ $.sizesConfig.name }:value',
                 totalSelected: '${ $.selectProvider }:totalSelected',
@@ -53,10 +44,6 @@ define([
                 current: '${ $.provider }:params.paging.current'
             },
 
-            tracks: {
-                current: true
-            },
-
             statefull: {
                 current: true
             },

From 93768c0a9cca5dda9d9670ad02ac727345e0e5d2 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 26 Feb 2019 17:02:58 +0300
Subject: [PATCH 0283/1055] MAGETWO-96127: [2.3.x] Catalog grid page number
 resets after Save and Close action.

- Code style.
---
 app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
index 11fdbad21d251..558b1fc34b801 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
@@ -181,6 +181,7 @@ define([
             if (typeof this.filters !== 'undefined') {
                 this.current = 1;
             }
+
             return this;
         },
 

From 692afe768d22bb4c5b536eec06b7fa802e394529 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Tue, 26 Feb 2019 10:25:42 -0600
Subject: [PATCH 0284/1055] MC-4454: Convert
 CreateDuplicateUrlCategoryEntityTest to MFTF

---
 .../ActionGroup/AdminCategoryActionGroup.xml  | 13 ++++++
 .../Section/AdminCategoryMessagesSection.xml  |  1 +
 .../Test/AdminCreateDuplicateCategoryTest.xml | 40 +++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
index 86986265bae2c..c658e8b359f81 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
@@ -275,4 +275,17 @@
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <waitForElementVisible selector="{{AdminCategoryContentSection.categoryPageTitle}}" stepKey="waitForCategoryTitle"/>
     </actionGroup>
+    <actionGroup name="adminFillAndSaveCategoryForm">
+        <arguments>
+            <argument name="category" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="$$category.name$$" stepKey="enterCategoryName"/>
+        <scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSearchEngineOptimization"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="$$category.custom_attributes[url_key]$$" stepKey="enterURLKey"/>
+        <scrollToTopOfPage stepKey="scrollToTheTopOfPage"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
index fee86ca1caa29..ea4f4bf53eb71 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCategoryMessagesSection">
         <element name="SuccessMessage" type="text" selector=".message-success"/>
+        <element name="errorMessage" type="text" selector="//div[@class='message message-error error']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
new file mode 100644
index 0000000000000..4865e3a89b67a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
@@ -0,0 +1,40 @@
+<?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="AdminCreateDuplicateCategoryTest">
+        <annotations>
+            <stories value="Create category"/>
+            <title value="CreateDuplicateUrlCategoryEntityTestVariation1_Subcategory_RequiredFields"/>
+            <description value="Login as admin and create duplicate category"/>
+            <testCaseId value="MC-14702"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Open Category Page and select Add category -->
+        <actionGroup ref="goToCreateCategoryPage" stepKey="goToCategoryPage"/>
+
+        <!-- Fill the Category form with same name and urlKey as initially created category(SimpleSubCategory) -->
+        <actionGroup ref="adminFillAndSaveCategoryForm" stepKey="fillCategoryForm">
+            <argument name="category" value="category"/>
+        </actionGroup>
+
+        <!-- Assert error message -->
+        <see selector="{{AdminCategoryMessagesSection.errorMessage}}" userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
+    </test>
+</tests>

From 0def6c20ad6ae7ed847cafd75b2cbdf8b651e25f Mon Sep 17 00:00:00 2001
From: Denis Kopylov <dkopylov@magenius.team>
Date: Tue, 26 Feb 2019 19:31:34 +0300
Subject: [PATCH 0285/1055] [FIX] Revert usage of deprecate marked classes in
 layout

---
 .../view/frontend/layout/wishlist_index_index.xml    | 12 ++++++------
 .../frontend/templates/item/column/actions.phtml     |  2 +-
 .../frontend/templates/item/column/comment.phtml     |  2 +-
 .../view/frontend/templates/item/column/edit.phtml   |  2 +-
 .../view/frontend/templates/item/column/name.phtml   |  2 +-
 .../view/frontend/templates/item/column/remove.phtml |  2 +-
 6 files changed, 11 insertions(+), 11 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 8696d178d89d7..b20bc6a4e00ba 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
@@ -17,7 +17,7 @@
                 <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"/>
-                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.name" template="Magento_Wishlist::item/column/name.phtml" cacheable="false"/>
+                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info" name="customer.wishlist.item.name" template="Magento_Wishlist::item/column/name.phtml" cacheable="false"/>
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.review" template="Magento_Wishlist::item/column/review.phtml" cacheable="false"/>
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.price" template="Magento_Wishlist::item/column/price.phtml" cacheable="false">
                         <block class="Magento\Catalog\Pricing\Render" name="product.price.render.wishlist">
@@ -30,11 +30,11 @@
                         </block>
                         <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Options" name="customer.wishlist.item.options" cacheable="false"/>
                     </block>
-                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.inner" template="Magento_Wishlist::item/column/actions.phtml" cacheable="false">
+                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Actions" name="customer.wishlist.item.inner" template="Magento_Wishlist::item/column/actions.phtml" cacheable="false">
                         <arguments>
                             <argument name="css_class" xsi:type="string">product-item-inner</argument>
                         </arguments>
-                        <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.comment" template="Magento_Wishlist::item/column/comment.phtml" cacheable="false">
+                        <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Comment" name="customer.wishlist.item.comment" template="Magento_Wishlist::item/column/comment.phtml" cacheable="false">
                             <arguments>
                                 <argument name="title" translate="true" xsi:type="string">Product Details and Comment</argument>
                             </arguments>
@@ -45,12 +45,12 @@
                             </arguments>
                         </block>
 
-                        <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.actions" template="Magento_Wishlist::item/column/actions.phtml" cacheable="false">
+                        <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Actions" name="customer.wishlist.item.actions" template="Magento_Wishlist::item/column/actions.phtml" cacheable="false">
                             <arguments>
                                 <argument name="css_class" xsi:type="string">product-item-actions</argument>
                             </arguments>
-                            <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.edit" template="Magento_Wishlist::item/column/edit.phtml" before="-" cacheable="false"/>
-                            <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.remove" template="Magento_Wishlist::item/column/remove.phtml" cacheable="false"/>
+                            <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Edit" name="customer.wishlist.item.edit" template="Magento_Wishlist::item/column/edit.phtml" before="-" cacheable="false"/>
+                            <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Remove" name="customer.wishlist.item.remove" template="Magento_Wishlist::item/column/remove.phtml" cacheable="false"/>
                         </block>
                     </block>
                 </block>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
index 7fa55a839b2ea..0b50df8c59fbb 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Actions $block */
 ?>
 <?php $children = $block->getChildNames(); ?>
 <?php if ($children): ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
index 45bd7494fed4f..17e2404ee23cf 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block  */
+/* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Comment $block  */
 
 /* @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
index 81d770d556734..1898ef6fc0d66 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Edit $block */
 
 /** @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
index 53c5f35f886ea..265f4635a6be3 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info $block */
 
 /** @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
index 0bd78ba38ba58..57ae439d9995b 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-/* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
+/* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Remove $block */
 ?>
 
 <a href="#" data-role="remove" data-post-remove='<?= /* @noEscape */ $block->getItemRemoveParams($block->getItem()) ?>' title="<?= $block->escapeHtmlAttr(__('Remove Item')) ?>" class="btn-remove action delete">

From 95ba7aec2559a9364d92bcce4fe4e8a851b7cc8a Mon Sep 17 00:00:00 2001
From: mageprince <mail.mageprince@gmail.com>
Date: Wed, 27 Feb 2019 11:22:46 +0530
Subject: [PATCH 0286/1055] fix admin pages break

---
 .../web/css/source/module/header/_headings-group.less            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less
index 832c66b7988e0..bf7ee7850f9d0 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_headings-group.less
@@ -42,4 +42,5 @@
     color: @page-title__color;
     font-size: @page-title__font-size;
     margin-bottom: 0;
+    word-break: break-all;
 }

From caabef2fe931aa69b4955ff8265afa52cb61a361 Mon Sep 17 00:00:00 2001
From: Adarsh Khatri <me.adarshkhatri@gmail.com>
Date: Wed, 27 Feb 2019 17:14:44 +1100
Subject: [PATCH 0287/1055] Update price-bundle.js

By default tier price is sorted by "price_id". With this tier price calculation while displaying in bundle product is wrong. Need to sort tier price by "price_qty".
Issue created: https://github.com/magento/magento2/issues/21467
---
 app/code/Magento/Bundle/view/base/web/js/price-bundle.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index e56cc6f32d804..a832390b83dc7 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -375,6 +375,11 @@ define([
         var tiers = optionConfig.tierPrice,
             magicKey = _.keys(oneItemPrice)[0],
             lowest = false;
+        
+        //sorting based on "price_qty"
+        tiers.sort(function(a, b) {
+            return a.price_qty - b.price_qty;
+        });
 
         _.each(tiers, function (tier, index) {
             if (tier['price_qty'] > qty) {

From 4c1c65303c3b60de437cb84d882b16718f2f085a Mon Sep 17 00:00:00 2001
From: Adarsh Khatri <me.adarshkhatri@gmail.com>
Date: Wed, 27 Feb 2019 19:28:16 +1100
Subject: [PATCH 0288/1055] Update price-bundle.js

By default tier price is sorted by "price_id". With this tier price calculation while displaying in bundle product is wrong. Need to sort tier price by "price_qty".
---
 app/code/Magento/Bundle/view/base/web/js/price-bundle.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index a832390b83dc7..d298c4d6845f0 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -377,9 +377,11 @@ define([
             lowest = false;
         
         //sorting based on "price_qty"
-        tiers.sort(function(a, b) {
-            return a.price_qty - b.price_qty;
-        });
+        if(tiers){
+            tiers.sort(function (a, b) {
+                return a.price_qty - b.price_qty;
+            });
+        }
 
         _.each(tiers, function (tier, index) {
             if (tier['price_qty'] > qty) {

From b099719a7fc18d84bd210f441e0e432ccb5d5af8 Mon Sep 17 00:00:00 2001
From: Lilit Sargsyan <Lilit_Sargsyan@epam.com>
Date: Wed, 27 Feb 2019 12:33:18 +0400
Subject: [PATCH 0289/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Added automated test script.
---
 .../Magento/Catalog/Test/Mftf/Data/ConstData.xml     |  4 ++++
 .../Magento/Catalog/Test/Mftf/Data/ProductData.xml   |  4 ++++
 .../Test/Mftf/Section/AdminProductGridSection.xml    |  1 +
 .../Mftf/Section/StorefrontNavigationSection.xml     |  1 +
 .../Mftf/ActionGroup/AdminInvoiceActionGroup.xml     | 12 ++++++++++++
 5 files changed, 22 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
index 8a26b6babdbbc..d09880f14afbf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
@@ -13,4 +13,8 @@
         <data key="one">1</data>
         <data key="two">2</data>
     </entity>
+    <entity name="prodNameWithSpecChars">
+        <data key="trademark">"Pursuit Lumaflex™ Tone Band"</data>
+        <data key="skumark">"x™"</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 6d0d953e44676..f6032fd307a84 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -35,6 +35,10 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="ApiSimpleProductWithSpecCharInName" type="product" extends="ApiSimpleProduct">
+        <data key="name">Pursuit Lumaflex&#38;trade; Tone Band</data>
+        <data key="sku" unique="suffix">x&#38;trade;</data>
+    </entity>
     <entity name="ApiSimpleProductWithCustomPrice" type="product" extends="ApiSimpleProduct">
         <data key="price">100</data>
     </entity>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index 02bdbac313076..07dd26381fe08 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -17,6 +17,7 @@
         <element name="productGridElement2" type="text" selector="#addselector" />
         <element name="productGridRows" type="text" selector="table.data-grid tr.data-row"/>
         <element name="firstProductRow" type="text" selector="table.data-grid tr.data-row:first-of-type"/>
+        <element name="firstProductRowName" type="text" selector="table.data-grid tr.data-row:first-of-type > td:nth-of-type(4)"/>
         <element name="firstProductRowEditButton" type="button" selector="table.data-grid tr.data-row td .action-menu-item:first-of-type"/>
         <element name="productThumbnail" type="text" selector="table.data-grid tr:nth-child({{row}}) td.data-grid-thumbnail-cell > img" parameterized="true"/>
         <element name="productThumbnailBySrc" type="text" selector="img.admin__control-thumbnail[src*='{{pattern}}']" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
index c6bad0efb3ca7..0263e218c2417 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
@@ -12,5 +12,6 @@
         <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"/>
+        <element name="categoryBreadcrumbsByNumber" type="textarea" selector=".breadcrumbs li:nth-of-type({{var1}})" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index c814a886a2b33..990e488e9c662 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -63,4 +63,16 @@
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageInvoice"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
     </actionGroup>
+
+    <!--Filter invoices by order id -->
+    <actionGroup name="filterInvoiceGridByOrderId">
+        <arguments>
+            <argument name="orderId" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
+        <click selector="{{AdminInvoicesGridSection.filter}}" stepKey="clickFilter"/>
+        <fillField selector="{{AdminInvoicesFiltersSection.orderNum}}" userInput="{{orderId}}" stepKey="fillOrderIdForFilter"/>
+        <click selector="{{AdminInvoicesFiltersSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForPageLoad stepKey="waitForFiltersApply"/>
+    </actionGroup>
 </actionGroups>

From 18a590fb52d1268d3db1c5348805a629bf6b28e4 Mon Sep 17 00:00:00 2001
From: Vinai Kopp <vinai@netzarbeiter.com>
Date: Tue, 26 Feb 2019 22:55:47 +0100
Subject: [PATCH 0290/1055] Allow module data fixtures for
 @magentoDataFixtureBeforeTransaction annotations

Extend the option to specify a module based data fixture files to the
@magentoDataFixtureBeforeTransaction annotation.
Previously they where only available for the @magentoDataFixture annotation.

The syntax is the same:
@magentoDataFixtureBeforeAnnotation Foo_DataFixtureDummy::Test/Integration/foo.php

There is no backward compatibility break associated with this commit.
---
 .../TestFramework/Annotation/DataFixture.php  | 11 ++----
 .../DataFixtureBeforeTransaction.php          | 39 ++++++++++++++++++-
 .../Test/Annotation/DataFixtureTest.php       | 14 +++++++
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
index f0ee8c7b3c2bb..ddebbf37b16d1 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
@@ -158,14 +158,9 @@ private function isModuleAnnotation(string $fixture)
      */
     private function getModulePath(string $fixture)
     {
-        $fixturePathParts = explode('::', $fixture, 2);
-        $moduleName = $fixturePathParts[0];
-        $fixtureFile = $fixturePathParts[1];
+        [$moduleName, $fixtureFile] = explode('::', $fixture, 2);
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var ComponentRegistrar $componentRegistrar */
-        $componentRegistrar = $objectManager->get(ComponentRegistrar::class);
-        $modulePath = $componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
+        $modulePath = (new ComponentRegistrar())->getPath(ComponentRegistrar::MODULE, $moduleName);
 
         if ($modulePath === null) {
             throw new \Magento\Framework\Exception\LocalizedException(
@@ -173,7 +168,7 @@ private function getModulePath(string $fixture)
             );
         }
 
-        return $modulePath . '/' . $fixtureFile;
+        return $modulePath . '/' . ltrim($fixtureFile, '/');
     }
 
     /**
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
index db7f57362d807..0d4f652823c45 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
@@ -5,10 +5,11 @@
  */
 
 /**
- * Implementation of the @magentoDataFixture DocBlock annotation
+ * Implementation of the @magentoDataFixtureBeforeTransaction DocBlock annotation
  */
 namespace Magento\TestFramework\Annotation;
 
+use Magento\Framework\Component\ComponentRegistrar;
 use PHPUnit\Framework\Exception;
 
 class DataFixtureBeforeTransaction
@@ -93,6 +94,8 @@ protected function _getFixtures(\PHPUnit\Framework\TestCase $test, $scope = null
                 $fixtureMethod = [get_class($test), $fixture];
                 if (is_callable($fixtureMethod)) {
                     $result[] = $fixtureMethod;
+                } elseif ($this->isModuleAnnotation($fixture)) {
+                    $result[] = $this->getModulePath($fixture);
                 } else {
                     $result[] = $this->_fixtureBaseDir . '/' . $fixture;
                 }
@@ -101,6 +104,40 @@ protected function _getFixtures(\PHPUnit\Framework\TestCase $test, $scope = null
         return $result;
     }
 
+    /**
+     * Check is the Annotation like Magento_InventoryApi::Test/_files/products.php
+     *
+     * @param string $fixture
+     * @return bool
+     */
+    private function isModuleAnnotation(string $fixture)
+    {
+        return (strpos($fixture, '::') !== false);
+    }
+
+    /**
+     * Resolve the Fixture
+     *
+     * @param string $fixture
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.StaticAccess)
+     */
+    private function getModulePath(string $fixture)
+    {
+        [$moduleName, $fixtureFile] = explode('::', $fixture, 2);
+
+        $modulePath = (new ComponentRegistrar())->getPath(ComponentRegistrar::MODULE, $moduleName);
+
+        if ($modulePath === null) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                new \Magento\Framework\Phrase('Can\'t find registered Module with name %1 .', [$moduleName])
+            );
+        }
+
+        return $modulePath . '/' . ltrim($fixtureFile, '/');
+    }
+
     /**
      * @param \PHPUnit\Framework\TestCase $test
      * @return array
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php
index 22240ad8e1fe9..00af4419e1142 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Test\Annotation;
 
+use Magento\Framework\Component\ComponentRegistrar;
+
 /**
  * Test class for \Magento\TestFramework\Annotation\DataFixture.
  *
@@ -178,4 +180,16 @@ public function testRollbackTransactionRevertFixtureFile()
         );
         $this->_object->rollbackTransaction();
     }
+
+    /**
+     * @magentoDataFixture Foo_DataFixtureDummy::Test/Integration/foo.php
+     * @SuppressWarnings(PHPMD.StaticAccess)
+     */
+    public function testModuleDataFixture()
+    {
+        ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Foo_DataFixtureDummy', __DIR__);
+        $this->_object->expects($this->once())->method('_applyOneFixture')
+            ->with(__DIR__ . '/Test/Integration/foo.php');
+        $this->_object->startTransaction($this);
+    }
 }

From 65dbb0cf9575f4def1cf9caa1a0a2435a1d6fadf Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 27 Feb 2019 11:56:16 +0100
Subject: [PATCH 0291/1055] Extended tests coverage for more cases

---
 .../Magento/GraphQl/Quote/PlaceOrderTest.php  | 163 ++++++++++++++++--
 1 file changed, 148 insertions(+), 15 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php
index 4871830e087ec..7d4358b79bdc4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php
@@ -7,7 +7,10 @@
 
 namespace Magento\GraphQl\Quote;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -19,6 +22,11 @@
  */
 class PlaceOrderTest extends GraphQlAbstract
 {
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * @var CustomerTokenServiceInterface
      */
@@ -41,11 +49,16 @@ class PlaceOrderTest extends GraphQlAbstract
 
     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);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $this->objectManager->create(QuoteResource::class);
+        $this->quote = $this->objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $this->objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $this->objectManager->get(CustomerTokenServiceInterface::class);
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
     }
 
     /**
@@ -54,14 +67,138 @@ protected function setUp()
     public function testPlaceOrder()
     {
         $reservedOrderId = 'test_order_1';
-        $this->quoteResource->load(
-            $this->quote,
-            $reservedOrderId,
-            'reserved_order_id'
+
+        $query = $this->preparePlaceOrderQuery();
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
+     */
+    public function testPlaceOrderOfAnotherCustomerCart()
+    {
+        $query = $this->preparePlaceOrderQuery();
+
+        self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
+     */
+    public function testPlaceOrderWithOutOfStockProduct()
+    {
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple');
+        $extensionAttributes = $product->getExtensionAttributes();
+        $stockItem = $extensionAttributes->getStockItem();
+        $stockItem->setIsInStock(false);
+        $productRepository->save($product);
+
+        $query = $this->preparePlaceOrderQuery();
+
+        self::expectExceptionMessage('Unable to place order: Some of the products are out of stock');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
+     */
+    public function testPlaceOrderWithNoItemsInCart()
+    {
+        $quoteItems = $this->quote->getAllItems();
+
+        /** @var CartItemInterface $quoteItem */
+        foreach ($quoteItems as $quoteItem) {
+            $this->quote->removeItem($quoteItem->getItemId());
+        }
+        $this->quoteResource->save($this->quote);
+
+        $query = $this->preparePlaceOrderQuery();
+
+        self::expectExceptionMessage(
+            'Unable to place order: A server error stopped your order from being placed. ' .
+            'Please try to place your order again'
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
+     */
+    public function testPlaceOrderWithNoShippingMethod()
+    {
+        $this->quote->getShippingAddress()->setShippingMethod('');
+        $this->quoteResource->save($this->quote);
+
+        $query = $this->preparePlaceOrderQuery();
+
+        self::expectExceptionMessage(
+            'Unable to place order: The shipping method is missing. Select the shipping method and try again'
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
+     */
+    public function testPlaceOrderWithNoShippingAddress()
+    {
+        $this->quote->removeAddress($this->quote->getShippingAddress()->getId());
+        $this->quoteResource->save($this->quote);
+
+        $query = $this->preparePlaceOrderQuery();
+
+        self::expectExceptionMessage(
+            'Unable to place order: Some addresses can\'t be used due to the configurations for specific countries'
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
+     */
+    public function testPlaceOrderWithNoPaymentMethod()
+    {
+        $this->quote->getPayment()->setMethod('');
+        $this->quoteResource->save($this->quote);
+
+        $query = $this->preparePlaceOrderQuery();
+
+        self::expectExceptionMessage('Unable to place order: Enter a valid payment method and try again');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
+     */
+    public function testPlaceOrderWithNoBillingAddress()
+    {
+        $this->quote->removeAddress($this->quote->getBillingAddress()->getId());
+        $this->quoteResource->save($this->quote);
+
+        $query = $this->preparePlaceOrderQuery();
+
+        self::expectExceptionMessageRegExp(
+            '/Unable to place order: Please check the billing address information*/'
         );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * Prepares GraphQl query for placing an order
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function preparePlaceOrderQuery(): string
+    {
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
 
-        $query =<<<QUERY
+        return <<<QUERY
 mutation {
   placeOrder(input: {cart_id: "$maskedQuoteId"}) {
     order {
@@ -70,17 +207,13 @@ public function testPlaceOrder()
   }
 }
 QUERY;
-
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
     }
 
     /**
      * @param string $username
      * @param string $password
      * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
      */
     private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
     {

From b133eccf61ec7bbcf007233dd755109eb3a63ec7 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Wed, 27 Feb 2019 17:23:38 +0300
Subject: [PATCH 0292/1055] MAGETWO-58219: Product Attribute Option Values for
 storeview instead of admin on product creation

- Fix functional test
---
 .../Test/Mftf/Test/CreateProductAttributeEntityTest.xml   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml
index 52022f32fd8ec..aa5fc05ad9db4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml
@@ -417,9 +417,9 @@
         </actionGroup>
         <click stepKey="openAttributes" selector="{{AdminProductAttributesSection.sectionHeader}}"/>
         <waitForElementVisible selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" stepKey="waitforLabel"/>
-        <seeOptionIsSelected selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option3_frontend}}" stepKey="seeDefaultIsCorrect"/>
-        <see stepKey="seeOption1Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option1_frontend}}"/>
-        <see stepKey="seeOption2Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option2_frontend}}"/>
-        <see stepKey="seeOption3Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option3_frontend}}"/>
+        <seeOptionIsSelected selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option3_admin}}" stepKey="seeDefaultIsCorrect"/>
+        <see stepKey="seeOption1Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option1_admin}}"/>
+        <see stepKey="seeOption2Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option2_admin}}"/>
+        <see stepKey="seeOption3Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(multiselectProductAttribute.attribute_code)}}" userInput="{{multiselectProductAttribute.option3_admin}}"/>
     </test>
 </tests>

From 64b296e967a916cc4b335f2e10f758fd3dedfc6b Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Wed, 27 Feb 2019 11:22:03 -0600
Subject: [PATCH 0293/1055] MC-4426: Convert ExportProductsTest to MFTF

---
 .../Mftf/Data/CatalogSpecialPriceData.xml     |  20 +++
 .../Metadata/catalog_special_price-meta.xml   |  22 +++
 .../ActionGroup/AdminExportActionGroup.xml    |  58 ++++++++
 .../Test/AdminExportBundleProductTest.xml     | 120 +++++++++++++++++
 ...portGroupedProductWithSpecialPriceTest.xml |  84 ++++++++++++
 ...figurableProductsWithCustomOptionsTest.xml | 111 +++++++++++++++
 ...igurableProductsWithAssignedImagesTest.xml | 127 ++++++++++++++++++
 ...ableProductAssignedToCustomWebsiteTest.xml | 109 +++++++++++++++
 ...rtSimpleProductWithCustomAttributeTest.xml |  61 +++++++++
 .../Section/AdminExportAttributeSection.xml   |   6 +
 10 files changed, 718 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml
new file mode 100644
index 0000000000000..ab4cab2cda5aa
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogSpecialPriceData.xml
@@ -0,0 +1,20 @@
+<?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="specialProductPrice" type="catalogSpecialPrice">
+        <data key="price">99.99</data>
+        <data key="store_id">0</data>
+        <var key="sku" entityType="product2" entityKey="sku" />
+    </entity>
+    <entity name="specialProductPrice2" type="catalogSpecialPrice">
+        <data key="price">55.55</data>
+        <data key="store_id">0</data>
+        <var key="sku" entityType="product" entityKey="sku" />
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-meta.xml
new file mode 100644
index 0000000000000..27c9d2ede0f4b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_special_price-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="catalogSpecialPrice" dataType="catalogSpecialPrice" type="create" auth="adminOauth" url="/V1/products/special-price" method="POST">
+        <contentType>application/json</contentType>
+        <object key="prices" dataType="catalogSpecialPrice">
+            <object dataType="catalogSpecialPrice" key="0">
+                <field key="price">number</field>
+                <field key="store_id">integer</field>
+                <field key="sku">string</field>
+                <field key="price_from">string</field>
+                <field key="price_to">string</field>
+            </object>
+        </object>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
new file mode 100644
index 0000000000000..21b81648ea479
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
@@ -0,0 +1,58 @@
+<?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">
+
+    <!-- Export products using filtering by attribute -->
+    <actionGroup name="fillFilterExport">
+        <arguments>
+            <argument name="attribute"/>
+            <argument name="attributeData"/>
+        </arguments>
+        <selectOption selector="{{AdminExportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminExportMainSection.entityAttributes}}" stepKey="waitForElementVisible"/>
+        <scrollTo selector="{{AdminExportAttributeSection.chooseAttribute('attribute')}}" stepKey="scrollToAttribute" />
+        <checkOption selector="{{AdminExportAttributeSection.chooseAttribute('attribute')}}" stepKey="selectAttribute"/>
+        <fillField selector="{{AdminExportAttributeSection.fillFilter('attribute')}}" userInput="{{attributeData}}" stepKey="setDataInField"/>
+        <waitForPageLoad stepKey="waitForUserInput"/>
+        <scrollTo selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="scrollToContinue" />
+        <click selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="clickContinueButton"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <!-- Export products without filtering -->
+    <actionGroup name="exportAllProducts">
+        <selectOption selector="{{AdminExportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminExportMainSection.entityAttributes}}" stepKey="waitForElementVisible" time="5"/>
+        <scrollTo selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="scrollToContinue"/>
+        <wait stepKey="waitForScroll" time="5"/>
+        <click selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="clickContinueButton"/>
+        <wait stepKey="waitForClick" time="5"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <!-- Download first file in the grid -->
+    <actionGroup name="downloadProduct">
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormReload"/>
+        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex('0')}}"/>
+        <click stepKey="clickOnDownload" selector="{{AdminExportAttributeSection.download('0')}}" after="clickSelectBtn"/>
+    </actionGroup>
+
+    <!-- Delete exported file -->
+    <actionGroup name="deleteExportedFile">
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormReload"/>
+        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex('0')}}"/>
+        <click stepKey="clickOnDownload" selector="{{AdminExportAttributeSection.delete('0')}}" after="clickSelectBtn"/>
+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
new file mode 100644
index 0000000000000..476e3756f55ca
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.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="AdminExportBundleProductTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Bundle Product"/>
+            <description value="Admin should be able to export Bundle Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14008"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!--Create bundle product with dynamic price with two simple products -->
+            <createData entity="SimpleProduct2" stepKey="firstSimpleProductForDynamic"/>
+            <createData entity="SimpleProduct2" stepKey="secondSimpleProductForDynamic"/>
+            <createData entity="ApiBundleProduct" stepKey="createDynamicBundleProduct"/>
+            <createData entity="DropDownBundleOption" stepKey="createFirstBundleOption">
+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToDynamicProduct">
+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
+                <requiredEntity createDataKey="createFirstBundleOption"/>
+                <requiredEntity createDataKey="firstSimpleProductForDynamic"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="secondLinkOptionToDynamicProduct">
+                <requiredEntity createDataKey="createDynamicBundleProduct"/>
+                <requiredEntity createDataKey="createFirstBundleOption"/>
+                <requiredEntity createDataKey="secondSimpleProductForDynamic"/>
+            </createData>
+
+            <!-- Create bundle product with fixed price with two simple products -->
+            <createData entity="SimpleProduct2" stepKey="firstSimpleProductForFixed"/>
+            <createData entity="SimpleProduct2" stepKey="secondSimpleProductForFixed"/>
+            <createData entity="ApiFixedBundleProduct" stepKey="createFixedBundleProduct"/>
+            <createData entity="DropDownBundleOption" stepKey="createSecondBundleOption">
+                <requiredEntity createDataKey="createFixedBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToFixedProduct">
+                <requiredEntity createDataKey="createFixedBundleProduct"/>
+                <requiredEntity createDataKey="createSecondBundleOption"/>
+                <requiredEntity createDataKey="firstSimpleProductForFixed"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="secondLinkOptionToFixedProduct">
+                <requiredEntity createDataKey="createFixedBundleProduct"/>
+                <requiredEntity createDataKey="createSecondBundleOption"/>
+                <requiredEntity createDataKey="secondSimpleProductForFixed"/>
+            </createData>
+
+            <!-- Create bundle product with custom textarea attribute with two simple products -->
+            <createData entity="productAttributeWysiwyg" stepKey="createProductAttribute"/>
+            <createData entity="AddToDefaultSet" stepKey="addToDefaultAttributeSet">
+                <requiredEntity createDataKey="createProductAttribute"/>
+            </createData>
+            <createData entity="ApiFixedBundleProduct" stepKey="createFixedBundleProductWithAttribute">
+                <requiredEntity createDataKey="addToDefaultAttributeSet"/>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="firstSimpleProductForFixedWithAttribute"/>
+            <createData entity="SimpleProduct2" stepKey="secondSimpleProductForFixedWithAttribute"/>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOptionWithAttribute">
+                <requiredEntity createDataKey="createFixedBundleProductWithAttribute"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="firstLinkOptionToFixedProductWithAttribute">
+                <requiredEntity createDataKey="createFixedBundleProductWithAttribute"/>
+                <requiredEntity createDataKey="createBundleOptionWithAttribute"/>
+                <requiredEntity createDataKey="firstSimpleProductForFixedWithAttribute"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="secondLinkOptionToFixedProductWithAttribute">
+                <requiredEntity createDataKey="createFixedBundleProductWithAttribute"/>
+                <requiredEntity createDataKey="createBundleOptionWithAttribute"/>
+                <requiredEntity createDataKey="secondSimpleProductForFixedWithAttribute"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+
+            <!-- Delete products creations -->
+            <deleteData createDataKey="createDynamicBundleProduct" stepKey="deleteDynamicBundleProduct"/>
+            <deleteData createDataKey="firstSimpleProductForDynamic" stepKey="deleteFirstSimpleProductForDynamic"/>
+            <deleteData createDataKey="secondSimpleProductForDynamic" stepKey="deleteSecondSimpleProductForDynamic"/>
+            <deleteData createDataKey="createFixedBundleProduct" stepKey="deleteFixedBundleProduct"/>
+            <deleteData createDataKey="firstSimpleProductForFixed" stepKey="deleteFirstSimpleProductForFixed"/>
+            <deleteData createDataKey="secondSimpleProductForFixed" stepKey="deleteSecondSimpleProductForFixed"/>
+            <deleteData createDataKey="createFixedBundleProductWithAttribute" stepKey="deleteFixedBundleProductWithAttribute"/>
+            <deleteData createDataKey="firstSimpleProductForFixedWithAttribute" stepKey="deleteFirstSimpleProductForFixedWithAttribute"/>
+            <deleteData createDataKey="secondSimpleProductForFixedWithAttribute" stepKey="deleteSecondSimpleProductForFixedWithAttribute"/>
+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad" time="10"/>
+
+        <!-- Export created below products -->
+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
new file mode 100644
index 0000000000000..adec5daddfeb0
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
@@ -0,0 +1,84 @@
+<?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="AdminExportGroupedProductWithSpecialPriceTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export grouped product with special price"/>
+            <description value="Admin should be able to export grouped product with special price"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14009"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create first simple product and add special price  -->
+            <createData entity="SimpleProduct2" stepKey="createFirstSimpleProduct"/>
+            <createData entity="specialProductPrice2" stepKey="specialPriceToFirstProduct">
+                <requiredEntity createDataKey="createFirstSimpleProduct"/>
+            </createData>
+
+             <!-- Create second simple product and add special price-->
+            <createData entity="SimpleProduct2" stepKey="createSecondSimpleProduct"/>
+            <createData entity="specialProductPrice2" stepKey="specialPriceToSecondProduct">
+                <requiredEntity createDataKey="createSecondSimpleProduct"/>
+            </createData>
+
+            <!-- Create category -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+
+            <!-- Create group product with created below simple products -->
+            <createData entity="ApiGroupedProduct2" stepKey="createGroupedProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="OneSimpleProductLink" stepKey="addFirstProduct">
+                <requiredEntity createDataKey="createGroupedProduct"/>
+                <requiredEntity createDataKey="createFirstSimpleProduct"/>
+            </createData>
+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addFirstProduct" stepKey="addSecondProduct">
+                <requiredEntity createDataKey="createGroupedProduct"/>
+                <requiredEntity createDataKey="createSecondSimpleProduct"/>
+            </updateData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+
+            <!-- Deleted created products -->
+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+            <deleteData createDataKey="createGroupedProduct" stepKey="deleteGroupedProduct"/>
+
+            <!-- Delete category -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Export created below products -->
+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
new file mode 100644
index 0000000000000..883cdab2951fd
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.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="AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Simple and Configurable products with custom options"/>
+            <description value="Admin should be able to export Simple and Configurable products with custom options"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14005"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create category -->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+
+            <!-- Create configurable product with two attributes -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Add custom options to configurable product -->
+            <updateData createDataKey="createConfigProduct" entity="productWithOptions" stepKey="updateProductWithOptions"/>
+
+            <!-- Create two simple product which will be the part of configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigSecondChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+
+            <!-- Add created below children products to configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+
+            <!-- Delete configurable product creation -->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteConfigFirstChildProduct"/>
+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Fill entity attributes data -->
+        <actionGroup ref="fillFilterExport" stepKey="exportProductBySku">
+            <argument name="attribute" value="sku"/>
+            <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
new file mode 100644
index 0000000000000..10b81c4b1278a
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.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="AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Simple product and Configurable products with assigned images"/>
+            <description value="Admin should be able to export Simple and Configurable products with assigned images"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14004"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create category -->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+
+            <!-- Create configurable product with two attributes -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create first simple product which will be the part of configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+            </createData>
+
+            <!-- Add image to first simple product -->
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigChildFirstProductImage">
+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
+            </createData>
+
+            <!-- Create second simple product which will be the part of configurable product -->
+            <createData entity="ApiSimpleTwo" stepKey="createConfigSecondChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+
+            <!-- Add image to second simple product -->
+            <createData entity="ApiProductAttributeMediaGalleryEntryMagentoLogo" stepKey="createConfigSecondChildProductImage">
+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
+            </createData>
+
+            <!-- Add two options to configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+
+            <!-- Add created below children products to configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
+            </createData>
+
+            <!-- Add image to configurable product -->
+            <createData entity="ApiProductAttributeMediaGalleryEntryTestImage" stepKey="createConfigProductImage">
+                <requiredEntity createDataKey="createConfigProduct"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+
+            <!-- Delete configurable product creation -->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteConfigFirstChildProduct"/>
+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Fill entity attributes data -->
+        <actionGroup ref="fillFilterExport" stepKey="exportProductBySku">
+            <argument name="attribute" value="sku"/>
+            <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
new file mode 100644
index 0000000000000..72daebfd93bf7
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
@@ -0,0 +1,109 @@
+<?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="AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Simple Product assigned to Main Website and Configurable Product assigned to Custom Website"/>
+            <description value="Admin should be able to export Simple Product assigned to Main Website and Configurable Product assigned to Custom Website"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14006"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create simple product -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Create configurable product -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeFirstOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeSecondOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create two simple product which will be the part of configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigFirstChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigSecondChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeFirstOption"/>
+                <requiredEntity createDataKey="getConfigAttributeSecondOption"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddFirstChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigFirstChildProduct"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddSecondChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigSecondChildProduct"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+
+            <!-- Delete simple product -->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+
+            <!-- Delete configurable product creation -->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigFirstChildProduct" stepKey="deleteConfigFirstChildProduct"/>
+            <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Export created below products -->
+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
new file mode 100644
index 0000000000000..6553966b515a4
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.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="AdminExportSimpleProductWithCustomAttributeTest">
+        <annotations>
+            <features value="CatalogImportExport"/>
+            <stories value="Export products"/>
+            <title value="Export Simple Product with custom attribute"/>
+            <description value="Admin should be able to export Simple Product with custom attribute"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14007"/>
+            <group value="catalog_import_export"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create simple product with custom attribute set -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
+            <createData entity="SimpleProductWithCustomAttributeSet" stepKey="createSimpleProductWithCustomAttributeSet">
+                <requiredEntity createDataKey="createCategory"/>
+                <requiredEntity createDataKey="createAttributeSet"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <!-- Delete exported file -->
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+
+            <!-- Delete product creations -->
+            <deleteData createDataKey="createSimpleProductWithCustomAttributeSet" stepKey="deleteSimpleProductWithCustomAttributeSet"/>
+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to export page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
+        <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
+
+        <!-- Export created below products -->
+        <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
+
+        <!-- Download product -->
+        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
index ad9e7672ce11a..1a759867d9535 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
@@ -11,5 +11,11 @@
         <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"/>
+        <element name="chooseAttribute" type="checkbox" selector="//*[@name='export_filter[{{var}}]']/ancestor::tr//input[@type='checkbox']" parameterized="true"/>
+        <element name="fillFilter" type="input" selector="//*[@name='export_filter[{{var}}]']/ancestor::tr//input[@type='text']" parameterized="true"/>
+        <element name="continueBtn" type="button" selector="//*[@id='export_filter_container']/button"/>
+        <element name="selectByIndex" type="button" selector="//tr[@data-repeat-index='{{var}}']//button" parameterized="true"/>
+        <element name="download" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Download']" parameterized="true" timeout="10"/>
+        <element name="delete" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Delete']" parameterized="true" timeout="10"/>
     </section>
 </sections>

From 4575cbc7d15e76a19e26cd9580820313329f74a7 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Wed, 27 Feb 2019 11:55:48 -0600
Subject: [PATCH 0294/1055] MC-15060: Exception is thrown when cart product is
 disabled

---
 .../Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml     | 7 +++++++
 .../Quote/Model/ResourceModel/Quote/Item/Collection.php    | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
index 7a5c5e1d15872..e4a388d2c3a58 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
@@ -35,4 +35,11 @@
         <click selector="{{StoreFrontRemoveItemModalSection.ok}}" stepKey="confirmDelete"/>
         <waitForPageLoad stepKey="waitForDeleteToFinish"/>
     </actionGroup>
+
+    <!--Check that the minicart is empty-->
+    <actionGroup name="assertMiniCartEmpty">
+        <dontSeeElement selector="{{StorefrontMinicartSection.productCount}}" stepKey="dontSeeMinicartProductCount"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="expandMinicart"/>
+        <see selector="{{StorefrontMinicartSection.minicartContent}}" userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index abecec395865d..392a815ed963c 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -256,9 +256,8 @@ protected function _assignProducts(): self
         foreach ($this as $item) {
             /** @var ProductInterface $product */
             $product = $productCollection->getItemById($item->getProductId());
-            $isValidProduct = $this->isValidProduct($product);
             $qtyOptions = [];
-            if ($isValidProduct) {
+            if ($product && $this->isValidProduct($product)) {
                 $product->setCustomOptions([]);
                 $optionProductIds = $this->getOptionProductIds($item, $product, $productCollection);
                 foreach ($optionProductIds as $optionProductId) {

From a48ed740cac8c0129b395d858727d16d3fd64016 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Wed, 27 Feb 2019 11:53:37 -0600
Subject: [PATCH 0295/1055] MC-15072: Error at the end of a long list of Tax
 Rates

---
 .../Magento/Catalog/Model/CategoryList.php    |  5 ++--
 .../Test/Unit/Model/CategoryListTest.php      |  2 +-
 .../Model/Resolver/Products.php               | 27 ++-----------------
 .../Magento/Framework/Data/Collection.php     |  9 -------
 .../Data/Test/Unit/CollectionTest.php         | 13 ---------
 5 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/CategoryList.php b/app/code/Magento/Catalog/Model/CategoryList.php
index e3318db505489..cab8e013d9ba1 100644
--- a/app/code/Magento/Catalog/Model/CategoryList.php
+++ b/app/code/Magento/Catalog/Model/CategoryList.php
@@ -76,11 +76,10 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         $this->extensionAttributesJoinProcessor->process($collection);
 
         $this->collectionProcessor->process($searchCriteria, $collection);
-        $collection->load();
 
         $items = [];
-        foreach ($collection->getItems() as $category) {
-            $items[] = $this->categoryRepository->get($category->getId());
+        foreach ($collection->getAllIds() as $id) {
+            $items[] = $this->categoryRepository->get($id);
         }
 
         /** @var CategorySearchResultsInterface $searchResult */
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
index f78c0ad924954..b8b76524099f4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
@@ -93,7 +93,7 @@ public function testGetList()
 
         $collection = $this->getMockBuilder(Collection::class)->disableOriginalConstructor()->getMock();
         $collection->expects($this->once())->method('getSize')->willReturn($totalCount);
-        $collection->expects($this->once())->method('getItems')->willReturn([$categoryFirst, $categorySecond]);
+        $collection->expects($this->once())->method('getAllIds')->willReturn([$categoryIdFirst, $categoryIdSecond]);
 
         $this->collectionProcessorMock->expects($this->once())
             ->method('process')
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
index e910a5c8be4cd..24c5e664831e4 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
@@ -7,7 +7,6 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
-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,7 +16,6 @@
 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.
@@ -82,10 +80,10 @@ public function resolve(
         } elseif (isset($args['search'])) {
             $layerType = Resolver::CATALOG_LAYER_SEARCH;
             $this->searchFilter->add($args['search'], $searchCriteria);
-            $searchResult = $this->getSearchResult($this->searchQuery, $searchCriteria, $info);
+            $searchResult = $this->searchQuery->getResult($searchCriteria, $info);
         } else {
             $layerType = Resolver::CATALOG_LAYER_CATEGORY;
-            $searchResult = $this->getSearchResult($this->filterQuery, $searchCriteria, $info);
+            $searchResult = $this->filterQuery->getResult($searchCriteria, $info);
         }
         //possible division by 0
         if ($searchCriteria->getPageSize()) {
@@ -117,25 +115,4 @@ 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/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index dbafc9734e091..9c789e81913c4 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Data\Collection\EntityFactoryInterface;
 use Magento\Framework\Option\ArrayInterface;
-use Magento\Framework\Exception\InputException;
 
 /**
  * Data collection
@@ -235,20 +234,12 @@ 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 80c256d8553ef..daadeae2ac0e2 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
@@ -144,19 +144,6 @@ public function testGetCurPage()
         $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.
      *

From 739496a0edc7f1d319add2ff9282420133c74789 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Wed, 27 Feb 2019 15:41:10 -0600
Subject: [PATCH 0296/1055] MC-4434: Convert DeleteSearchTermEntityTest to MFTF

---
 .../Section/StorefrontMessagesSection.xml     |  2 +-
 .../AdminCatalogSearchTermActionGroup.xml     | 62 +++++++++++++++++++
 ...StorefrontCatalogSearchTermActionGroup.xml | 25 ++++++++
 .../Test/Mftf/Data/SearchTermData.xml         | 17 +++++
 .../Page/AdminCatalogSearchTermIndexPage.xml  | 14 +++++
 .../Page/AdminCatalogSearchTermNewPage.xml    | 14 +++++
 .../AdminCatalogSearchTermIndexSection.xml    | 22 +++++++
 .../AdminCatalogSearchTermMessagesSection.xml | 14 +++++
 .../AdminCatalogSearchTermNewSection.xml      | 18 ++++++
 .../Mftf/Test/AdminDeleteSearchTermTest.xml   | 59 ++++++++++++++++++
 10 files changed, 246 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
index 4dcda8dcd41ae..4447b27360a80 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -11,6 +11,6 @@
     <section name="StorefrontMessagesSection">
         <element name="success" type="text" selector="div.message-success.success.message"/>
         <element name="error" type="text" selector="div.message-error.error.message"/>
-        <element name="noticeMessage" type="text" selector="div.message-notice"/>
+        <element name="noticeMessage" type="text" selector="//div[@class='message notice']/div"/>
     </section>
 </sections>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
new file mode 100644
index 0000000000000..a9444a4e5baa6
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
@@ -0,0 +1,62 @@
+<?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">
+    <!--Add new search term and AssertSearchTermSaveSuccessMessage-->
+    <actionGroup name="AssertSearchTermSaveSuccessMessage">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+            <argument name="storeValue" type="string"/>
+            <argument name="redirectUrl" type="string"/>
+            <argument name="displayInSuggestedTerm" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.addNewSearchTermButton}}" stepKey="clickAddNewSearchTermButton"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermNewPageLoad"/>
+        <fillField selector="{{AdminCatalogSearchTermNewSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQueryTextBox"/>
+        <click selector="{{AdminCatalogSearchTermNewSection.store('storeValue')}}" stepKey="selectMainWebsiteStore"/>
+        <fillField selector="{{AdminCatalogSearchTermNewSection.redirectUrl}}" userInput="{{redirectUrl}}" stepKey="fillRedirectUrl"/>
+        <click selector="{{AdminCatalogSearchTermNewSection.displayInSuggestedTerm('displayInSuggestedTerm')}}" stepKey="selectDisplayInSuggestedTerm"/>
+        <click selector="{{AdminCatalogSearchTermNewSection.saveSearchButton}}" stepKey="clickSaveSearchButton"/>
+        <see selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" userInput="You saved the search term." stepKey="seeSaveSuccessMessage"/>
+    </actionGroup>
+    <!--Search and delete search term and AssertSearchTermSuccessDeleteMessage-->
+    <actionGroup name="AssertSearchTermSuccessDeleteMessage">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchIndexPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResultLoad"/>
+        <checkOption selector="{{AdminCatalogSearchTermIndexSection.checkBox}}" stepKey="checkCheckBox"/>
+        <selectOption selector="{{AdminCatalogSearchTermIndexSection.delete}}" userInput="delete" stepKey="selectDeleteOption"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.submit}}" stepKey="clickSubmitButton"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.okButton}}" stepKey="clickOkButton"/>
+        <see selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" userInput="Total of 1 record(s) were deleted." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+    <!--Verify deleted search term in grid and AssertSearchTermNotInGridMessage-->
+    <actionGroup name="AssertSearchTermNotInGrid">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchIndexPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResultToLoad"/>
+        <see selector="{{AdminCatalogSearchTermIndexSection.emptyRecords}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
new file mode 100644
index 0000000000000..5714cb4eb9f9c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.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">
+    <!--Verify AssertSearchTermNotOnFrontend-->
+    <actionGroup name="AssertSearchTermNotOnFrontend">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+            <argument name="url_key" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontProductPage.url('url_key')}}" stepKey="goToMagentoStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{SimpleTerm.search_query}}" stepKey="fillSearchQuery"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <see selector="{{StorefrontMessagesSection.noticeMessage}}" userInput="Your search returned no results." stepKey="seeAssertSearchTermNotOnFrontendNoticeMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml
new file mode 100644
index 0000000000000..995b860d107ca
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.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="SimpleTerm" type="searchTerm">
+        <data key="search_query" unique="suffix">Query text</data>
+        <data key="store_id">Default Store View</data>
+        <data key="redirect" unique="suffix">http://example.com/</data>
+        <data key="display_in_terms">No</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.xml
new file mode 100644
index 0000000000000..bbafff8ad7739
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermIndexPage.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="AdminCatalogSearchTermIndexPage" url="/search/term/index/" area="admin" module="Magento_CatalogSearch">
+        <section name="AdminCatalogSearchTermIndexSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.xml
new file mode 100644
index 0000000000000..de7491471741c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchTermNewPage.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="AdminCatalogSearchTermNewPage" url="/search/term/new/" area="admin" module="Magento_CatalogSearch">
+        <section name="AdminCatalogSearchTermNewSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
new file mode 100644
index 0000000000000..812c302f9c00a
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.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="AdminCatalogSearchTermIndexSection">
+        <element name="addNewSearchTermButton" type="button" selector="//div[@class='page-actions-buttons']/button[@id='add']" timeout="30"/>
+        <element name="resetFilterButton" type="button" selector="//button[@class='action-default scalable action-reset action-tertiary']" timeout="30"/>
+        <element name="searchButton" type="button" selector="//button[@class='action-default scalable action-secondary']" timeout="30"/>
+        <element name="delete" type="text" selector="//div[@class='admin__grid-massaction-form']//select[@id='search_term_grid_massaction-select']"/>
+        <element name="submit" type="button" selector="//button[@class='action-default scalable']/span" timeout="30"/>
+        <element name="searchQuery" type="text" selector="//tr[@class='data-grid-filters']//td/input[@name='search_query']"/>
+        <element name="checkBox" type="checkbox" selector="//label[@class='data-grid-checkbox-cell-inner']/input[@name='search']"/>
+        <element name="okButton" type="button" selector="//button[@class='action-primary action-accept']/span" timeout="30"/>
+        <element name="emptyRecords" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.xml
new file mode 100644
index 0000000000000..5d19198a1b94c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermMessagesSection.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="AdminCatalogSearchTermMessagesSection">
+        <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div[@data-ui-id='messages-message-success']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml
new file mode 100644
index 0000000000000..7922e994c4965
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.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="AdminCatalogSearchTermNewSection">
+        <element name="searchQuery" type="text" selector="//div[@class='admin__field-control control']/input[@id='query_text']"/>
+        <element name="store" type="text" selector="//select[@id='store_id']//optgroup/option[contains(.,'{{store}}')]" parameterized="true"/>
+        <element name="redirectUrl" type="text" selector="//div[@class='admin__field-control control']/input[@id='redirect']"/>
+        <element name="displayInSuggestedTerm" type="select" selector="//select[@name='display_in_terms']/option[contains(.,'{{text}}')]" parameterized="true"/>
+        <element name="saveSearchButton" type="button" selector="//button[@id='save']/span[@class='ui-button-text']" timeout="30"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml
new file mode 100644
index 0000000000000..dc9d99fabefc6
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml
@@ -0,0 +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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteSearchTermTest">
+        <annotations>
+            <stories value="DeleteSearchTerm"/>
+            <title value="DeleteSearchTermEntityTestVariation1"/>
+            <description value="Test log in to SearchTerm and DeleteSearchTerm"/>
+            <testCaseId value="MC-13988"/>
+            <severity value="CRITICAL"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Add new search term-->
+        <actionGroup ref="AssertSearchTermSaveSuccessMessage" stepKey="addNewSearchTerm">
+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
+            <argument name="displayInSuggestedTerm" value="No"/>
+        </actionGroup>
+
+        <!--Search and delete search term and AssertSearchTermSuccessDeleteMessage-->
+        <actionGroup ref="AssertSearchTermSuccessDeleteMessage" stepKey="deleteSearchTerm">
+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
+        </actionGroup>
+
+        <!--Verify deleted search term in grid and AssertSearchTermNotInGrid-->
+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="verifyDeletedSearchTermNotInGrid">
+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
+        </actionGroup>
+
+        <!--Verify AssertSearchTermNotOnFrontend-->
+        <actionGroup ref="AssertSearchTermNotOnFrontend" stepKey="verifySearchTermNotOnFrontend">
+            <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
+            <argument name="url_key" value="$$simpleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file

From ec62bf7f1b19ca2fdbffeb4f41fd52b354c895bb Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Wed, 27 Feb 2019 15:50:13 -0600
Subject: [PATCH 0297/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 .../Framework/Lock/Backend/ZookeeperTest.php  |  90 ++++++
 .../Framework/Lock/Backend/Zookeeper.php      |  11 +-
 .../Framework/Lock/LockBackendFactory.php     |  15 +-
 .../Lock/Test/Unit/LockBackendFactoryTest.php |  10 +-
 .../Magento/Setup/Model/ConfigOptionsList.php |   3 +-
 .../Setup/Model/ConfigOptionsList/Lock.php    | 291 ++++++++++++++++++
 .../Unit/Model/ConfigOptionsList/LockTest.php | 196 ++++++++++++
 .../Test/Unit/Model/ConfigOptionsListTest.php |  17 +-
 8 files changed, 619 insertions(+), 14 deletions(-)
 create mode 100644 setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
 create mode 100644 setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
index e69de29bb2d1d..6e312637c7b5a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\App\DeploymentConfig\FileReader;
+use Magento\Framework\Stdlib\ArrayManager;
+
+/**
+ * \Magento\Framework\Lock\Backend\Zookeeper test case
+ */
+class ZookeeperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FileReader
+     */
+    private $configReader;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var LockBackendFactory
+     */
+    private $lockBackendFactory;
+
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @var ZookeeperLock
+     */
+    private $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        if (!extension_loaded('zookeeper')) {
+            $this->markTestSkipped('php extension Zookeeper is not installed.');
+        }
+
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->configReader = $this->objectManager->get(FileReader::class);
+        $this->lockBackendFactory = $this->objectManager->create(LockBackendFactory::class);
+        $this->arrayManager = $this->objectManager->create(ArrayManager::class);
+        $config = $this->configReader->load(ConfigFilePool::APP_ENV);
+
+        if ($this->arrayManager->get('lock/provider', $config) !== 'zookeeper') {
+            $this->markTestSkipped('Zookeeper is not configured during installation.');
+        }
+
+        $this->model = $this->lockBackendFactory->create();
+        $this->assertInstanceOf(ZookeeperLock::class, $this->model);
+    }
+
+    public function testLockAndUnlock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+
+        $this->assertTrue($this->model->lock($name));
+        $this->assertTrue($this->model->isLocked($name));
+
+        $this->assertTrue($this->model->unlock($name));
+        $this->assertFalse($this->model->isLocked($name));
+    }
+
+    public function testUnlockWithoutExistingLock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+        $this->assertFalse($this->model->unlock($name));
+    }
+}
+
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index d19ba0dd947b0..c2119df300c52 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -31,6 +31,8 @@ class Zookeeper implements LockManagerInterface
     private $path;
 
     /**
+     * The name of sequence nodes
+     *
      * @var string
      */
     private $lockName = 'lock-';
@@ -70,12 +72,17 @@ class Zookeeper implements LockManagerInterface
      */
     private $locks = [];
 
+    /**
+     * The default path to storage locks
+     */
+    const DEFAULT_PATH = '/magento/locks';
+
     /**
      * @param string $host The host to connect to Zookeeper
      * @param string $path The base path to locks in Zookeeper
      * @throws RuntimeException
      */
-    public function __construct(string $host, string $path = '/magento/locks')
+    public function __construct(string $host, string $path = self::DEFAULT_PATH)
     {
         if (empty($path)) {
             throw new RuntimeException(
@@ -164,7 +171,7 @@ private function getFullPathToLock(string $name): string
      * @return \Zookeeper
      * @throws RuntimeException
      */
-    private function getProvider(): \Zookeeper
+    public function getProvider(): \Zookeeper
     {
         if (!$this->zookeeper) {
             $this->zookeeper = new \Zookeeper($this->host);
diff --git a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
index e2119ca3eee11..ec15736bef534 100644
--- a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
@@ -13,6 +13,7 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Lock\Backend\Database as DatabaseLock;
 use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\Backend\Cache as CacheLock;
 
 /**
  * The factory to create object that implements LockManagerInterface
@@ -47,6 +48,13 @@ class LockBackendFactory
      */
     const LOCK_ZOOKEEPER = 'zookeeper';
 
+    /**
+     * Cache lock provider name
+     *
+     * @const string
+     */
+    const LOCK_CACHE = 'cache';
+
     /**
      * The list of lock providers with mapping on classes
      *
@@ -54,7 +62,8 @@ class LockBackendFactory
      */
     private $lockers = [
         self::LOCK_DB => DatabaseLock::class,
-        self::LOCK_ZOOKEEPER => ZookeeperLock::class
+        self::LOCK_ZOOKEEPER => ZookeeperLock::class,
+        self::LOCK_CACHE => CacheLock::class,
     ];
 
     /**
@@ -77,8 +86,8 @@ public function __construct(
      */
     public function create(): LockManagerInterface
     {
-        $provider = $this->deploymentConfig->get('locks/provider', self::LOCK_DB);
-        $config = $this->deploymentConfig->get('locks/config', []);
+        $provider = $this->deploymentConfig->get('lock/provider', self::LOCK_DB);
+        $config = $this->deploymentConfig->get('lock/config', []);
 
         if (!isset($this->lockers[$provider])) {
             throw new RuntimeException(new Phrase('Unknown locks provider.'));
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
index f3b141e9f902b..18053f20f010c 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Framework\Lock\Backend\Database as DatabaseLock;
 use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\Backend\Cache as CacheLock;
 use Magento\Framework\Lock\LockBackendFactory;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Lock\LockManagerInterface;
@@ -51,7 +52,7 @@ public function testCreateWithException()
     {
         $this->deploymentConfigMock->expects($this->exactly(2))
             ->method('get')
-            ->withConsecutive(['locks/provider', LockBackendFactory::LOCK_DB], ['locks/config', []])
+            ->withConsecutive(['lock/provider', LockBackendFactory::LOCK_DB], ['lock/config', []])
             ->willReturnOnConsecutiveCalls('someProvider', []);
 
         $this->factory->create();
@@ -68,7 +69,7 @@ public function testCreate(string $lockProvider, string $lockProviderClass, arra
         $lockManagerMock = $this->getMockForAbstractClass(LockManagerInterface::class);
         $this->deploymentConfigMock->expects($this->exactly(2))
             ->method('get')
-            ->withConsecutive(['locks/provider', LockBackendFactory::LOCK_DB], ['locks/config', []])
+            ->withConsecutive(['lock/provider', LockBackendFactory::LOCK_DB], ['lock/config', []])
             ->willReturnOnConsecutiveCalls($lockProvider, $config);
         $this->objectManagerMock->expects($this->once())
             ->method('create')
@@ -89,6 +90,11 @@ public function createDataProvider(): array
                 'lockProviderClass' => DatabaseLock::class,
                 'config' => ['prefix' => 'somePrefix'],
             ],
+            'cache' => [
+                'lockProvider' => LockBackendFactory::LOCK_CACHE,
+                'lockProviderClass' => CacheLock::class,
+                'config' => [],
+            ],
         ];
 
         if (extension_loaded('zookeeper')) {
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList.php b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
index afe1a5d9e2591..3f2aedae1373c 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
@@ -50,7 +50,8 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     private $configOptionsListClasses = [
         \Magento\Setup\Model\ConfigOptionsList\Session::class,
         \Magento\Setup\Model\ConfigOptionsList\Cache::class,
-        \Magento\Setup\Model\ConfigOptionsList\PageCache::class
+        \Magento\Setup\Model\ConfigOptionsList\PageCache::class,
+        \Magento\Setup\Model\ConfigOptionsList\Lock::class,
     ];
 
     /**
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
new file mode 100644
index 0000000000000..912b0e42ca822
--- /dev/null
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Model\ConfigOptionsList;
+
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\ConfigOptionsListInterface;
+use Magento\Framework\Setup\Option\SelectConfigOption;
+use Magento\Framework\Setup\Option\TextConfigOption;
+
+/**
+ * Deployment configuration options for locks
+ */
+class Lock implements ConfigOptionsListInterface
+{
+    /**
+     * The name of an option to set lock provider
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_PROVIDER = 'lock-provider';
+
+    /**
+     * The name of an option to set DB prefix
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_DB_PREFIX = 'lock-db-prefix';
+
+    /**
+     * The name of an option to set Zookeeper host
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_ZOOKEEPER_HOST = 'lock-zookeeper-host';
+
+    /**
+     * The name of an option to set Zookeeper path
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_ZOOKEEPER_PATH = 'lock-zookeeper-path';
+
+    /**
+     * The configuration path to save lock provider
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_PROVIDER = 'lock/provider';
+
+    /**
+     * The configuration path to save DB prefix
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_DB_PREFIX = 'lock/config/prefix';
+
+    /**
+     * The configuration path to save Zookeeper host
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_ZOOKEEPER_HOST = 'lock/config/host';
+
+    /**
+     * The configuration path to save Zookeeper path
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_ZOOKEEPER_PATH = 'lock/config/path';
+
+    /**
+     * The list of lock providers
+     *
+     * @var array
+     */
+    private $validLockProviders = [
+        LockBackendFactory::LOCK_DB,
+        LockBackendFactory::LOCK_ZOOKEEPER,
+        LockBackendFactory::LOCK_CACHE,
+    ];
+
+    /**
+     * The mapping input keys with their configuration paths
+     *
+     * @var array
+     */
+    private $mappingInputKeyToConfigPath = [
+        LockBackendFactory::LOCK_DB => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+            self::INPUT_KEY_LOCK_DB_PREFIX => self::CONFIG_PATH_LOCK_DB_PREFIX,
+        ],
+        LockBackendFactory::LOCK_ZOOKEEPER => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+            self::INPUT_KEY_LOCK_ZOOKEEPER_HOST => self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+            self::INPUT_KEY_LOCK_ZOOKEEPER_PATH => self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
+        ],
+        LockBackendFactory::LOCK_CACHE => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+        ],
+    ];
+
+    /**
+     * The list of default values
+     *
+     * @var array
+     */
+    private $defaultConfigValues = [
+        self::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
+        self::INPUT_KEY_LOCK_DB_PREFIX => null,
+        self::INPUT_KEY_LOCK_ZOOKEEPER_PATH => ZookeeperLock::DEFAULT_PATH,
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function getOptions()
+    {
+        return [
+            new SelectConfigOption(
+                self::INPUT_KEY_LOCK_PROVIDER,
+                SelectConfigOption::FRONTEND_WIZARD_SELECT,
+                $this->validLockProviders,
+                self::CONFIG_PATH_LOCK_PROVIDER,
+                'Lock provider name',
+                LockBackendFactory::LOCK_DB
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_DB_PREFIX,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_DB_PREFIX,
+                'Installation specific lock prefix to avoid lock conflicts'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_ZOOKEEPER_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+                'Host and port to connect to Zookeeper cluster. For example: 127.0.0.1:2181'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_ZOOKEEPER_PATH,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
+                'The path where Zookeeper will save locks. The default path is: ' . ZookeeperLock::DEFAULT_PATH
+            ),
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createConfig(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData->setOverrideWhenSave(true);
+        $lockProvider = $this->getLockProvider($options, $deploymentConfig);
+
+        $this->setDefaultConfiguration($configData, $deploymentConfig, $lockProvider);
+
+        foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
+            if (isset($options[$input])) {
+                $configData->set($path, $options[$input]);
+            }
+        }
+
+        return $configData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $lockProvider = $this->getLockProvider($options, $deploymentConfig);
+        switch ($lockProvider) {
+            case LockBackendFactory::LOCK_ZOOKEEPER:
+                $errors = $this->validateZookeeperConfig($options, $deploymentConfig);
+                break;
+            case LockBackendFactory::LOCK_CACHE:
+            case LockBackendFactory::LOCK_DB:
+                $errors = [];
+                break;
+            default:
+                $errors[] = 'The lock provider ' . $lockProvider . ' does not exist.';
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Validates Zookeeper configuration
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return array
+     */
+    private function validateZookeeperConfig(array $options, DeploymentConfig $deploymentConfig): array
+    {
+        $errors = [];
+
+        if (!extension_loaded(LockBackendFactory::LOCK_ZOOKEEPER)) {
+            $errors[] = 'php extension Zookeeper is not installed.';
+        }
+
+        $host = (string) $options[self::INPUT_KEY_LOCK_ZOOKEEPER_HOST]
+            ?? $deploymentConfig->get(
+                   self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+                   $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_HOST)
+               );
+        $path = (string) $options[self::INPUT_KEY_LOCK_ZOOKEEPER_PATH]
+            ?? $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_PATH)
+            );
+
+        if (!$path) {
+            $errors[] = 'Zookeeper path needs to be a non-empty string.';
+        }
+
+        if (!$host) {
+            $errors[] = 'Zookeeper host is should be set.';
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Returns the name of lock provider
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return string
+     */
+    private function getLockProvider(array $options, DeploymentConfig $deploymentConfig): string
+    {
+        if (empty($options[self::INPUT_KEY_LOCK_PROVIDER])) {
+            return (string) $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_PROVIDER,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_PROVIDER)
+            );
+        }
+
+        return (string) $options[self::INPUT_KEY_LOCK_PROVIDER];
+    }
+
+
+    /**
+     * Sets default configuration for locks
+     *
+     * @param ConfigData $configData
+     * @param DeploymentConfig $deploymentConfig
+     * @param string $lockProvider
+     * @return ConfigData
+     */
+    private function setDefaultConfiguration(
+        ConfigData $configData,
+        DeploymentConfig $deploymentConfig,
+        string $lockProvider
+    ) {
+        foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
+            $configData->set($path, $deploymentConfig->get($path, $this->getDefaultValue($input)));
+        }
+
+        return $configData;
+    }
+
+    /**
+     * Returns default value by input key
+     *
+     * If default value is not set returns null
+     *
+     * @param string $inputKey
+     * @return mixed|null
+     */
+    private function getDefaultValue(string $inputKey)
+    {
+        if (isset($this->defaultConfigValues[$inputKey])) {
+            return $this->defaultConfigValues[$inputKey];
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
new file mode 100644
index 0000000000000..f7ca6e0a09b5a
--- /dev/null
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Test\Unit\Model\ConfigOptionsList;
+
+use Magento\Setup\Model\ConfigOptionsList\Lock as LockConfigOptionsList;
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Setup\Option\SelectConfigOption;
+use Magento\Framework\Setup\Option\TextConfigOption;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class LockTest extends TestCase
+{
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var LockConfigOptionsList
+     */
+    private $lockConfigOptionsList;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->lockConfigOptionsList = new LockConfigOptionsList();
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetOptions()
+    {
+        $options = $this->lockConfigOptionsList->getOptions();
+        $this->assertSame(4, count($options));
+
+        $this->assertArrayHasKey(0, $options);
+        $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER, $options[0]->getName());
+
+        $this->assertArrayHasKey(1, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[1]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX, $options[1]->getName());
+
+        $this->assertArrayHasKey(2, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[2]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST, $options[2]->getName());
+
+        $this->assertArrayHasKey(3, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[3]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH, $options[3]->getName());
+    }
+
+    /**
+     * @param array $options
+     * @param array $expectedResult
+     * @dataProvider createConfigDataProvider
+     */
+    public function testCreateConfig(array $options, array $expectedResult)
+    {
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('get')
+            ->willReturnArgument(1);
+        $data = $this->lockConfigOptionsList->createConfig($options, $this->deploymentConfigMock);
+        $this->assertInstanceOf(ConfigData::class, $data);
+        $this->assertTrue($data->isOverrideWhenSave());
+        $this->assertSame($expectedResult, $data->getData());
+    }
+
+    /**
+     * @return array
+     */
+    public function createConfigDataProvider(): array
+    {
+        return [
+            'Check default values' => [
+                'options' => [],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => null,
+                        ],
+                    ],
+                ],
+            ],
+            'Check default value for cache lock' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_CACHE,
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_CACHE,
+                    ],
+                ],
+            ],
+            'Check default value for zookeeper lock' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_ZOOKEEPER,
+                        'config' => [
+                            'host' => null,
+                            'path' => ZookeeperLock::DEFAULT_PATH,
+                        ],
+                    ],
+                ],
+            ],
+            'Check specific db lock options' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX => 'my_prefix'
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => 'my_prefix',
+                        ],
+                    ],
+                ],
+            ],
+            'Check specific zookeeper lock options' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST => '123.45.67.89:10',
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH => '/some/path',
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_ZOOKEEPER,
+                        'config' => [
+                            'host' => '123.45.67.89:10',
+                            'path' => '/some/path',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @param array $options
+     * @param array $expectedResult
+     * @dataProvider validateDataProvider
+     */
+    public function testValidate(array $options, array $expectedResult)
+    {
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('get')
+            ->willReturnArgument(1);
+        $this->assertSame($expectedResult, $this->lockConfigOptionsList->validate($options, $this->deploymentConfigMock));
+    }
+
+    /**
+     * @return array
+     */
+    public function validateDataProvider(): array
+    {
+        return [
+            'Wrong lock provider' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => 'SomeProvider',
+                ],
+                'expectedResult' => [
+                    'The lock provider SomeProvider does not exist.',
+                ],
+            ],
+            'Empty host and path for Zookeeper' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST => '',
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH => '',
+                ],
+                'expectedResult' => [
+                    'Zookeeper path needs to be a non-empty string.',
+                    'Zookeeper host is should be set.',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
index d7f680309c9ef..a85b468cebc92 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Setup\Test\Unit\Model;
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Setup\Model\ConfigOptionsList\Lock;
 use Magento\Setup\Model\ConfigGenerator;
 use Magento\Setup\Model\ConfigOptionsList;
 use Magento\Setup\Validator\DbValidator;
@@ -82,7 +83,7 @@ public function testCreateOptions()
         $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
         $this->generator->expects($this->once())->method('createCacheHostsConfig')->willReturn($configDataMock);
 
-        $configData = $this->object->createConfig([], $this->deploymentConfig);
+        $configData = $this->object->createConfig([Lock::INPUT_KEY_LOCK_PROVIDER => 'db'], $this->deploymentConfig);
         $this->assertGreaterThanOrEqual(6, count($configData));
     }
 
@@ -96,7 +97,7 @@ public function testCreateOptionsWithOptionalNull()
         $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
         $this->generator->expects($this->once())->method('createCacheHostsConfig')->willReturn($configDataMock);
 
-        $configData = $this->object->createConfig([], $this->deploymentConfig);
+        $configData = $this->object->createConfig([Lock::INPUT_KEY_LOCK_PROVIDER => 'db'], $this->deploymentConfig);
         $this->assertGreaterThanOrEqual(6, count($configData));
     }
 
@@ -109,7 +110,8 @@ public function testValidateSuccess()
             ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'name',
             ConfigOptionsListConstants::INPUT_KEY_DB_HOST => 'host',
             ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'user',
-            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass'
+            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass',
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $this->prepareValidationMocks();
 
@@ -127,7 +129,8 @@ public function testValidateInvalidSessionHandler()
             ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'name',
             ConfigOptionsListConstants::INPUT_KEY_DB_HOST => 'host',
             ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'user',
-            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass'
+            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass',
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $this->prepareValidationMocks();
 
@@ -141,7 +144,8 @@ public function testValidateEmptyEncryptionKey()
     {
         $options = [
             ConfigOptionsListConstants::INPUT_KEY_SKIP_DB_VALIDATION => true,
-            ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => ''
+            ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => '',
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $this->assertEquals(
             ['Invalid encryption key. Encryption key must be 32 character string without any white space.'],
@@ -167,7 +171,8 @@ public function testValidateCacheHosts($hosts, $expectedError)
     {
         $options = [
             ConfigOptionsListConstants::INPUT_KEY_SKIP_DB_VALIDATION => true,
-            ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS => $hosts
+            ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS => $hosts,
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $result = $this->object->validate($options, $this->deploymentConfig);
         if ($expectedError) {

From bcb2116f116344d8767623d6d731b58cd2201383 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Wed, 27 Feb 2019 16:05:46 -0600
Subject: [PATCH 0298/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index c2119df300c52..d491678d4d7fc 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -171,7 +171,7 @@ private function getFullPathToLock(string $name): string
      * @return \Zookeeper
      * @throws RuntimeException
      */
-    public function getProvider(): \Zookeeper
+    private function getProvider(): \Zookeeper
     {
         if (!$this->zookeeper) {
             $this->zookeeper = new \Zookeeper($this->host);

From d4dd2e6bb7c331a167317e2b67126f1c39df6a0f Mon Sep 17 00:00:00 2001
From: Adarsh Khatri <me.adarshkhatri@gmail.com>
Date: Thu, 28 Feb 2019 11:10:10 +1100
Subject: [PATCH 0299/1055] Update price-bundle.js

---
 .../Bundle/view/base/web/js/price-bundle.js      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index d298c4d6845f0..ee3ab25e90875 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -376,12 +376,16 @@ define([
             magicKey = _.keys(oneItemPrice)[0],
             lowest = false;
         
-        //sorting based on "price_qty"
-        if(tiers){
-            tiers.sort(function (a, b) {
-                return a.price_qty - b.price_qty;
-            });
-        }
+        //tiers is undefined when options has only one option 
+		if (undefined == tiers) {
+		    var firstKey = Object.keys(optionConfig)[0];
+		    tiers = optionConfig[firstKey].tierPrice;
+		}
+
+		//sorting based on "price_qty"
+        tiers.sort( function (a, b) {
+            return a['price_qty'] - b['price_qty'];
+        });
 
         _.each(tiers, function (tier, index) {
             if (tier['price_qty'] > qty) {

From 50647c4458baaa14f6f48eed82cd4fb51a204a15 Mon Sep 17 00:00:00 2001
From: Jitheesh <jitheeshvo@gmail.com>
Date: Thu, 28 Feb 2019 15:04:11 +0530
Subject: [PATCH 0300/1055] Setting default sorting #21493 - Fixed default sort
 direction

---
 app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php  | 3 ++-
 .../Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
index f2b8133e352ad..2fb59ec767e8a 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
@@ -63,7 +63,8 @@ protected function _construct()
     {
         parent::_construct();
         $this->setId('customer_orders_grid');
-        $this->setDefaultSort('created_at', 'desc');
+        $this->setDefaultSort('created_at');
+        $this->setDefaultDir('desc');
         $this->setUseAjax(true);
     }
 
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
index 1bc6bb1da3680..e63c00ba18d29 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
@@ -77,7 +77,8 @@ protected function _construct()
     {
         parent::_construct();
         $this->setId('customer_view_cart_grid');
-        $this->setDefaultSort('added_at', 'desc');
+        $this->setDefaultSort('added_at');
+        $this->setDefaultDir('desc');
         $this->setSortable(false);
         $this->setPagerVisibility(false);
         $this->setFilterVisibility(false);

From e80b1620240c874cd29421299f1b9fb98617b606 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Thu, 28 Feb 2019 13:06:04 +0300
Subject: [PATCH 0301/1055] MAGETWO-70232: [GITHUB] Import customizable options
 adds it to another product if same SKU is filled#9457

- Fixed integration test related issue;
---
 app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index 43d496c37ca69..5447c386c692c 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -58,9 +58,9 @@ public function execute($entity, $arguments = [])
             }
         }
         if ($options) {
-            $hasChangedSku = $entity->dataHasChangedFor('sku');
+            $hasChangedSku = ($entity->getOrigData('sku') !== null && $entity->dataHasChangedFor('sku'));
             foreach ($options as $option) {
-                if ($hasChangedSku) {
+                if ($hasChangedSku && $option->hasData('product_sku')) {
                     $option->setProductSku($entity->getSku());
                 }
                 $this->optionRepository->save($option);

From 30dbc79466e6fc383caae2cfa743eb81147e3540 Mon Sep 17 00:00:00 2001
From: Jitheesh <jitheeshvo@gmail.com>
Date: Thu, 28 Feb 2019 15:51:33 +0530
Subject: [PATCH 0302/1055] Same product quantity not increment when added with
 guest user. #21375 - removed non required item options while comparing with
 merge items

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

diff --git a/app/code/Magento/Quote/Model/Quote/Item/Compare.php b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
index ddaa636ef32b3..76ba324518dc1 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Compare.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
@@ -50,7 +50,7 @@ protected function getOptionValues($value)
         if (is_string($value) && $this->jsonValidator->isValid($value)) {
             $value = $this->serializer->unserialize($value);
             if (is_array($value)) {
-                unset($value['qty'], $value['uenc']);
+                unset($value['qty'], $value['uenc'], $value['related_product'], $value['item']);
                 $value = array_filter($value, function ($optionValue) {
                     return !empty($optionValue);
                 });

From b8a1d21bf74dc3a3975acae37678e88313484b2b Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Thu, 28 Feb 2019 15:23:44 +0300
Subject: [PATCH 0303/1055] MAGETWO-58219: Product Attribute Option Values for
 storeview instead of admin on product creation

- Fix functional test
---
 .../Mftf/Test/CreateProductAttributeEntityTest.xml   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml
index aa5fc05ad9db4..d895993217e32 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest.xml
@@ -262,10 +262,10 @@
         </actionGroup>
         <click stepKey="openAttributes" selector="{{AdminProductAttributesSection.sectionHeader}}"/>
         <waitForElementVisible selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" stepKey="waitforLabel"/>
-        <seeOptionIsSelected selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option3_frontend}}" stepKey="seeDefaultIsCorrect"/>
-        <see stepKey="seeOption1Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option1_frontend}}"/>
-        <see stepKey="seeOption2Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option2_frontend}}"/>
-        <see stepKey="seeOption3Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option3_frontend}}"/>
+        <seeOptionIsSelected selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option3_admin}}" stepKey="seeDefaultIsCorrect"/>
+        <see stepKey="seeOption1Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option1_admin}}"/>
+        <see stepKey="seeOption2Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option2_admin}}"/>
+        <see stepKey="seeOption3Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttribute.attribute_code)}}" userInput="{{dropdownProductAttribute.option3_admin}}"/>
     </test>
 
     <test name="CreateProductAttributeEntityDropdownWithSingleQuoteTest">
@@ -333,8 +333,8 @@
         </actionGroup>
         <click stepKey="openAttributes" selector="{{AdminProductAttributesSection.sectionHeader}}"/>
         <waitForElementVisible selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttributeWithQuote.attribute_code)}}" stepKey="waitforLabel"/>
-        <seeOptionIsSelected selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttributeWithQuote.attribute_code)}}" userInput="{{dropdownProductAttributeWithQuote.option1_frontend}}" stepKey="seeDefaultIsCorrect"/>
-        <see stepKey="seeOption1Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttributeWithQuote.attribute_code)}}" userInput="{{dropdownProductAttributeWithQuote.option1_frontend}}"/>
+        <seeOptionIsSelected selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttributeWithQuote.attribute_code)}}" userInput="{{dropdownProductAttributeWithQuote.option1_admin}}" stepKey="seeDefaultIsCorrect"/>
+        <see stepKey="seeOption1Available" selector="{{AdminProductAttributesSection.attributeDropdownByCode(dropdownProductAttributeWithQuote.attribute_code)}}" userInput="{{dropdownProductAttributeWithQuote.option1_admin}}"/>
     </test>
 
     <test name="CreateProductAttributeEntityMultiSelectTest">

From 1001a7cf7ec47286b56ac4d8e4b1971b4cf59700 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Thu, 28 Feb 2019 17:13:08 +0300
Subject: [PATCH 0304/1055] MAGETWO-70232: [GITHUB] Import customizable options
 adds it to another product if same SKU is filled#9457

- Fixed static test;
---
 .../Model/Product/Option/SaveHandler.php      | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index 5447c386c692c..715c7a7719079 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -59,14 +59,25 @@ public function execute($entity, $arguments = [])
         }
         if ($options) {
             $hasChangedSku = ($entity->getOrigData('sku') !== null && $entity->dataHasChangedFor('sku'));
-            foreach ($options as $option) {
-                if ($hasChangedSku && $option->hasData('product_sku')) {
-                    $option->setProductSku($entity->getSku());
-                }
-                $this->optionRepository->save($option);
-            }
+            $this->processOptionsSaving($options, $hasChangedSku, $entity->getSku());
         }
 
         return $entity;
     }
+
+    /**
+     * Save custom options
+     *
+     * @param array $options
+     * @param bool $hasChangedSku
+     * @param string $newSku
+     */
+    private function processOptionsSaving($options, $hasChangedSku, $newSku) {
+        foreach ($options as $option) {
+            if ($hasChangedSku && $option->hasData('product_sku')) {
+                $option->setProductSku($newSku);
+            }
+            $this->optionRepository->save($option);
+        }
+    }
 }

From 539766f41049e8e86490b2861de8c98227236198 Mon Sep 17 00:00:00 2001
From: "Leandro F. L" <lfluvisotto@gmail.com>
Date: Thu, 28 Feb 2019 15:33:14 +0100
Subject: [PATCH 0305/1055] Fix: Cart is emptied when enter is pressed after
 changing product quantity

---
 .../Magento/Checkout/view/frontend/web/js/shopping-cart.js  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index 3ea49cd981d90..5364f6bd21e15 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -14,7 +14,11 @@ define([
         _create: function () {
             var items, i, reload;
 
-            $(this.options.emptyCartButton).on('click', $.proxy(function () {
+            $(this.options.emptyCartButton).on('click', $.proxy(function (event) {
+                if (event.detail == 0) {
+                    return;
+                }
+
                 $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
                 $(this.options.updateCartActionContainer)
                     .attr('name', 'update_cart_action').attr('value', 'empty_cart');

From 005a57c9fd11d7b3f260c4be62c9c5ad595a860d Mon Sep 17 00:00:00 2001
From: wsajosh <joshua.stewart@shipperhq.com>
Date: Thu, 28 Feb 2019 14:56:54 +0000
Subject: [PATCH 0306/1055] SHQ18-1568 Updating UPS endpoint to use https. Http
 is no longer reliably returning rates

---
 app/code/Magento/Ups/Model/Carrier.php | 2 +-
 app/code/Magento/Ups/etc/config.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 8c60f5a53a2d9..75ce0c3014efa 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -77,7 +77,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      *
      * @var string
      */
-    protected $_defaultCgiGatewayUrl = 'http://www.ups.com:80/using/services/rave/qcostcgi.cgi';
+    protected $_defaultCgiGatewayUrl = 'https://www.ups.com:80/using/services/rave/qcostcgi.cgi';
 
     /**
      * Test urls for shipment
diff --git a/app/code/Magento/Ups/etc/config.xml b/app/code/Magento/Ups/etc/config.xml
index e2ac1c6d6c443..791b325c65e3f 100644
--- a/app/code/Magento/Ups/etc/config.xml
+++ b/app/code/Magento/Ups/etc/config.xml
@@ -19,7 +19,7 @@
                 <cutoff_cost />
                 <dest_type>RES</dest_type>
                 <free_method>GND</free_method>
-                <gateway_url>http://www.ups.com/using/services/rave/qcostcgi.cgi</gateway_url>
+                <gateway_url>https://www.ups.com/using/services/rave/qcostcgi.cgi</gateway_url>
                 <gateway_xml_url>https://onlinetools.ups.com/ups.app/xml/Rate</gateway_xml_url>
                 <handling>0</handling>
                 <model>Magento\Ups\Model\Carrier</model>

From 139aa5ce39cc2d0bf2a41779776aafb57a1979e6 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Thu, 28 Feb 2019 11:28:49 -0600
Subject: [PATCH 0307/1055] MC-15094: When switch to specific store view -
 field Price not disabled but checkbox "Use Default Value" is checked

---
 .../web/js/components/price-configurable.js   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 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 6bbab77a3a0ab..b2ef35546eea8 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
@@ -11,9 +11,6 @@ define([
 
     return Abstract.extend({
         defaults: {
-            listens: {
-                isConfigurable: 'handlePriceValue'
-            },
             imports: {
                 isConfigurable: '!ns = ${ $.ns }, index = configurable-matrix:isEmpty'
             },
@@ -22,12 +19,15 @@ define([
             }
         },
 
-        /**
-         * Invokes initialize method of parent class,
-         * contains initialization logic
-         */
+        /** @inheritdoc */
         initialize: function () {
             this._super();
+            // resolve initial disable state
+            this.handlePriceValue(this.isConfigurable);
+            // add listener to track "configurable" type
+            this.setListeners({
+                isConfigurable: 'handlePriceValue'
+            });
 
             return this;
         },
@@ -50,11 +50,10 @@ define([
          * @param {String} isConfigurable
          */
         handlePriceValue: function (isConfigurable) {
+            this.disabled(!!this.isUseDefault() || isConfigurable);
+
             if (isConfigurable) {
-                this.disable();
                 this.clear();
-            } else {
-                this.enable();
             }
         }
     });

From 85829049bc98a795e7ede8ddac573567d09f533d Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Thu, 28 Feb 2019 23:31:23 +0300
Subject: [PATCH 0308/1055] MAGETWO-70232: [GITHUB] Import customizable options
 adds it to another product if same SKU is filled#9457

- Fixed static test;
---
 app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index 715c7a7719079..d210670920ef1 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -72,7 +72,8 @@ public function execute($entity, $arguments = [])
      * @param bool $hasChangedSku
      * @param string $newSku
      */
-    private function processOptionsSaving($options, $hasChangedSku, $newSku) {
+    private function processOptionsSaving($options, $hasChangedSku, $newSku)
+    {
         foreach ($options as $option) {
             if ($hasChangedSku && $option->hasData('product_sku')) {
                 $option->setProductSku($newSku);

From 6e1a2a067c454e22fcaf239b1da3972bce65ab53 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Thu, 28 Feb 2019 15:27:11 -0600
Subject: [PATCH 0309/1055] MC-13864: Consumer always read config from memory

---
 .../Model/MassConsumer.php                    |  8 +-
 .../Api/Data/PoisonPillInterface.php          | 29 +++++++
 .../Api/PoisonPillCompareInterface.php        | 26 ++++++
 .../Api/PoisonPillPutInterface.php            | 24 ++++++
 .../Api/PoisonPillReadInterface.php           | 25 ++++++
 .../MessageQueue/Model/CallbackInvoker.php    | 61 ++++++++++++++
 .../Magento/MessageQueue/Model/PoisonPill.php | 32 ++++++++
 .../MessageQueue/Model/PoisonPillCompare.php  | 38 +++++++++
 .../MessageQueue/Model/PoisonPillFactory.php  | 36 +++++++++
 .../Model/ResourceModel/PoisonPill.php        | 80 +++++++++++++++++++
 .../Magento/MessageQueue/etc/db_schema.xml    |  8 ++
 app/code/Magento/MessageQueue/etc/di.xml      |  5 ++
 .../MessageQueue/CallbackInvoker.php          |  2 +-
 .../MessageQueue/CallbackInvokerInterface.php | 21 +++++
 .../Framework/MessageQueue/Consumer.php       |  6 +-
 15 files changed, 393 insertions(+), 8 deletions(-)
 create mode 100644 app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
 create mode 100644 app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
 create mode 100644 app/code/Magento/MessageQueue/Api/PoisonPillPutInterface.php
 create mode 100644 app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php
 create mode 100644 app/code/Magento/MessageQueue/Model/CallbackInvoker.php
 create mode 100644 app/code/Magento/MessageQueue/Model/PoisonPill.php
 create mode 100644 app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
 create mode 100644 app/code/Magento/MessageQueue/Model/PoisonPillFactory.php
 create mode 100644 app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
 create mode 100644 lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php

diff --git a/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
index 86e691daa4213..af1ef4400e442 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
@@ -14,7 +14,7 @@
 use Magento\Framework\MessageQueue\MessageLockException;
 use Magento\Framework\MessageQueue\ConnectionLostException;
 use Magento\Framework\Exception\NotFoundException;
-use Magento\Framework\MessageQueue\CallbackInvoker;
+use Magento\Framework\MessageQueue\CallbackInvokerInterface;
 use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
 use Magento\Framework\MessageQueue\EnvelopeInterface;
 use Magento\Framework\MessageQueue\QueueInterface;
@@ -30,7 +30,7 @@
 class MassConsumer implements ConsumerInterface
 {
     /**
-     * @var \Magento\Framework\MessageQueue\CallbackInvoker
+     * @var CallbackInvokerInterface
      */
     private $invoker;
 
@@ -67,7 +67,7 @@ class MassConsumer implements ConsumerInterface
     /**
      * Initialize dependencies.
      *
-     * @param CallbackInvoker $invoker
+     * @param CallbackInvokerInterface $invoker
      * @param ResourceConnection $resource
      * @param MessageController $messageController
      * @param ConsumerConfigurationInterface $configuration
@@ -76,7 +76,7 @@ class MassConsumer implements ConsumerInterface
      * @param Registry $registry
      */
     public function __construct(
-        CallbackInvoker $invoker,
+        CallbackInvokerInterface $invoker,
         ResourceConnection $resource,
         MessageController $messageController,
         ConsumerConfigurationInterface $configuration,
diff --git a/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php b/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
new file mode 100644
index 0000000000000..f526e0d4ea067
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Api\Data;
+
+/**
+ * PoisonPill data interface.
+ *
+ * @api
+ */
+interface PoisonPillInterface
+{
+    /**
+     * Returns version of poison pill.
+     *
+     * @return integer
+     */
+    public function getVersion(): ?int;
+
+    /**
+     * @param int $version
+     * @return void
+     */
+    public function setVersion(int $version);
+}
diff --git a/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php b/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
new file mode 100644
index 0000000000000..32d57353f4426
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Api;
+
+use Magento\MessageQueue\Api\Data\PoisonPillInterface;
+
+/**
+ * Interface describes how to describes how to compare poison pill with latest in DB.
+ *
+ * @api
+ */
+interface PoisonPillCompareInterface
+{
+    /**
+     * Check is version of current poison pill is latest.
+     *
+     * @param PoisonPillInterface $poisonPill
+     * @return bool
+     */
+    public function isLatest(PoisonPillInterface $poisonPill): bool;
+}
diff --git a/app/code/Magento/MessageQueue/Api/PoisonPillPutInterface.php b/app/code/Magento/MessageQueue/Api/PoisonPillPutInterface.php
new file mode 100644
index 0000000000000..02293c99bb3f4
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Api/PoisonPillPutInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Api;
+
+/**
+ * Command interface describes how to create new version on poison pill.
+ *
+ * @api
+ */
+interface PoisonPillPutInterface
+{
+    /**
+     * Put new version of poison pill inside DB.
+     *
+     * @return int
+     * @throws \Exception
+     */
+    public function put(): int;
+}
diff --git a/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php b/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php
new file mode 100644
index 0000000000000..325cfd597956a
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Api;
+
+use Magento\MessageQueue\Api\Data\PoisonPillInterface;
+
+/**
+ * Describes how to get latest version of poison pill.
+ *
+ * @api
+ */
+interface PoisonPillReadInterface
+{
+    /**
+     * Returns latest poison pill.
+     *
+     * @return PoisonPillInterface
+     */
+    public function getLatest(): PoisonPillInterface;
+}
diff --git a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
new file mode 100644
index 0000000000000..465c2d366c582
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for  license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model;
+
+use Magento\Framework\MessageQueue\CallbackInvokerInterface;
+use Magento\Framework\MessageQueue\QueueInterface;
+use Magento\MessageQueue\Api\Data\PoisonPillInterface;
+use Magento\MessageQueue\Api\PoisonPillCompareInterface;
+use Magento\MessageQueue\Api\PoisonPillReadInterface;
+
+class CallbackInvoker implements CallbackInvokerInterface
+{
+    /**
+     * @var PoisonPillReadInterface $poisonPillRead
+     */
+    private $poisonPillRead;
+
+    /**
+     * @var PoisonPillInterface $poisonPill
+     */
+    private $poisonPill;
+
+    /**
+     * @var PoisonPillCompareInterface
+     */
+    private $poisonPillCompare;
+
+    /**
+     * @param PoisonPillReadInterface $poisonPillRead
+     * @param PoisonPillCompareInterface $poisonPillCompare
+     */
+    public function __construct(
+        PoisonPillReadInterface $poisonPillRead,
+        PoisonPillCompareInterface $poisonPillCompare
+    ) {
+        $this->poisonPillRead = $poisonPillRead;
+        $this->poisonPill = $poisonPillRead->getLatest();
+        $this->poisonPillCompare = $poisonPillCompare;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
+    {
+        for ($i = $maxNumberOfMessages; $i > 0; $i--) {
+            do {
+                $message = $queue->dequeue();
+            } while ($message === null && (sleep(1) === 0));
+            if (false === $this->poisonPillCompare->isLatest($this->poisonPill)) {
+                exit(0);
+            }
+            $callback($message);
+        }
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPill.php b/app/code/Magento/MessageQueue/Model/PoisonPill.php
new file mode 100644
index 0000000000000..a253ca4c13aa0
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/PoisonPill.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for  license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model;
+
+use Magento\MessageQueue\Api\Data\PoisonPillInterface;
+
+/**
+ * PoisonPill data class
+ */
+class PoisonPill extends \Magento\Framework\Model\AbstractModel implements PoisonPillInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getVersion(): ?int
+    {
+        return $this->_getData('version');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setVersion(int $version)
+    {
+        $this->setData('version', $version);
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
new file mode 100644
index 0000000000000..4aa76b4fadfcc
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for  license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model;
+
+use Magento\MessageQueue\Api\Data\PoisonPillInterface;
+use Magento\MessageQueue\Api\PoisonPillCompareInterface;
+use Magento\MessageQueue\Api\PoisonPillReadInterface;
+
+class PoisonPillCompare implements PoisonPillCompareInterface
+{
+    /**
+     * @var PoisonPillReadInterface
+     */
+    private $poisonPillRead;
+
+    /**
+     * PoisonPillCompare constructor.
+     * @param PoisonPillReadInterface $poisonPillRead
+     */
+    public function __construct(
+        PoisonPillReadInterface $poisonPillRead
+    ) {
+        $this->poisonPillRead = $poisonPillRead;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isLatest(PoisonPillInterface $poisonPill): bool
+    {
+        return $poisonPill->getVersion() === $this->poisonPillRead->getLatest()->getVersion();
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php b/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php
new file mode 100644
index 0000000000000..0fd85c998866b
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for  license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model;
+
+use Magento\MessageQueue\Api\Data\PoisonPillInterface;
+
+class PoisonPillFactory
+{
+    /**
+     * @var PoisonPillInterface
+     */
+    private $poisonPill;
+
+    /**
+     * @param PoisonPillInterface $poisonPill
+     */
+    public function __construct(
+        PoisonPillInterface $poisonPill
+    ) {
+        $this->poisonPill = $poisonPill;
+    }
+
+    /**
+     * @param int $version
+     * @return PoisonPillInterface
+     */
+    public function create(int $version): PoisonPillInterface
+    {
+
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
new file mode 100644
index 0000000000000..769f723dc9d5a
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for  license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model\ResourceModel;
+
+use Magento\MessageQueue\Api\Data\PoisonPillInterface;
+use Magento\MessageQueue\Api\Data\PoisonPillInterfaceFactory;
+use Magento\MessageQueue\Api\PoisonPillReadInterface;
+use Magento\MessageQueue\Api\PoisonPillPutInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+class PoisonPill extends AbstractDb implements PoisonPillPutInterface, PoisonPillReadInterface
+{
+    /**
+     * Table name.
+     */
+    const QUEUE_POISON_PILL_TABLE = 'queue_poison_pill';
+
+    /**
+     * @var PoisonPillInterfaceFactory
+     */
+    private $poisonPillFactory;
+
+    /**
+     * @param Context $context
+     * @param string|null $connectionName
+     */
+    public function __construct(
+        Context $context,
+        PoisonPillInterfaceFactory $poisonPillFactory,
+        string $connectionName = null
+    ) {
+        $this->poisonPillFactory = $poisonPillFactory;
+        parent::__construct($context, $connectionName);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        $this->_init(self::QUEUE_POISON_PILL_TABLE, 'version');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function put(): int
+    {
+        /** @var PoisonPillInterface $poisonPill */
+        $poisonPill = $this->poisonPillFactory->create();
+        return $this->save($poisonPill)->getConnection()->lastInsertId();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getLatest() : PoisonPillInterface
+    {
+        $select = $this->getConnection()->select()->from(
+            $this->getTable(self::QUEUE_POISON_PILL_TABLE),
+            'version'
+        )->order(
+            'version ' . \Magento\Framework\DB\Select::SQL_DESC
+        )->limit(
+            1
+        );
+
+        $version = $this->getConnection()->fetchOne($select);
+
+        $poisonPill = $this->poisonPillFactory->create(['data' => ['version' => (int) $version]]);
+
+        return $poisonPill;
+    }
+}
diff --git a/app/code/Magento/MessageQueue/etc/db_schema.xml b/app/code/Magento/MessageQueue/etc/db_schema.xml
index 7a20d2bd4df5d..9cdf414dd06e1 100644
--- a/app/code/Magento/MessageQueue/etc/db_schema.xml
+++ b/app/code/Magento/MessageQueue/etc/db_schema.xml
@@ -21,4 +21,12 @@
             <column name="message_code"/>
         </constraint>
     </table>
+    <table name="queue_poison_pill" resource="default" engine="innodb"
+           comment="Sequence table for poison pill versions">
+        <column xsi:type="int" name="version" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Poison Pill version."/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="version"/>
+        </constraint>
+    </table>
 </schema>
diff --git a/app/code/Magento/MessageQueue/etc/di.xml b/app/code/Magento/MessageQueue/etc/di.xml
index c8f2edb862613..3b2cb8718e041 100644
--- a/app/code/Magento/MessageQueue/etc/di.xml
+++ b/app/code/Magento/MessageQueue/etc/di.xml
@@ -13,6 +13,11 @@
     <preference for="Magento\Framework\MessageQueue\EnvelopeInterface" type="Magento\Framework\MessageQueue\Envelope"/>
     <preference for="Magento\Framework\MessageQueue\ConsumerInterface" type="Magento\Framework\MessageQueue\Consumer"/>
     <preference for="Magento\Framework\MessageQueue\MergedMessageInterface" type="Magento\Framework\MessageQueue\MergedMessage"/>
+    <preference for="Magento\MessageQueue\Api\Data\PoisonPillInterface" type="Magento\MessageQueue\Model\PoisonPill"/>
+    <preference for="Magento\MessageQueue\Api\PoisonPillCompareInterface" type="Magento\MessageQueue\Model\PoisonPillCompare"/>
+    <preference for="Magento\MessageQueue\Api\PoisonPillPutInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>
+    <preference for="Magento\MessageQueue\Api\PoisonPillReadInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>
+    <preference for="Magento\Framework\MessageQueue\CallbackInvokerInterface" type="Magento\MessageQueue\Model\CallbackInvoker"/>
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
             <argument name="commands" xsi:type="array">
diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
index cb80bc4becaec..48c33c48f12e6 100644
--- a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
@@ -9,7 +9,7 @@
 /**
  * Class CallbackInvoker to invoke callbacks for consumer classes
  */
-class CallbackInvoker
+class CallbackInvoker implements CallbackInvokerInterface
 {
     /**
      * Run short running process
diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
new file mode 100644
index 0000000000000..bae72d8186a18
--- /dev/null
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MessageQueue;
+
+interface CallbackInvokerInterface
+{
+    /**
+     * Run short running process
+     *
+     * @param QueueInterface $queue
+     * @param int $maxNumberOfMessages
+     * @param \Closure $callback
+     * @return void
+     */
+    public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback);
+}
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
index 9bdacfbc1ff6c..72c5f2e0cbdfc 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
@@ -38,7 +38,7 @@ class Consumer implements ConsumerInterface
     private $messageEncoder;
 
     /**
-     * @var CallbackInvoker
+     * @var CallbackInvokerInterface
      */
     private $invoker;
 
@@ -80,7 +80,7 @@ class Consumer implements ConsumerInterface
     /**
      * Initialize dependencies.
      *
-     * @param CallbackInvoker $invoker
+     * @param CallbackInvokerInterface $invoker
      * @param MessageEncoder $messageEncoder
      * @param ResourceConnection $resource
      * @param ConsumerConfigurationInterface $configuration
@@ -89,7 +89,7 @@ class Consumer implements ConsumerInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
-        CallbackInvoker $invoker,
+        CallbackInvokerInterface $invoker,
         MessageEncoder $messageEncoder,
         ResourceConnection $resource,
         ConsumerConfigurationInterface $configuration,

From 0cc4fbaf6354b280e9b05889aedfc108bc2e1b37 Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Thu, 28 Feb 2019 15:46:25 -0600
Subject: [PATCH 0310/1055] MC-4435: Convert MassDeleteSearchTermEntityTest to
 MFTF

---
 .../AdminSearchTermActionGroup.xml            | 30 +++++++
 .../Search/Test/Mftf/Data/SearchTermData.xml  | 17 ++++
 .../Test/Mftf/Metadata/search_term-meta.xml   | 17 ++++
 .../AdminMassDeleteSearchTermEntityTest.xml   | 83 +++++++++++++++++++
 4 files changed, 147 insertions(+)
 create mode 100644 app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml

diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
new file mode 100644
index 0000000000000..f116e44e5c141
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
@@ -0,0 +1,30 @@
+<?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">
+    <!-- Filter by search query and select -->
+    <actionGroup name="searchTermFilterBySearchQuery">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+        </arguments>
+        <click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForResetFilter"/>
+        <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResultLoad"/>
+        <checkOption selector="{{AdminCatalogSearchTermIndexSection.checkBox}}" stepKey="checkCheckBox"/>
+    </actionGroup>
+
+    <!-- Delete search term -->
+    <actionGroup name="deleteSearchTerm">
+        <selectOption selector="{{AdminCatalogSearchTermIndexSection.delete}}" userInput="delete" stepKey="selectDeleteOption"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.submit}}" stepKey="clickSubmitButton"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.okButton}}" stepKey="clickOkButton"/>
+        <waitForElementVisible selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml b/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml
new file mode 100644
index 0000000000000..1518adad01347
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.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="SearchTerm" type="searchTerm">
+        <data key="query_text" unique="suffix">Query text</data>
+        <data key="store_id">1</data>
+        <data key="redirect" unique="suffix">http://example.com/</data>
+        <data key="display_in_terms">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml b/app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml
new file mode 100644
index 0000000000000..0bd2dc9be4855
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Metadata/search_term-meta.xml
@@ -0,0 +1,17 @@
+<?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="CreateSearchTerm" dataType="searchTerm" type="create" auth="adminFormKey" url="/search/term/save/" method="POST">
+        <field key="query_text">string</field>
+        <field key="store_id">integer</field>
+        <field key="redirect">string</field>
+        <field key="display_in_terms">integer</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
new file mode 100644
index 0000000000000..eb0797d07bf18
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
@@ -0,0 +1,83 @@
+<?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="AdminMassDeleteSearchTermEntityTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <stories value="Delete search term"/>
+            <title value="Admin mass delete search term entity test"/>
+            <description value="Admin should be able to Mass Delete Search Term Entity Test"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14767"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create three search term -->
+            <createData entity="SearchTerm" stepKey="createFirstSearchTerm"/>
+            <createData entity="SearchTerm" stepKey="createSecondSearchTerm"/>
+            <createData entity="SearchTerm" stepKey="createThirdSearchTerm"/>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to the catalog search term page -->
+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
+        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+
+        <!-- Select all created below search terms -->
+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByFirstSearchQuery">
+            <argument name="searchQuery" value="$createFirstSearchTerm.query_text$"/>
+        </actionGroup>
+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterBySecondSearchQuery">
+            <argument name="searchQuery" value="$createSecondSearchTerm.query_text$"/>
+        </actionGroup>
+        <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByThirdSearchQuery">
+            <argument name="searchQuery" value="$createThirdSearchTerm.query_text$"/>
+        </actionGroup>
+
+        <!-- Delete created below search terms -->
+        <actionGroup ref="deleteSearchTerm" stepKey="deleteSearchTerms"/>
+
+        <!-- Assert search terms are absent on the search term page -->
+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertFirstSearchTermNotInGrid">
+            <argument name="searchQuery" value="$createFirstSearchTerm.query_text$"/>
+        </actionGroup>
+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertSecondSearchTermNotInGrid">
+            <argument name="searchQuery" value="$createSecondSearchTerm.query_text$"/>
+        </actionGroup>
+        <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertThirdSearchTermNotInGrid">
+            <argument name="searchQuery" value="$createThirdSearchTerm.query_text$"/>
+        </actionGroup>
+
+        <!-- Go to storefront page -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
+
+        <!-- Verify search term deletion on storefront -->
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForFirstSearchTerm">
+            <argument name="phrase" value="$createFirstSearchTerm.query_text$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForFirstSearchTerm"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForSecondSearchTerm">
+            <argument name="phrase" value="$createSecondSearchTerm.query_text$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForSecondSearchTerm"/>
+        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForThirdSearchTerm">
+            <argument name="phrase" value="$createThirdSearchTerm.query_text$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForThirdSearchTerm"/>
+    </test>
+</tests>

From e7589ad85786211022c3860c78ccb21a26f69e8f Mon Sep 17 00:00:00 2001
From: Adarsh Khatri <me.adarshkhatri@gmail.com>
Date: Fri, 1 Mar 2019 09:55:10 +1100
Subject: [PATCH 0311/1055] Update price-bundle.js

---
 .../Bundle/view/base/web/js/price-bundle.js      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index ee3ab25e90875..02d55d50025cc 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -374,16 +374,14 @@ define([
     function applyTierPrice(oneItemPrice, qty, optionConfig) {
         var tiers = optionConfig.tierPrice,
             magicKey = _.keys(oneItemPrice)[0],
+            tiersFirstKey = _.keys(optionConfig)[0],
             lowest = false;
-        
-        //tiers is undefined when options has only one option 
-		if (undefined == tiers) {
-		    var firstKey = Object.keys(optionConfig)[0];
-		    tiers = optionConfig[firstKey].tierPrice;
-		}
-
-		//sorting based on "price_qty"
-        tiers.sort( function (a, b) {
+
+        if (undefined === tiers) {//tiers is undefined when options has only one option
+            tiers = optionConfig[tiersFirstKey].tierPrice;
+        }
+
+        tiers.sort( function (a, b) {//sorting based on "price_qty"
             return a['price_qty'] - b['price_qty'];
         });
 

From 6f49b07031e8e9248a19d8f3ee20402650e60d30 Mon Sep 17 00:00:00 2001
From: Adarsh Khatri <me.adarshkhatri@gmail.com>
Date: Fri, 1 Mar 2019 10:01:05 +1100
Subject: [PATCH 0312/1055] Update price-bundle.js

---
 app/code/Magento/Bundle/view/base/web/js/price-bundle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index 02d55d50025cc..c05c9ef58b938 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -381,7 +381,7 @@ define([
             tiers = optionConfig[tiersFirstKey].tierPrice;
         }
 
-        tiers.sort( function (a, b) {//sorting based on "price_qty"
+        tiers.sort(function (a, b) {//sorting based on "price_qty"
             return a['price_qty'] - b['price_qty'];
         });
 

From 23a5f01eb54801afcb16f09bf4589c112790a1a7 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 1 Mar 2019 08:45:40 +0200
Subject: [PATCH 0313/1055] magento/magento2#20951 Direct STDERR output when
 listing crontab to /dev/null

Fix unit test failures
---
 .../Framework/Crontab/Test/Unit/CrontabManagerTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
index b160eb0a7f95e..b07703d2bd0ba 100644
--- a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
+++ b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
@@ -58,7 +58,7 @@ public function testGetTasksNoCrontab()
 
         $this->shellMock->expects($this->once())
             ->method('execute')
-            ->with('crontab -l', [])
+            ->with('crontab -l 2>/dev/null', [])
             ->willThrowException($localizedException);
 
         $this->assertEquals([], $this->crontabManager->getTasks());
@@ -74,7 +74,7 @@ public function testGetTasks($content, $tasks)
     {
         $this->shellMock->expects($this->once())
             ->method('execute')
-            ->with('crontab -l', [])
+            ->with('crontab -l 2>/dev/null', [])
             ->willReturn($content);
 
         $this->assertEquals($tasks, $this->crontabManager->getTasks());
@@ -127,7 +127,7 @@ public function testRemoveTasksWithException()
 
         $this->shellMock->expects($this->at(0))
             ->method('execute')
-            ->with('crontab -l', [])
+            ->with('crontab -l 2>/dev/null', [])
             ->willReturn('');
 
         $this->shellMock->expects($this->at(1))
@@ -148,7 +148,7 @@ public function testRemoveTasks($contentBefore, $contentAfter)
     {
         $this->shellMock->expects($this->at(0))
             ->method('execute')
-            ->with('crontab -l', [])
+            ->with('crontab -l 2>/dev/null', [])
             ->willReturn($contentBefore);
 
         $this->shellMock->expects($this->at(1))
@@ -276,7 +276,7 @@ public function testSaveTasks($tasks, $content, $contentToSave)
 
         $this->shellMock->expects($this->at(0))
             ->method('execute')
-            ->with('crontab -l', [])
+            ->with('crontab -l 2>/dev/null', [])
             ->willReturn($content);
 
         $this->shellMock->expects($this->at(1))

From b4c48a7e5f20f6cb817d74001e57899e8a81ff42 Mon Sep 17 00:00:00 2001
From: Andreas von Studnitz <avs@integer-net.de>
Date: Fri, 1 Mar 2019 10:14:09 +0100
Subject: [PATCH 0314/1055] Fix type hints and replace deprecated method usage

---
 .../Newsletter/Controller/Subscriber/Confirm.php | 16 ++++++++--------
 .../Controller/Subscriber/NewAction.php          |  7 +++++--
 .../Controller/Subscriber/Unsubscribe.php        | 10 +++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
index 4e338c2d1df34..fc25b56a40095 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
@@ -10,7 +10,7 @@ class Confirm extends \Magento\Newsletter\Controller\Subscriber
 {
     /**
      * Subscription confirm action
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -23,17 +23,17 @@ public function execute()
 
             if ($subscriber->getId() && $subscriber->getCode()) {
                 if ($subscriber->confirm($code)) {
-                    $this->messageManager->addSuccess(__('Your subscription has been confirmed.'));
+                    $this->messageManager->addSuccessMessage(__('Your subscription has been confirmed.'));
                 } else {
-                    $this->messageManager->addError(__('This is an invalid subscription confirmation code.'));
+                    $this->messageManager->addErrorMessage(__('This is an invalid subscription confirmation code.'));
                 }
             } else {
-                $this->messageManager->addError(__('This is an invalid subscription ID.'));
+                $this->messageManager->addErrorMessage(__('This is an invalid subscription ID.'));
             }
         }
-
-        $resultRedirect = $this->resultRedirectFactory->create();
-        $resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
-        return $resultRedirect;
+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+        $redirectUrl = $this->_storeManager->getStore()->getBaseUrl();
+        return $redirect->setUrl($redirectUrl);
     }
 }
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index 4f46c84894f12..a8599df2a89df 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -131,7 +131,7 @@ protected function validateEmailFormat($email)
     /**
      * New subscription action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -160,7 +160,10 @@ public function execute()
                 $this->messageManager->addExceptionMessage($e, __('Something went wrong with the subscription.'));
             }
         }
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+        $redirectUrl = $this->_redirect->getRedirectUrl();
+        return $redirect->setUrl($redirectUrl);
     }
 
     /**
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
index 88fa128162700..03389558cb6c0 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
@@ -15,7 +15,7 @@ class Unsubscribe extends \Magento\Newsletter\Controller\Subscriber implements H
     /**
      * Unsubscribe newsletter.
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -25,14 +25,14 @@ public function execute()
         if ($id && $code) {
             try {
                 $this->_subscriberFactory->create()->load($id)->setCheckCode($code)->unsubscribe();
-                $this->messageManager->addSuccess(__('You unsubscribed.'));
+                $this->messageManager->addSuccessMessage(__('You unsubscribed.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addException($e, $e->getMessage());
+                $this->messageManager->addErrorMessage($e, $e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong while unsubscribing you.'));
+                $this->messageManager->addErrorMessage($e, __('Something went wrong while unsubscribing you.'));
             }
         }
-        /** @var \Magento\Backend\Model\View\Result\Redirect $redirect */
+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
         $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
         $redirectUrl = $this->_redirect->getRedirectUrl();
         return $redirect->setUrl($redirectUrl);

From 71e9b8682ee3e1bbc3ea7e3d475f91f0e85e5cc8 Mon Sep 17 00:00:00 2001
From: Rafael Kassner <rafael.kassner@yubico.com>
Date: Fri, 1 Mar 2019 11:42:00 +0100
Subject: [PATCH 0315/1055] Remove preference for
 Magento\Framework\HTTP\ClientInterface to app/etc/di.xml

---
 app/code/Magento/ReleaseNotification/etc/di.xml | 1 -
 app/etc/di.xml                                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ReleaseNotification/etc/di.xml b/app/code/Magento/ReleaseNotification/etc/di.xml
index 1404a6adb0a10..a4c434ff7f623 100644
--- a/app/code/Magento/ReleaseNotification/etc/di.xml
+++ b/app/code/Magento/ReleaseNotification/etc/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\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
     <preference for="Magento\ReleaseNotification\Model\ContentProviderInterface" type="Magento\ReleaseNotification\Model\ContentProvider\Http\HttpContentProvider" />
     <type name="Magento\Config\Model\Config\TypePool">
         <arguments>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 19543375aad58..8d7e447927798 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -210,6 +210,7 @@
     <preference for="Magento\Framework\MessageQueue\Bulk\ExchangeFactoryInterface" type="Magento\Framework\MessageQueue\Bulk\ExchangeFactory" />
     <preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
     <preference for="Magento\Framework\Search\Request\IndexScopeResolverInterface" type="Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver"/>
+    <preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>

From 0332391af0883d78daa90de5bafc93a5e67765a2 Mon Sep 17 00:00:00 2001
From: Adarsh Khatri <me.adarshkhatri@gmail.com>
Date: Fri, 1 Mar 2019 22:59:03 +1100
Subject: [PATCH 0316/1055] Update price-bundle.js

---
 app/code/Magento/Bundle/view/base/web/js/price-bundle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index c05c9ef58b938..f8d2f8bc11116 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -377,7 +377,7 @@ define([
             tiersFirstKey = _.keys(optionConfig)[0],
             lowest = false;
 
-        if (undefined === tiers) {//tiers is undefined when options has only one option
+        if (!tiers) {//tiers is undefined when options has only one option
             tiers = optionConfig[tiersFirstKey].tierPrice;
         }
 

From 0ad9d4b2a60a8d50c9eda20e161d84ed698aae8e Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Fri, 1 Mar 2019 08:46:37 -0600
Subject: [PATCH 0317/1055] MC-14957: Authorize.net trying to load non-existent
  Accept.min.js in production configurations

- Reverting commit 29fa9ad7d5c1cdec6e64482c5e2c1f3c0e503dee.
---
 .../view/base/requirejs-config.js                  | 14 ++++++++++----
 .../base/web/js/view/payment/acceptjs-factory.js   | 13 ++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js b/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js
index cbe0a6c30e699..83ddd1094ea1a 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js
+++ b/app/code/Magento/AuthorizenetAcceptjs/view/base/requirejs-config.js
@@ -4,10 +4,16 @@
  */
 
 var config = {
-    map: {
-        '*': {
-            acceptjssandbox: 'https://jstest.authorize.net/v1/Accept.js',
-            acceptjs: 'https://js.authorize.net/v1/Accept.js'
+    shim: {
+        acceptjs: {
+            exports: 'Accept'
+        },
+        acceptjssandbox: {
+            exports: 'Accept'
         }
+    },
+    paths: {
+        acceptjssandbox: 'https://jstest.authorize.net/v1/Accept',
+        acceptjs: 'https://js.authorize.net/v1/Accept'
     }
 };
diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js
index c8813c17c70c7..e98a204e36cee 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js
+++ b/app/code/Magento/AuthorizenetAcceptjs/view/base/web/js/view/payment/acceptjs-factory.js
@@ -16,7 +16,7 @@ define([
             dependency = 'acceptjssandbox';
         }
 
-        require([dependency], function () {
+        require([dependency], function (accept) {
                 var $body = $('body');
 
                 /*
@@ -26,16 +26,7 @@ define([
                  * Dynamically-loading-Accept-js-E-WC-03-Accept-js-is-not-loaded/td-p/63283
                  */
                 $body.on('handshake.acceptjs', function () {
-                    /*
-                     * Accept.js doesn't return the library when loading
-                     * and requirejs "shim" can't be used because it only works with the "paths" config option
-                     * and we can't use "paths" because require will try to load ".min.js" in production
-                     * and that doesn't work because it doesn't exist
-                     * and we can't add a query string to force a URL because accept.js will reject it
-                     * and we can't include it locally because they check in the script before loading more scripts
-                     * So, we use the global version as "shim" would
-                     */
-                    deferred.resolve(window.Accept);
+                    deferred.resolve(accept);
                     $body.off('handshake.acceptjs');
                 });
             },

From 263b0389e44e3103f888cea82ff9e9f2f6deb549 Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Fri, 1 Mar 2019 08:55:46 -0600
Subject: [PATCH 0318/1055] MC-14957: Authorize.net trying to load non-existent
 Accept.min.js in production configurations

- Added Accept.js to exclusion list
---
 app/code/Magento/Store/etc/config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
index b9e7ac1c6aca0..500c48a593015 100644
--- a/app/code/Magento/Store/etc/config.xml
+++ b/app/code/Magento/Store/etc/config.xml
@@ -22,6 +22,7 @@
                 <minify_files>0</minify_files>
                 <minify_exclude>
                     <tiny_mce>/tiny_mce/</tiny_mce>
+                    <authorizenet_acceptjs>/Accept\.js/</authorizenet_acceptjs>
                 </minify_exclude>
             </js>
             <css>

From af86cc601790cd362b2496bca8193d4a4f7ed9c5 Mon Sep 17 00:00:00 2001
From: Tyler Mills <tylerssn@users.noreply.github.com>
Date: Fri, 1 Mar 2019 10:44:15 -0500
Subject: [PATCH 0319/1055] Ensure `__toString()` catches all error types

In PHP 7.1 `catch (\Exception ...)` does not catch fatal errors. Because this function can possibly throw fatal errors such as "`Call to a member function getRequestFieldName() on null`" which is an instance of `\Error`, we should catch `\Throwable` to ensure the exception makes it into the logger and `$result` is assigned the message.
---
 app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
index 9304d25cc8a98..d16b1eaad7f37 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -115,7 +115,7 @@ public function __toString()
             $this->compiler->compile($templateRootElement, $this->component, $this->component);
             $this->appendLayoutConfiguration();
             $result = $this->compiler->postprocessing($this->template->__toString());
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->logger->critical($e->getMessage());
             $result = $e->getMessage();
         }

From 795d5329c18dd7a732fc71261ee5b74398882b1f Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 1 Mar 2019 09:53:11 -0600
Subject: [PATCH 0320/1055] Fix Admin Customizable Options Dropdown sort_order
 issue - fix test

---
 .../code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
index 2e238eb993029..fc60fbb0bdccc 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic-rows.test.js
@@ -151,12 +151,14 @@ define([
                     }
                 }],
                 result = [{
+                    defaultLabelVisible: true,
                     label: 'Label 2',
                     name: 'Name 2',
                     required: false,
                     columnsHeaderClasses: '',
                     sortOrder: 5
                 }, {
+                    defaultLabelVisible: true,
                     label: 'Label 1',
                     name: 'Name 1',
                     required: false,

From 625d51bf992bde5b62a1b607be07d647a83cc7dd Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Fri, 1 Mar 2019 11:04:11 -0600
Subject: [PATCH 0321/1055] MC-14957: Authorize.net trying to load non-existent
 Accept.min.js in production configurations

---
 app/code/Magento/Store/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
index 500c48a593015..c29334d2ef0bd 100644
--- a/app/code/Magento/Store/etc/config.xml
+++ b/app/code/Magento/Store/etc/config.xml
@@ -22,7 +22,7 @@
                 <minify_files>0</minify_files>
                 <minify_exclude>
                     <tiny_mce>/tiny_mce/</tiny_mce>
-                    <authorizenet_acceptjs>/Accept\.js/</authorizenet_acceptjs>
+                    <authorizenet_acceptjs>\.authorize\.net/v1/Accept</authorizenet_acceptjs>
                 </minify_exclude>
             </js>
             <css>

From 6a6bfe2bfc6df104a42aeac289aa1a23974555bd Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Fri, 1 Mar 2019 13:22:56 -0600
Subject: [PATCH 0322/1055] MC-14957: Authorize.net trying to load non-existent
 Accept.min.js in production configurations

- CR feedback
---
 app/code/Magento/AuthorizenetAcceptjs/etc/config.xml | 5 +++++
 app/code/Magento/Store/etc/config.xml                | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
index 24291187c0584..d8f145467f494 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
@@ -7,6 +7,11 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
+        <js>
+            <minify_exclude>
+                <authorizenet_acceptjs>\.authorize\.net/v1/Accept</authorizenet_acceptjs>
+            </minify_exclude>
+        </js>
         <payment>
             <authorizenet_acceptjs>
                 <active>0</active>
diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
index c29334d2ef0bd..b9e7ac1c6aca0 100644
--- a/app/code/Magento/Store/etc/config.xml
+++ b/app/code/Magento/Store/etc/config.xml
@@ -22,7 +22,6 @@
                 <minify_files>0</minify_files>
                 <minify_exclude>
                     <tiny_mce>/tiny_mce/</tiny_mce>
-                    <authorizenet_acceptjs>\.authorize\.net/v1/Accept</authorizenet_acceptjs>
                 </minify_exclude>
             </js>
             <css>

From b4fd83564558c385f4716be415d27aa8e1f368b7 Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Fri, 1 Mar 2019 13:27:46 -0600
Subject: [PATCH 0323/1055] MC-14957: Authorize.net trying to load non-existent
 Accept.min.js in production configurations

---
 app/code/Magento/AuthorizenetAcceptjs/etc/config.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
index d8f145467f494..7324421d3c14b 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/config.xml
@@ -7,11 +7,13 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
-        <js>
-            <minify_exclude>
-                <authorizenet_acceptjs>\.authorize\.net/v1/Accept</authorizenet_acceptjs>
-            </minify_exclude>
-        </js>
+        <dev>
+            <js>
+                <minify_exclude>
+                    <authorizenet_acceptjs>\.authorize\.net/v1/Accept</authorizenet_acceptjs>
+                </minify_exclude>
+            </js>
+        </dev>
         <payment>
             <authorizenet_acceptjs>
                 <active>0</active>

From b27f6944a38a88ad05993ba441a84a7f0d7923c9 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Fri, 1 Mar 2019 14:36:17 -0600
Subject: [PATCH 0324/1055] MC-4869: Convert DeleteStoreEntityTest to MFTF

---
 .../ActionGroup/DeleteBackupActionGroup.xml   |  2 +
 .../Backup/Test/Mftf/Data/BackupData.xml      |  6 +-
 .../AdminDeleteStoreViewActionGroup.xml       | 35 +++++++++++-
 .../Mftf/Section/AdminStoresGridSection.xml   |  4 +-
 .../Test/Mftf/Test/AdminDeleteStoreTest.xml   | 57 +++++++++++++++++++
 5 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreTest.xml

diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
index 4f34f24c3a806..535478153f517 100644
--- a/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/DeleteBackupActionGroup.xml
@@ -17,7 +17,9 @@
         <click selector="{{AdminGridTableSection.backupRowCheckbox(backup.name)}}" stepKey="selectBackupRow"/>
         <selectOption selector="{{AdminGridActionSection.actionSelect}}" userInput="Delete" stepKey="selectDeleteAction"/>
         <click selector="{{AdminGridActionSection.submitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForSubmitAction"/>
         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to delete the selected backup(s)?" stepKey="seeConfirmationModal"/>
+        <waitForPageLoad stepKey="waitForConfirmWindowToAppear"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOkConfirmDelete"/>
         <dontSee selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="dontSeeBackupInGrid"/>
     </actionGroup>
diff --git a/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
index ae97351cafcaf..ad218cdd57500 100644
--- a/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
+++ b/app/code/Magento/Backup/Test/Mftf/Data/BackupData.xml
@@ -20,4 +20,8 @@
         <data key="name" unique="suffix">databaseBackup</data>
         <data key="type">Database</data>
     </entity>
-</entities>
+    <entity name="WebSetupWizardBackup" type="backup">
+        <data key="name">WebSetupWizard</data>
+        <data key="type">Database</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
index 58e1781d69eab..a08648bc8b8c6 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
@@ -26,4 +26,37 @@
         <waitForPageLoad stepKey="waitForSuccessMessage"/>
         <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
     </actionGroup>
-</actionGroups>
+    <!--AssertStoreSuccessDeleteAndBackupMessages-->
+    <actionGroup name="DeleteCustomStoreViewBackupEnabledYesActionGroup">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickEditExistingStoreViewRow"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewButtonOnEditStorePage"/>
+        <selectOption userInput="Yes" selector="{{AdminStoreBackupOptionsSection.createBackupSelect}}" stepKey="setCreateDbBackupToYes"/>
+        <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewButtonOnDeleteStorePage"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.title}}" stepKey="waitingForWarningModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreViewDelete"/>
+        <waitForPageLoad stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="The database was backed up." stepKey="seeAssertDatabaseBackedUpMessage"/>
+        <see selector="{{AdminStoresGridSection.successMessage}}" userInput="You deleted the store view." stepKey="seeAssertSuccessDeleteStoreViewMessage"/>
+    </actionGroup>
+    <!--AssertStoreViewNotInGrid-->
+    <actionGroup name="AssertStoreViewNotInGrid">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <see selector="{{AdminStoresGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertStoreViewNotInGridMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index b02e9adaed45e..3d3ec7fa28629 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -21,5 +21,7 @@
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
         <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
+        <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
+        <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
      </section>
-</sections>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreTest.xml
new file mode 100644
index 0000000000000..37829f4782413
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreTest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+        <test name="AdminDeleteStoreTest">
+            <annotations>
+                <stories value="Delete Store View"/>
+                <title value="DeleteStoreEntityTestVariation1"/>
+                <description value="Test log in to Stores and Delete Store View"/>
+                <testCaseId value="MC-14303"/>
+                <severity value="CRITICAL"/>
+                <group value="store"/>
+                <group value="mtf_migrated"/>
+            </annotations>
+            <before>
+                <magentoCLI command="config:set system/backup/functionality_enabled 1" stepKey="setEnableBackupToYes"/>
+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+                <!--Create custom store view-->
+                <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
+                    <argument name="StoreGroup" value="_defaultStoreGroup"/>
+                    <argument name="customStore" value="storeViewData"/>
+                </actionGroup>
+            </before>
+            <after>
+                <magentoCLI command="config:set system/backup/functionality_enabled 0" stepKey="setEnableBackupToNo"/>
+                <actionGroup ref="logout" stepKey="logout"/>
+            </after>
+
+            <!--AssertStoreSuccessDeleteAndBackupMessages-->
+            <actionGroup ref="DeleteCustomStoreViewBackupEnabledYesActionGroup" stepKey="deleteCustomStoreView">
+                <argument name="storeViewName" value="{{storeViewData.name}}"/>
+            </actionGroup>
+
+            <!--AssertStoreNotInGrid-->
+            <actionGroup ref="AssertStoreViewNotInGrid" stepKey="verifyDeletedStoreViewNotInGrid">
+                <argument name="storeViewName" value="{{storeViewData.name}}"/>
+            </actionGroup>
+
+            <!--Go to backup index page, verify AssertBackupInGrid-->
+            <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupIndexPage"/>
+            <waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
+            <!--Delete database backup-->
+            <actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
+                <argument name="backup" value="WebSetupWizardBackup"/>
+            </actionGroup>
+
+            <!--Go to storefront and verify AssertStoreNotOnFrontend-->
+            <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+            <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
+            <dontSee selector="{{StorefrontHeaderSection.storeViewList(storeViewData.name)}}" stepKey="dontSeeAssertStoreViewNameOnStorefront"/>
+        </test>
+</tests>
\ No newline at end of file

From f57e5e883f3b948813f02aa6226b47e6bf58eb9f Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Sat, 2 Mar 2019 00:15:13 +0200
Subject: [PATCH 0325/1055] Sorting by Websites not working in product grid in
 backoffice #20511

---
 .../Test/Mftf/Test/AdminSortingByWebsitesTest.xml    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
index 354955ba54402..c4b08bc55d98a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
@@ -18,13 +18,13 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!--Create new website -->
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
-                <argument name="newWebsiteName" value="Second Website"/>
-                <argument name="websiteCode" value="second_website"/>
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
         </before>
         <after>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
-                <argument name="websiteName" value="Second Website"/>
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
@@ -47,7 +47,7 @@
 
         <!-- Add this product to second website -->
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/>
-        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
+        <click selector="{{ProductInWebsitesSection.website('{{customWebsite.name}}')}}" stepKey="selectSecondWebsite"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
         <waitForLoadingMaskToDisappear stepKey="waitForProductPagetoSaveAgain"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
@@ -75,11 +75,11 @@
         <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultSortingWebsites"/>
         <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
         <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Main Website" stepKey="checkIfProduct1WebsitesAsc"/>
-        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="Second Website" stepKey="checkIfProduct2WebsitesAsc"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="{{customWebsite.name}}" stepKey="checkIfProduct2WebsitesAsc"/>
 
         <!--Sorting works (By Websites) DESC-->
         <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
-        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Second Website" stepKey="checkIfProduct1WebsitesDesc"/>
+        <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="{{customWebsite.name}}" stepKey="checkIfProduct1WebsitesDesc"/>
         <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="Main Website" stepKey="checkIfProduct2WebsitesDesc"/>
     </test>
 </tests>

From c3effa5c1e2da8fb2cffa87b7415efe04d65100d Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Sat, 2 Mar 2019 13:25:41 -0600
Subject: [PATCH 0326/1055] MC-15085: Cannot install Magento without
 ConfigurableProduct module

---
 .../ConfigurableImportExport/etc/module.xml   |  5 +-
 app/code/Magento/Msrp/Helper/Data.php         | 39 ++++++-----
 .../Msrp/Pricing/MsrpPriceCalculator.php      | 64 +++++++++++++++++++
 .../Pricing/MsrpPriceCalculatorInterface.php  | 23 +++++++
 .../Magento/Msrp/Pricing/Render/PriceBox.php  | 62 ++++++++++++++++++
 .../Msrp/Test/Unit/Helper/DataTest.php        | 25 ++++++--
 app/code/Magento/Msrp/composer.json           |  2 -
 app/code/Magento/Msrp/etc/di.xml              |  1 +
 .../base/layout/catalog_product_prices.xml    |  2 +-
 .../base/templates/product/price/msrp.phtml   | 16 +----
 .../Pricing/MsrpPriceCalculator.php           | 42 ++++++++++++
 .../MsrpConfigurableProduct/composer.json     | 27 ++++++++
 .../MsrpConfigurableProduct/etc/di.xml        | 19 ++++++
 .../MsrpConfigurableProduct/etc/module.xml    | 16 +++++
 .../MsrpConfigurableProduct/registration.php  |  9 +++
 .../Pricing/MsrpPriceCalculator.php           | 36 +++++++++++
 .../Magento/MsrpGroupedProduct/composer.json  | 27 ++++++++
 .../Magento/MsrpGroupedProduct/etc/di.xml     | 19 ++++++
 .../Magento/MsrpGroupedProduct/etc/module.xml | 16 +++++
 .../MsrpGroupedProduct/registration.php       |  9 +++
 20 files changed, 417 insertions(+), 42 deletions(-)
 create mode 100644 app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php
 create mode 100644 app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
 create mode 100644 app/code/Magento/Msrp/Pricing/Render/PriceBox.php
 create mode 100644 app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
 create mode 100644 app/code/Magento/MsrpConfigurableProduct/composer.json
 create mode 100644 app/code/Magento/MsrpConfigurableProduct/etc/di.xml
 create mode 100644 app/code/Magento/MsrpConfigurableProduct/etc/module.xml
 create mode 100644 app/code/Magento/MsrpConfigurableProduct/registration.php
 create mode 100644 app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php
 create mode 100644 app/code/Magento/MsrpGroupedProduct/composer.json
 create mode 100644 app/code/Magento/MsrpGroupedProduct/etc/di.xml
 create mode 100644 app/code/Magento/MsrpGroupedProduct/etc/module.xml
 create mode 100644 app/code/Magento/MsrpGroupedProduct/registration.php

diff --git a/app/code/Magento/ConfigurableImportExport/etc/module.xml b/app/code/Magento/ConfigurableImportExport/etc/module.xml
index 7ff81f8d63443..b59234ca0e7da 100644
--- a/app/code/Magento/ConfigurableImportExport/etc/module.xml
+++ b/app/code/Magento/ConfigurableImportExport/etc/module.xml
@@ -6,6 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_ConfigurableImportExport" >
+    <module name="Magento_ConfigurableImportExport">
+        <sequence>
+            <module name="Magento_ConfigurableProduct"/>
+        </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index 393383bb2e772..e84961d7556e0 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -7,11 +7,12 @@
 
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
+use Magento\Framework\App\ObjectManager;
 use Magento\Msrp\Model\Product\Attribute\Source\Type;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
  * Msrp data helper
@@ -43,6 +44,11 @@ class Data extends AbstractHelper
      */
     protected $productRepository;
 
+    /**
+     * @var MsrpPriceCalculatorInterface
+     */
+    private $msrpPriceCalculator;
+
     /**
      * @param Context $context
      * @param StoreManagerInterface $storeManager
@@ -51,6 +57,7 @@ class Data extends AbstractHelper
      * @param \Magento\Msrp\Model\Config $config
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param ProductRepositoryInterface $productRepository
+     * @param MsrpPriceCalculatorInterface|null $msrpPriceCalculator
      */
     public function __construct(
         Context $context,
@@ -59,7 +66,8 @@ public function __construct(
         \Magento\Msrp\Model\Msrp $msrp,
         \Magento\Msrp\Model\Config $config,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
-        ProductRepositoryInterface $productRepository
+        ProductRepositoryInterface $productRepository,
+        MsrpPriceCalculatorInterface $msrpPriceCalculator = null
     ) {
         parent::__construct($context);
         $this->storeManager = $storeManager;
@@ -68,6 +76,8 @@ public function __construct(
         $this->config = $config;
         $this->priceCurrency = $priceCurrency;
         $this->productRepository = $productRepository;
+        $this->msrpPriceCalculator = $msrpPriceCalculator
+            ?: ObjectManager::getInstance()->get(MsrpPriceCalculatorInterface::class);
     }
 
     /**
@@ -78,6 +88,7 @@ public function __construct(
      * @return bool
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function canApplyMsrp($product, $visibility = null)
     {
@@ -111,6 +122,7 @@ public function canApplyMsrp($product, $visibility = null)
      *
      * @param Product $product
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getMsrpPriceMessage($product)
     {
@@ -128,6 +140,7 @@ public function getMsrpPriceMessage($product)
      *
      * @param int|Product $product
      * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function isShowPriceOnGesture($product)
     {
@@ -139,6 +152,7 @@ public function isShowPriceOnGesture($product)
      *
      * @param int|Product $product
      * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function isShowBeforeOrderConfirm($product)
     {
@@ -149,31 +163,16 @@ public function isShowBeforeOrderConfirm($product)
      * Check if any MAP price is larger than as low as value.
      *
      * @param int|Product $product
-     * @return bool|float
+     * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function isMinimalPriceLessMsrp($product)
     {
         if (is_numeric($product)) {
             $product = $this->productRepository->getById($product, false, $this->storeManager->getStore()->getId());
         }
-        $msrp = $product->getMsrp();
+        $msrp = $this->msrpPriceCalculator->getMsrpPriceValue($product);
         $price = $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE);
-        if ($msrp === null) {
-            if ($product->getTypeId() === \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
-                $msrp = $product->getTypeInstance()->getChildrenMsrp($product);
-            } elseif ($product->getTypeId() === Configurable::TYPE_CODE) {
-                $prices = [];
-                foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
-                    if ($item->getMsrp() !== null) {
-                        $prices[] = $item->getMsrp();
-                    }
-                }
-
-                $msrp = $prices ? max($prices) : 0;
-            } else {
-                return false;
-            }
-        }
         if ($msrp) {
             $msrp = $this->priceCurrency->convertAndRound($msrp);
         }
diff --git a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php
new file mode 100644
index 0000000000000..3d1e5ef0b8e6c
--- /dev/null
+++ b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculator.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Msrp\Pricing;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * @inheritdoc
+ */
+class MsrpPriceCalculator implements MsrpPriceCalculatorInterface
+{
+    /**
+     * @var MsrpPriceCalculatorInterface[]
+     */
+    private $msrpPriceCalculators;
+
+    /**
+     * @param array $msrpPriceCalculators
+     */
+    public function __construct(array $msrpPriceCalculators)
+    {
+        $this->msrpPriceCalculators = $this->getMsrpPriceCalculators($msrpPriceCalculators);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMsrpPriceValue(ProductInterface $product): float
+    {
+        $productType = $product->getTypeId();
+        if (isset($this->msrpPriceCalculators[$productType])) {
+            $priceCalculator = $this->msrpPriceCalculators[$productType];
+            $msrp = $priceCalculator->getMsrpPriceValue($product);
+        } else {
+            $msrp = (float)$product->getMsrp();
+        }
+
+        return $msrp;
+    }
+
+    /**
+     * Convert the configuration of MSRP price calculators.
+     *
+     * @param array $msrpPriceCalculatorsConfig
+     * @return array
+     */
+    private function getMsrpPriceCalculators(array $msrpPriceCalculatorsConfig): array
+    {
+        $msrpPriceCalculators = [];
+        foreach ($msrpPriceCalculatorsConfig as $msrpPriceCalculator) {
+            if (isset($msrpPriceCalculator['productType'], $msrpPriceCalculator['priceCalculator'])) {
+                $msrpPriceCalculators[$msrpPriceCalculator['productType']] =
+                    $msrpPriceCalculator['priceCalculator'];
+            }
+        }
+        return $msrpPriceCalculators;
+    }
+}
diff --git a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
new file mode 100644
index 0000000000000..7872b6c5ba55c
--- /dev/null
+++ b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Msrp\Pricing;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Provide information about MSRP price of a product.
+ */
+interface MsrpPriceCalculatorInterface
+{
+    /**
+     * Return the value of MSRP product price.
+     *
+     * @param ProductInterface $product
+     * @return float
+     */
+    public function getMsrpPriceValue(ProductInterface $product): float;
+}
\ No newline at end of file
diff --git a/app/code/Magento/Msrp/Pricing/Render/PriceBox.php b/app/code/Magento/Msrp/Pricing/Render/PriceBox.php
new file mode 100644
index 0000000000000..892c0bcb51244
--- /dev/null
+++ b/app/code/Magento/Msrp/Pricing/Render/PriceBox.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Msrp\Pricing\Render;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Math\Random;
+use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\Render\RendererPool;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
+
+/**
+ * MSRP price box render.
+ */
+class PriceBox extends \Magento\Catalog\Pricing\Render\PriceBox
+{
+    /**
+     * @var MsrpPriceCalculatorInterface
+     */
+    private $msrpPriceCalculator;
+
+    /**
+     * Constructor
+     *
+     * @param Context $context
+     * @param Product $saleableItem
+     * @param PriceInterface $price
+     * @param RendererPool $rendererPool
+     * @param Data $jsonHelper
+     * @param Random $mathRandom
+     * @param MsrpPriceCalculatorInterface $msrpPriceCalculator
+     */
+    public function __construct(
+        Context $context,
+        Product $saleableItem,
+        PriceInterface $price,
+        RendererPool $rendererPool,
+        Data $jsonHelper,
+        Random $mathRandom,
+        MsrpPriceCalculatorInterface $msrpPriceCalculator
+    ) {
+        $this->msrpPriceCalculator = $msrpPriceCalculator;
+        parent::__construct($context, $saleableItem, $price, $rendererPool, $jsonHelper, $mathRandom);
+    }
+
+    /**
+     * Return MSRP price calculator.
+     *
+     * @return MsrpPriceCalculatorInterface
+     */
+    public function getMsrpPriceCalculator(): MsrpPriceCalculatorInterface
+    {
+        return $this->msrpPriceCalculator;
+    }
+}
diff --git a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
index 19f46b06ac5af..e4cd411a2e0b8 100644
--- a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Msrp\Test\Unit\Helper;
 
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
+
 /**
  * Class DataTest
  */
@@ -26,6 +28,14 @@ class DataTest extends \PHPUnit\Framework\TestCase
      */
     protected $productMock;
 
+    /**
+     * @var MsrpPriceCalculatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $msrpPriceCalculator;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->priceCurrencyMock = $this->createMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
@@ -33,6 +43,8 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getMsrp', 'getPriceInfo', '__wakeup'])
             ->getMock();
+        $this->msrpPriceCalculator = $this->getMockBuilder(MsrpPriceCalculatorInterface::class)
+            ->getMockForAbstractClass();
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -40,10 +52,14 @@ protected function setUp()
             \Magento\Msrp\Helper\Data::class,
             [
                 'priceCurrency' => $this->priceCurrencyMock,
+                'msrpPriceCalculator' => $this->msrpPriceCalculator,
             ]
         );
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testIsMinimalPriceLessMsrp()
     {
         $msrp = 120;
@@ -73,12 +89,13 @@ function ($arg) {
             ->with(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
             ->will($this->returnValue($finalPriceMock));
 
-        $this->productMock->expects($this->any())
-            ->method('getMsrp')
-            ->will($this->returnValue($msrp));
+        $this->msrpPriceCalculator
+            ->expects($this->any())
+            ->method('getMsrpPriceValue')
+            ->willReturn($msrp);
         $this->productMock->expects($this->any())
             ->method('getPriceInfo')
-            ->will($this->returnValue($priceInfoMock));
+            ->willReturn($priceInfoMock);
 
         $result = $this->helper->isMinimalPriceLessMsrp($this->productMock);
         $this->assertTrue($result, "isMinimalPriceLessMsrp returned incorrect value");
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index e3099aa2f14d6..a2e6da6de5387 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -10,8 +10,6 @@
         "magento/module-catalog": "*",
         "magento/module-downloadable": "*",
         "magento/module-eav": "*",
-        "magento/module-grouped-product": "*",
-        "magento/module-configurable-product": "*",
         "magento/module-store": "*",
         "magento/module-tax": "*"
     },
diff --git a/app/code/Magento/Msrp/etc/di.xml b/app/code/Magento/Msrp/etc/di.xml
index 6f197f769d412..b8392b0bb0fe4 100644
--- a/app/code/Magento/Msrp/etc/di.xml
+++ b/app/code/Magento/Msrp/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\Msrp\Api\Data\ProductRender\MsrpPriceInfoInterface" type="\Magento\Msrp\Model\ProductRender\MsrpPriceInfo" />
+    <preference for="\Magento\Msrp\Pricing\MsrpPriceCalculatorInterface" type="\Magento\Msrp\Pricing\MsrpPriceCalculator"/>
     <virtualType name="Magento\Catalog\Pricing\Price\Pool">
         <arguments>
             <argument name="prices" xsi:type="array">
diff --git a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
index 9e2dd20638646..b8a3910bf21bc 100644
--- a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
+++ b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml
@@ -11,7 +11,7 @@
             <argument name="default" xsi:type="array">
                 <item name="prices" xsi:type="array">
                     <item name="msrp_price" xsi:type="array">
-                        <item name="render_class" xsi:type="string">Magento\Catalog\Pricing\Render\PriceBox</item>
+                        <item name="render_class" xsi:type="string">Magento\Msrp\Pricing\Render\PriceBox</item>
                         <item name="render_template" xsi:type="string">Magento_Msrp::product/price/msrp.phtml</item>
                     </item>
                 </item>
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index a951c14cf4c70..a428df57ab113 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -9,7 +9,7 @@
 /**
  * Template for displaying product price at product view page, gift registry and wish-list
  *
- * @var $block \Magento\Catalog\Pricing\Render\PriceBox
+ * @var $block \Magento\Msrp\Pricing\Render\PriceBox
  */
 ?>
 <?php
@@ -21,19 +21,7 @@ $priceType = $block->getPrice();
 $product = $block->getSaleableItem();
 $productId = $product->getId();
 
-$amount = 0;
-if ($product->getMsrp()) {
-    $amount = $product->getMsrp();
-} elseif ($product->getTypeId() === \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
-    $amount = $product->getTypeInstance()->getChildrenMsrp($product);
-} elseif ($product->getTypeId() === \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
-    foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
-        if ($item->getMsrp() !== null) {
-            $prices[] = $item->getMsrp();
-        }
-    }
-    $amount = $prices ? max($prices) : 0;
-}
+$amount = $block->getMsrpPriceCalculator()->getMsrpPriceValue($product);
 
 $msrpPrice = $block->renderAmount(
     $priceType->getCustomAmount($amount),
diff --git a/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
new file mode 100644
index 0000000000000..6a8d9323e9f1a
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MsrpConfigurableProduct\Pricing;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
+
+/**
+ * {@inheritdoc}. Provide information for a Configurable product.
+ */
+class MsrpPriceCalculator implements MsrpPriceCalculatorInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getMsrpPriceValue(ProductInterface $product): float
+    {
+        /** @var Product $product */
+        if ($product->getTypeId() !== Configurable::TYPE_CODE) {
+            return 0;
+        }
+
+        /** @var Configurable $configurableProduct */
+        $configurableProduct = $product->getTypeInstance();
+        $prices = [];
+        foreach ($configurableProduct->getUsedProducts($product) as $item) {
+            if ($item->getMsrp() !== null) {
+                $prices[] = $item->getMsrp();
+            }
+        }
+
+        return $prices ? max($prices) : 0;
+    }
+}
diff --git a/app/code/Magento/MsrpConfigurableProduct/composer.json b/app/code/Magento/MsrpConfigurableProduct/composer.json
new file mode 100644
index 0000000000000..00c3cf6b03078
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "magento/module-msrp-configurable-product",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-msrp": "*",
+        "magento/module-configurable-product": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MsrpConfigurableProduct\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MsrpConfigurableProduct/etc/di.xml b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml
new file mode 100644
index 0000000000000..ea33c81ff7cf5
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/etc/di.xml
@@ -0,0 +1,19 @@
+<?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\Msrp\Pricing\MsrpPriceCalculator">
+        <arguments>
+            <argument name="msrpPriceCalculators" xsi:type="array">
+                <item name="configurable" xsi:type="array">
+                    <item name="productType" xsi:type="const">\Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE</item>
+                    <item name="priceCalculator" xsi:type="object">\Magento\MsrpConfigurableProduct\Pricing\MsrpPriceCalculator</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/MsrpConfigurableProduct/etc/module.xml b/app/code/Magento/MsrpConfigurableProduct/etc/module.xml
new file mode 100644
index 0000000000000..b00e363b0b269
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/etc/module.xml
@@ -0,0 +1,16 @@
+<?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:Module/etc/module.xsd">
+    <module name="Magento_MsrpConfigurableProduct" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Msrp"/>
+            <module name="Magento_ConfigurableProduct"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/MsrpConfigurableProduct/registration.php b/app/code/Magento/MsrpConfigurableProduct/registration.php
new file mode 100644
index 0000000000000..d4d58ec3c013b
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MsrpConfigurableProduct', __DIR__);
diff --git a/app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php b/app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php
new file mode 100644
index 0000000000000..b99f328a8b200
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/Pricing/MsrpPriceCalculator.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MsrpGroupedProduct\Pricing;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+use Magento\Msrp\Pricing\MsrpPriceCalculatorInterface;
+
+/**
+ * {@inheritdoc}. Provide information for a Grouped product.
+ */
+class MsrpPriceCalculator implements MsrpPriceCalculatorInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getMsrpPriceValue(ProductInterface $product): float
+    {
+        /** @var Product $product */
+        if ($product->getTypeId() !== Grouped::TYPE_CODE) {
+            return 0;
+        }
+
+        /** @var Grouped $groupedProduct */
+        $groupedProduct = $product->getTypeInstance();
+
+        return $groupedProduct->getChildrenMsrp($product);
+    }
+}
diff --git a/app/code/Magento/MsrpGroupedProduct/composer.json b/app/code/Magento/MsrpGroupedProduct/composer.json
new file mode 100644
index 0000000000000..a626f199ad6cc
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "magento/module-msrp-grouped-product",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-msrp": "*",
+        "magento/module-grouped-product": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MsrpGroupedProduct\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MsrpGroupedProduct/etc/di.xml b/app/code/Magento/MsrpGroupedProduct/etc/di.xml
new file mode 100644
index 0000000000000..29b25f15bc2c1
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/etc/di.xml
@@ -0,0 +1,19 @@
+<?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\Msrp\Pricing\MsrpPriceCalculator">
+        <arguments>
+            <argument name="msrpPriceCalculators" xsi:type="array">
+                <item name="grouped" xsi:type="array">
+                    <item name="productType" xsi:type="const">\Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE</item>
+                    <item name="priceCalculator" xsi:type="object">\Magento\MsrpGroupedProduct\Pricing\MsrpPriceCalculator</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/MsrpGroupedProduct/etc/module.xml b/app/code/Magento/MsrpGroupedProduct/etc/module.xml
new file mode 100644
index 0000000000000..898dd904b5dfb
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/etc/module.xml
@@ -0,0 +1,16 @@
+<?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:Module/etc/module.xsd">
+    <module name="Magento_MsrpGroupedProduct" >
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Msrp"/>
+            <module name="Magento_GroupedProduct"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/MsrpGroupedProduct/registration.php b/app/code/Magento/MsrpGroupedProduct/registration.php
new file mode 100644
index 0000000000000..c5a261e66c640
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MsrpGroupedProduct', __DIR__);

From db2e9f0a288bb27951fd5805c2e59a13792d2785 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Sat, 2 Mar 2019 19:21:49 -0600
Subject: [PATCH 0327/1055] MC-15085: Cannot install Magento without
 ConfigurableProduct module

---
 .../Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php   | 2 +-
 .../MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php | 6 +++++-
 app/code/Magento/MsrpConfigurableProduct/README.md          | 3 +++
 app/code/Magento/MsrpGroupedProduct/README.md               | 3 +++
 composer.json                                               | 2 ++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/MsrpConfigurableProduct/README.md
 create mode 100644 app/code/Magento/MsrpGroupedProduct/README.md

diff --git a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
index 7872b6c5ba55c..c50a381a2efa4 100644
--- a/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
+++ b/app/code/Magento/Msrp/Pricing/MsrpPriceCalculatorInterface.php
@@ -20,4 +20,4 @@ interface MsrpPriceCalculatorInterface
      * @return float
      */
     public function getMsrpPriceValue(ProductInterface $product): float;
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
index 6a8d9323e9f1a..b6f5194ab8cbe 100644
--- a/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
+++ b/app/code/Magento/MsrpConfigurableProduct/Pricing/MsrpPriceCalculator.php
@@ -30,13 +30,17 @@ public function getMsrpPriceValue(ProductInterface $product): float
 
         /** @var Configurable $configurableProduct */
         $configurableProduct = $product->getTypeInstance();
+        $msrp = 0;
         $prices = [];
         foreach ($configurableProduct->getUsedProducts($product) as $item) {
             if ($item->getMsrp() !== null) {
                 $prices[] = $item->getMsrp();
             }
         }
+        if ($prices) {
+            $msrp = (float)max($prices);
+        }
 
-        return $prices ? max($prices) : 0;
+        return  $msrp;
     }
 }
diff --git a/app/code/Magento/MsrpConfigurableProduct/README.md b/app/code/Magento/MsrpConfigurableProduct/README.md
new file mode 100644
index 0000000000000..8911b6e9e6667
--- /dev/null
+++ b/app/code/Magento/MsrpConfigurableProduct/README.md
@@ -0,0 +1,3 @@
+# MsrpConfigurableProduct
+
+**MsrpConfigurableProduct** provides type and resolver information for the Msrp module from the ConfigurableProduct module.
\ No newline at end of file
diff --git a/app/code/Magento/MsrpGroupedProduct/README.md b/app/code/Magento/MsrpGroupedProduct/README.md
new file mode 100644
index 0000000000000..d597ba7fc18a7
--- /dev/null
+++ b/app/code/Magento/MsrpGroupedProduct/README.md
@@ -0,0 +1,3 @@
+# MsrpGroupedProduct
+
+**MsrpGroupedProduct** provides type and resolver information for the Msrp module from the GroupedProduct module.
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 90954101d8d40..3c71d9da983c0 100644
--- a/composer.json
+++ b/composer.json
@@ -181,6 +181,8 @@
         "magento/module-media-storage": "*",
         "magento/module-message-queue": "*",
         "magento/module-msrp": "*",
+        "magento/module-msrp-configurable-product": "*",
+        "magento/module-msrp-grouped-product": "*",
         "magento/module-multishipping": "*",
         "magento/module-mysql-mq": "*",
         "magento/module-new-relic-reporting": "*",

From c80e1ba960c6a29e7ec3422c076330b7ffa117f9 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sun, 3 Mar 2019 15:48:48 +0100
Subject: [PATCH 0328/1055] Added composer dependency (Sales module)

---
 app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php | 5 -----
 app/code/Magento/QuoteGraphQl/composer.json                 | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
index cb5fcf0dad5ab..c087e867a342a 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
@@ -68,7 +68,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             $orderId = $this->cartManagement->placeOrder($cart->getId());
             $order = $this->orderRepository->get($orderId);
 
-            // TODO: populate with data
             return [
                 'order' => [
                     'order_id' => $order->getIncrementId()
@@ -78,10 +77,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(
                 __('Unable to place order: %message', ['message' => $exception->getMessage()])
             );
-        } catch (\Exception $exception) {
-            throw new GraphQlInputException(
-                __('Unable to place order. An internal error occurred')
-            );
         }
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
index 1bf4d581a5fe3..b53cab6656217 100644
--- a/app/code/Magento/QuoteGraphQl/composer.json
+++ b/app/code/Magento/QuoteGraphQl/composer.json
@@ -10,7 +10,8 @@
         "magento/module-catalog": "*",
         "magento/module-store": "*",
         "magento/module-customer": "*",
-        "magento/module-customer-graph-ql": "*"
+        "magento/module-customer-graph-ql": "*",
+        "magento/module-sales" : "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*"

From 1ee5d3877b7f842d45f8adc045fe0ba2dbba8073 Mon Sep 17 00:00:00 2001
From: Mila Lesechko <l.lesechko@gmail.com>
Date: Sun, 3 Mar 2019 15:48:18 -0600
Subject: [PATCH 0329/1055] 632: Convert
 UpdateProductFromMiniShoppingCartEntityTest to MFTF

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    | 16 +++++
 ...oppingCartCheckSummaryTotalActionGroup.xml | 21 +++++++
 .../Checkout/Test/Mftf/Data/QuoteData.xml     |  8 +++
 ...eProductFromMiniShoppingCartEntityTest.xml | 58 +++++++++++++++++++
 ...eProductFromMiniShoppingCartEntityTest.xml |  2 +-
 5 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/ShoppingCartCheckSummaryTotalActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index d812123e4b553..65e30f98c2ca5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -869,4 +869,20 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="simpleProductWithoutCategory" type="product">
+        <data key="sku" unique="suffix">sku_simple_product_</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">560</data>
+        <data key="urlKey" unique="suffix">simple-product-</data>
+        <data key="status">1</data>
+        <data key="quantity">25</data>
+        <data key="weight">1</data>
+        <data key="product_has_weight">1</data>
+        <data key="is_in_stock">1</data>
+        <data key="tax_class_id">2</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ShoppingCartCheckSummaryTotalActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ShoppingCartCheckSummaryTotalActionGroup.xml
new file mode 100644
index 0000000000000..70b4e95124da8
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ShoppingCartCheckSummaryTotalActionGroup.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="ShoppingCartCheckSummaryTotalActionGroup">
+        <arguments>
+            <argument name="dataQuote" type="entity"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad" time="120"/>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabCartTotal" />
+        <assertContains stepKey="assertCartTotal">
+            <actualResult type="variable">$grabCartTotal</actualResult>
+            <expectedResult type="string">{{dataQuote.total}}</expectedResult>
+        </assertContains>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
index 530157851191f..be6e1af67fc63 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
@@ -15,4 +15,12 @@
         <data key="total">495.00</data>
         <data key="shippingMethod">Flat Rate - Fixed</data>
     </entity>
+    <entity name="simpleOrderQty2" type="Quote">
+        <data key="price">560.00</data>
+        <data key="qty">2</data>
+        <data key="subtotal">1,120.00</data>
+        <data key="shipping">10.00</data>
+        <data key="total">1,130.00</data>
+        <data key="shippingMethod">Flat Rate - Fixed</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml
new file mode 100644
index 0000000000000..451bce9e49a8f
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml
@@ -0,0 +1,58 @@
+<?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="UpdateProductFromMiniShoppingCartEntityTest">
+        <annotations>
+            <stories value="Shopping Cart"/>
+            <title value="Check updating product from mini shopping cart"/>
+            <description value="Update Product Qty on Mini Shopping Cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-29812"/>
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <!--Create product according to dataset.-->
+            <createData entity="simpleProductWithoutCategory" stepKey="createProduct"/>
+
+            <!-- Go to frontend -->
+            <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="navigateToProductPage"/>
+
+            <!--Add product to cart-->
+            <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+                <argument name="productName" value="$$createProduct.name$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct" />
+        </after>
+
+        <!-- Click on mini shopping cart icon -->
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="goToMiniShoppingCart"/>
+
+        <!-- Click Edit -->
+        <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="editMiniCartItem"/>
+
+        <!-- Fill data from dataset -->
+        <clearField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="deleteFiled"/>
+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="{{simpleOrderQty2.qty}}" stepKey="changeQty"/>
+
+        <!-- Click Update -->
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="updateQty"/>
+
+        <!-- Perform all assertions -->
+        <actionGroup ref="ShoppingCartCheckSummaryTotalActionGroup" stepKey="checkSummary">
+            <argument name="dataQuote" value="simpleOrderQty2"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
index 8b2460718097c..b4c97a11b9145 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest.xml
@@ -9,7 +9,7 @@
     <testCase name="Magento\Checkout\Test\TestCase\UpdateProductFromMiniShoppingCartEntityTest" summary="Update Product from Mini Shopping Cart" ticketId="MAGETWO-29812">
         <variation name="UpdateProductFromMiniShoppingCartEntityTestVariation1" summary="Update Product Qty on Mini Shopping Cart" ticketId=" MAGETWO-35536">
             <data name="issue" xsi:type="string">https://github.com/magento-engcom/msi/issues/1624</data>
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, severity:S0, mftf_migrated:yes</data>
             <data name="originalProduct/0" xsi:type="string">catalogProductSimple::default</data>
             <data name="checkoutData/dataset" xsi:type="string">simple_order_qty_2</data>
             <data name="use_minicart_to_edit_qty" xsi:type="boolean">true</data>

From d45bd6555d48b32ffb32a22c6668887c2bf68f86 Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Mon, 4 Mar 2019 12:43:50 +0530
Subject: [PATCH 0330/1055] Added space above error message.

---
 .../luma/Magento_Catalog/web/css/source/_module.less        | 6 +-----
 .../luma/Magento_GroupedProduct/web/css/source/_module.less | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

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 48fa5ecde302b..fc59d530fd16c 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
@@ -293,11 +293,7 @@
         }
     }
 
-    .page-product-grouped {
-        .box-tocart {
-            margin-top: @indent__s;
-        }
-    }
+    
 
     .product-options-wrapper {
         .fieldset-product-options-inner {
diff --git a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
index 088372808aa6a..92a67df1d26c3 100644
--- a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
@@ -70,6 +70,9 @@
                 clear: left;
             }
         }
+        .box-tocart {
+            margin-top: @indent__s;
+        }
     }
 }
 

From 64f270a2738f9795eb0048f331bcb22a9b1e6f54 Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Mon, 4 Mar 2019 14:08:08 +0530
Subject: [PATCH 0331/1055] Added space above error message.

---
 .../Magento/luma/Magento_Catalog/web/css/source/_module.less    | 2 --
 .../luma/Magento_GroupedProduct/web/css/source/_module.less     | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

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 fc59d530fd16c..33b1ff43fe046 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
@@ -293,8 +293,6 @@
         }
     }
 
-    
-
     .product-options-wrapper {
         .fieldset-product-options-inner {
             .legend {
diff --git a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
index 92a67df1d26c3..550f8718ddead 100644
--- a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
@@ -70,6 +70,7 @@
                 clear: left;
             }
         }
+
         .box-tocart {
             margin-top: @indent__s;
         }

From ff94ee1739dc1f26b710aa74b7ffc8f87c987742 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Mon, 4 Mar 2019 10:07:27 +0000
Subject: [PATCH 0332/1055] Update app/code/Magento/Ups/Model/Carrier.php

Co-Authored-By: wsajosh <joshua.stewart@shipperhq.com>
---
 app/code/Magento/Ups/Model/Carrier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 75ce0c3014efa..9cb1fe615aa42 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -77,7 +77,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      *
      * @var string
      */
-    protected $_defaultCgiGatewayUrl = 'https://www.ups.com:80/using/services/rave/qcostcgi.cgi';
+    protected $_defaultCgiGatewayUrl = 'https://www.ups.com/using/services/rave/qcostcgi.cgi';
 
     /**
      * Test urls for shipment

From c1c8ffebf1308c10c4c819fd5e44c125e862f0e7 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Mon, 4 Mar 2019 09:54:39 -0600
Subject: [PATCH 0333/1055] MC-15085: Cannot install Magento without
 ConfigurableProduct module

---
 app/code/Magento/Msrp/Helper/Data.php | 2 ++
 composer.lock                         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index e84961d7556e0..2f6dd2da9bbc4 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -16,6 +16,8 @@
 
 /**
  * Msrp data helper
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Data extends AbstractHelper
 {
diff --git a/composer.lock b/composer.lock
index a880a6dea16d1..df9797369287e 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": "19b030406adc1028eb58a37e975c5f74",
+    "content-hash": "7cc5e0b20b1ae762a9632d5ee7a41bf1",
     "packages": [
         {
             "name": "braintree/braintree_php",

From 51e59e0138bd18d70b89b55d2284f934cf7b783b Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Mon, 4 Mar 2019 10:30:19 -0600
Subject: [PATCH 0334/1055] MC-15139: For UK country when PayPal Express is
 enabled and user tries to enable say PayPal"Payment Standards" then info
 pop-up does NOT display i.e. "There is already another PayPal solution
 enabled...."

- fix payment ids for United Kingdom and write MFTF test
---
 ...penPayPalButtonCheckoutPageActionGroup.xml |  17 +-
 .../OtherPayPalConfigurationActionGroup.xml   |  40 +++
 ...xpressCheckoutConfigurationActionGroup.xml |  24 +-
 .../Paypal/Test/Mftf/Data/PaypalData.xml      |  10 +
 .../OtherPayPalPaymentsConfigSection.xml      |  31 ++
 .../PayPalExpressCheckoutConfigSection.xml    |  28 +-
 .../Mftf/Section/PaymentsConfigSection.xml    |  14 +
 ...figPaymentsConflictResolutionForPayPal.xml | 276 ++++++++++++++++++
 .../Paypal/etc/adminhtml/rules/payment_gb.xml |  16 +-
 9 files changed, 419 insertions(+), 37 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml

diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
index 97c7fbc471e97..32c2fab40e97a 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
@@ -8,12 +8,15 @@
 <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"/>
+        <arguments>
+            <argument name="countryCode" type="string" defaultValue="us"/>
+        </arguments>
+        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab(countryCode)}}" stepKey="waitForAdvancedSettingTab"/>
+        <click selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab(countryCode)}}" stepKey="openAdvancedSettingTab"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab(countryCode)}}" stepKey="waitForFrontendExperienceSettingsTab"/>
+        <click selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab(countryCode)}}" stepKey="openFrontendExperienceSettingsTab"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab(countryCode)}}" stepKey="waitForCheckoutPageTab"/>
+        <click selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab(countryCode)}}" stepKey="openCheckoutPageTab"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.xml
new file mode 100644
index 0000000000000..08ca6c7834384
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OtherPayPalConfigurationActionGroup.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="EnablePayPalConfiguration">
+        <arguments>
+            <argument name="payPalConfigType"/>
+            <argument name="countryCode" type="string" defaultValue="us"/>
+        </arguments>
+        <waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
+        <conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="clickOtherPayPalPaymentsSection"/>
+        <waitForElementVisible selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="waitForWPSExpressConfigureBtn"/>
+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn"/>
+        <waitForElementVisible selector="{{payPalConfigType.enableSolution(countryCode)}}" stepKey="waitForWPSExpressEnable"/>
+        <selectOption selector="{{payPalConfigType.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableWPSExpressSolution"/>
+        <seeInPopup userInput="There is already another PayPal solution enabled. Enable this solution instead?" stepKey="seeAlertMessage"/>
+        <acceptPopup stepKey="acceptEnablePopUp"/>
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+    </actionGroup>
+    <actionGroup name="CheckEnableOptionPayPalConfiguration">
+        <arguments>
+            <argument name="payPalConfigType"/>
+            <argument name="enabledOption" type="string"/>
+            <argument name="countryCode" type="string" defaultValue="us"/>
+        </arguments>
+        <waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
+        <conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="clickOtherPayPalPaymentsSection"/>
+        <waitForElementVisible selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="waitForWPSExpressConfigureBtn"/>
+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn1"/>
+        <waitForElementVisible selector="{{payPalConfigType.enableSolution(countryCode)}}" stepKey="waitForWPSExpressEnable"/>
+        <seeOptionIsSelected selector="{{payPalConfigType.enableSolution(countryCode)}}" userInput="{{enabledOption}}" stepKey="seeSelectedOption"/>
+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn2"/>
+    </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
index 7bf26aceb316a..bae517ffe2f3e 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
@@ -8,18 +8,22 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ConfigPayPalExpressCheckout">
+        <arguments>
+            <argument name="credentials" defaultValue="_CREDS"/>
+            <argument name="countryCode" type="string" defaultValue="us"/>
+        </arguments>
         <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"/>
+        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab(countryCode)}}" stepKey="waitForAdvancedSettingTab"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.email(countryCode)}}" userInput="{{credentials.paypal_express_email}}" stepKey="inputEmailAssociatedWithPayPalMerchantAccount"/>
+        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.apiMethod(countryCode)}}" userInput="API Signature" stepKey="inputAPIAuthenticationMethods"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.username(countryCode)}}" userInput="{{credentials.paypal_express_api_username}}" stepKey="inputAPIUsername"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.password(countryCode)}}" userInput="{{credentials.paypal_express_api_password}}" stepKey="inputAPIPassword"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.signature(countryCode)}}" userInput="{{credentials.paypal_express_api_signature}}" stepKey="inputAPISignature"/>
+        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.sandboxMode(countryCode)}}" userInput="Yes" stepKey="enableSandboxMode"/>
+        <selectOption selector="{{PayPalExpressCheckoutConfigSection.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableSolution"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.merchantID(countryCode)}}" userInput="{{credentials.paypal_express_merchantID}}" stepKey="inputMerchantID"/>
         <!--Save configuration-->
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
     </actionGroup>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
index d97e60043cc5d..ae34476e9ac0b 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
@@ -38,6 +38,9 @@
     <entity name="SampleUseProxy" type="use_proxy">
         <data key="value">0</data>
     </entity>
+    <entity name="SampleMerchantID" type="use_proxy">
+        <data key="value">someMerchantId</data>
+    </entity>
 
     <!-- default configuration used to restore Magento config -->
     <entity name="DefaultPayPalConfig" type="paypal_config_state">
@@ -89,4 +92,11 @@
         <data key="silver">silver</data>
         <data key="black">black</data>
     </entity>
+    <entity name="SamplePaypalExpressConfig" type="paypal_express_config">
+        <data key="paypal_express_email">myBusinessAccount@magento.com</data>
+        <data key="paypal_express_api_username">myApiUsername.magento.com</data>
+        <data key="paypal_express_api_password">somePassword</data>
+        <data key="paypal_express_api_signature">someApiSignature</data>
+        <data key="paypal_express_merchantID">someMerchantId</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.xml
new file mode 100644
index 0000000000000..ca8438d5ee06a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPayPalPaymentsConfigSection.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="OtherPayPalPaymentsConfigSection">
+        <element name="expandTab" type="button" selector="#payment_{{countryCode}}_other_paypal_payment_solutions-head" parameterized="true"/>
+        <element name="expandedTab" type="button" selector="#payment_{{countryCode}}_other_paypal_payment_solutions-head.open" parameterized="true"/>
+    </section>
+    <section name="WPSExpressConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express_express_checkout_required_enable_express_checkout" parameterized="true"/>
+    </section>
+    <section name="PaymentsProHostedWithExpressCheckoutConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_with_express_checkout_pphs_required_settings_pphs_enable" parameterized="true"/>
+    </section>
+    <section name="WPSOtherConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_other-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_other_express_checkout_required_enable_express_checkout" parameterized="true"/>
+    </section>
+    <section name="WebsitePaymentsPlusConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_{{countryCode}}-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payments_pro_hosted_solution_{{countryCode}}_pphs_required_settings_pphs_enable" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
index 3ac0bb2707556..85f94cd8691a5 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
@@ -9,20 +9,24 @@
 <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"/>
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}-head" parameterized="true"/>
+        <element name="email" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_business_account" parameterized="true"/>
+        <element name="apiMethod" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_authentication" parameterized="true"/>
+        <element name="username" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_username" parameterized="true"/>
+        <element name="password" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_password" parameterized="true"/>
+        <element name="signature" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_api_signature" parameterized="true"/>
+        <element name="sandboxMode" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_express_checkout_required_express_checkout_sandbox_flag" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_enable_express_checkout" parameterized="true"/>
+        <element name="merchantID" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_merchant_id" parameterized="true"/>
+    </section>
+    <section name="PayPalExpressCheckoutOtherCountryConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_express_checkout_other-head" parameterized="true"/>
+        <element name="enableSolution" type="input" selector="#payment_{{countryCode}}_express_checkout_other_express_checkout_required_enable_express_checkout" parameterized="true"/>
     </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"/>
+        <element name="advancedSettingTab" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced-head" parameterized="true"/>
+        <element name="frontendExperienceSettingsTab" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced_express_checkout_frontend-head" parameterized="true"/>
+        <element name="checkoutPageTab" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button-head" parameterized="true"/>
        </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')]"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.xml
new file mode 100644
index 0000000000000..35162cb7d619d
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PaymentsConfigSection.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="PaymentsConfigSection">
+        <element name="merchantCountry" type="select" selector="//select[@name='groups[account][fields][merchant_country][value]']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
new file mode 100644
index 0000000000000..b485fcb2a8f9a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
@@ -0,0 +1,276 @@
+<?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="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in United Kingdom"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country United Kingdom"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="ConfigPayPalExpressCheckout" stepKey="ConfigPayPalExpress">
+                <argument name="credentials" value="SamplePaypalExpressConfig"/>
+            </actionGroup>
+        </before>
+        <after>
+            <magentoCLI command="config:set paypal/general/merchant_country US" stepKey="setMerchantCountry"/>
+            <magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/>
+            <magentoCLI command="config:set payment/wps_express/active 0" stepKey="disableWPSExpress"/>
+            <magentoCLI command="config:set payment/hosted_pro/active 0" stepKey="disableHostedProExpress"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Change Merchant Country -->
+        <comment userInput="Change Merchant Country" stepKey="changeMerchantCountryComment"/>
+        <waitForElementVisible selector="{{PaymentsConfigSection.merchantCountry}}" stepKey="waitForMerchantCountry"/>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="United Kingdom" stepKey="setMerchantCountry"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <!-- Enable WPS Express -->
+        <comment userInput="Enable WPS Express" stepKey="enableWPSExpressComment"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <!-- Check only the correct solution is enabled -->
+        <comment userInput="Check only the correct solution is enabled" stepKey="checkOnlyTheCorrectSolutionIsEnabledComment1"/>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <!-- Enable Pro Hosted With Express Checkout -->
+        <comment userInput="Enable Pro Hosted With Express Checkout" stepKey="enableProHostedWithExpressCheckoutComment"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="PaymentsProHostedWithExpressCheckoutConfigSection"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <!-- Check only the correct solution is enabled -->
+        <comment userInput="Check only the correct solution is enabled" stepKey="checkOnlyTheCorrectSolutionIsEnabledComment2"/>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="PaymentsProHostedWithExpressCheckoutConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="gb"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInJapan" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in Japan"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Japan"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Japan" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="jp"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInFrance" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in France"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country France"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="France" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="fr"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInHongKong" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in Hong Kong"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Hong Kong"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Hong Kong SAR China" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="hk"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInItaly" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in Italy"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Italy"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Italy" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
+    </test>
+    <test name="AdminConfigPaymentsConflictResolutionForPayPalInSpain" extends="AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdom">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Payment methods"/>
+            <title value="Conflict resolution for PayPal in Spain"/>
+            <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Spain"/>
+            <severity value="Major"/>
+            <testCaseId value="MC-13146"/>
+            <group value="paypal"/>
+        </annotations>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Spain" stepKey="setMerchantCountry"/>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableWPSExpress">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkPayPalExpressIsDisabled">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsEnabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="EnablePayPalConfiguration" stepKey="EnableProHostedWithExpressCheckou">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkWPSExpressIsDisabled">
+            <argument name="payPalConfigType" value="WPSOtherConfigSection"/>
+            <argument name="enabledOption" value="No"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+        <actionGroup ref="CheckEnableOptionPayPalConfiguration" stepKey="checkProHostedIsEnabled">
+            <argument name="payPalConfigType" value="WebsitePaymentsPlusConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="es"/>
+        </actionGroup>
+    </test>
+</tests>
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 565962518881b..d8b765b9b4d22 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
@@ -15,7 +15,7 @@
                 <predicate name="confirm"
                            message="There is already another PayPal solution enabled. Enable this solution instead?"
                            event="deactivate-rule"
-                        >
+                >
                     <argument name="wps_express">wps_express</argument>
                 </predicate>
             </event>
@@ -39,16 +39,16 @@
                 <predicate name="confirm"
                            message="There is already another PayPal solution enabled. Enable this solution instead?"
                            event="deactivate-rule"
-                        >
+                >
                     <argument name="payments_pro_hosted_solution_with_express_checkout">payments_pro_hosted_solution_with_express_checkout</argument>
-                    <argument name="express_checkout_us">express_checkout_us</argument>
+                    <argument name="express_checkout_gb">express_checkout_gb</argument>
                 </predicate>
             </event>
         </events>
         <relation target="payments_pro_hosted_solution_with_express_checkout">
             <rule type="disable" event="activate-rule"/>
         </relation>
-        <relation target="express_checkout_us">
+        <relation target="express_checkout_gb">
             <rule type="disable" event="activate-rule"/>
         </relation>
         <relation target=":self">
@@ -56,19 +56,19 @@
             <rule type="simpleDisable" event="deactivate-rule"/>
             <rule type="conflict" event=":load">
                 <argument name="payments_pro_hosted_solution_with_express_checkout">payments_pro_hosted_solution_with_express_checkout</argument>
-                <argument name="express_checkout_us">express_checkout_us</argument>
+                <argument name="express_checkout_gb">express_checkout_gb</argument>
             </rule>
         </relation>
     </payment>
     <!-- Express Checkout -->
-    <payment id="express_checkout_us">
+    <payment id="express_checkout_gb">
         <events selector="[data-enable='payment']">
             <event value="0" name="deactivate-rule"/>
             <event value="1" name="activate-rule">
                 <predicate name="confirm"
                            message="There is already another PayPal solution enabled. Enable this solution instead?"
                            event="deactivate-rule"
-                        >
+                >
                     <argument name="wps_express">wps_express</argument>
                 </predicate>
             </event>
@@ -98,4 +98,4 @@
             <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
-</rules>
+</rules>
\ No newline at end of file

From 196a447eb90bf5f85aafabd3f6d007e74ef71365 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Mon, 4 Mar 2019 11:52:02 -0600
Subject: [PATCH 0335/1055] MC-4874: Convert CreateWebsiteEntityTest to MFTF

---
 .../AdminCreateWebsiteActionGroup.xml         | 27 ++++++++++
 .../Mftf/Section/AdminStoresGridSection.xml   |  3 +-
 .../Test/Mftf/Test/AdminCreateWebsiteTest.xml | 49 +++++++++++++++++++
 3 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
index ef8d77c8824ff..dd8bd7b6789a2 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
@@ -36,4 +36,31 @@
         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
         <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabFromCurrentUrl"/>
     </actionGroup>
+
+    <actionGroup name="AssertWebsiteInGrid">
+        <arguments>
+            <argument name="websiteName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillWebsiteField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <seeElement selector="{{AdminStoresGridSection.nthRow(websiteName)}}" stepKey="seeAssertWebsiteInGrid"/>
+    </actionGroup>
+
+    <actionGroup name="AssertWebsiteForm">
+        <arguments>
+            <argument name="websiteName" type="string"/>
+            <argument name="websiteCode" type="string"/>
+            <argument name="websiteId"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.nthRow(websiteName)}}" stepKey="clickWebsiteFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitTillWebsiteFormPageIsOpened"/>
+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabWebsiteIdFromCurrentUrl"/>
+        <seeInCurrentUrl url="/system_store/editWebsite/website_id/{$grabWebsiteIdFromCurrentUrl}" stepKey="seeWebsiteId"/>
+        <seeInField selector="{{AdminNewWebsiteSection.name}}" userInput="{{websiteName}}" stepKey="seeAssertWebsiteName"/>
+        <seeInField selector="{{AdminNewWebsiteSection.code}}" userInput="{{websiteCode}}" stepKey="seeAssertWebsiteCode"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index b02e9adaed45e..c3b3fc8fa342d 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -21,5 +21,6 @@
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
         <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
+        <element name="nthRow" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
      </section>
-</sections>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
new file mode 100644
index 0000000000000..44b774eed372f
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+        <test name="AdminCreateWebsiteTest">
+            <annotations>
+                <stories value="Create Website"/>
+                <title value="CreateWebsiteEntityTestVariation1"/>
+                <description value="Test log in to Stores and Create Website Test"/>
+                <testCaseId value="MC-14302"/>
+                <severity value="CRITICAL"/>
+                <group value="store"/>
+                <group value="mtf_migrated"/>
+            </annotations>
+
+            <before>
+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            </before>
+            <after>
+                <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                    <argument name="websiteName" value="{{customWebsite.name}}"/>
+                </actionGroup>
+                <actionGroup ref="logout" stepKey="logout"/>
+            </after>
+
+            <!--Create website and AssertWebsiteSuccessSaveMessage-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+
+            <!--Search created website in grid and AssertWebsiteInGrid-->
+            <actionGroup ref="AssertWebsiteInGrid" stepKey="seeWebsiteInGrid">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+
+            <!--AssertWebsiteForm and AssertWebsiteOnStoreForm-->
+            <actionGroup ref="AssertWebsiteForm" stepKey="seeWebsiteForm">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+                <argument name="websiteId" value="admin/system_store/editWebsite/website_id/{$grabWebsiteIdFromCurrentUrl}"/>
+            </actionGroup>
+        </test>
+</tests>
\ No newline at end of file

From f1f405c82446d39accfcebdd0ec6e523f9d25f4f Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Mon, 4 Mar 2019 12:03:54 -0600
Subject: [PATCH 0336/1055] MC-4869: Convert DeleteStoreEntityTest to MFTF

Addressing review comments
---
 .../Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
index a08648bc8b8c6..cf2cabdcc2399 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
@@ -26,7 +26,6 @@
         <waitForPageLoad stepKey="waitForSuccessMessage"/>
         <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
     </actionGroup>
-    <!--AssertStoreSuccessDeleteAndBackupMessages-->
     <actionGroup name="DeleteCustomStoreViewBackupEnabledYesActionGroup">
         <arguments>
             <argument name="storeViewName" type="string"/>
@@ -46,7 +45,6 @@
         <see selector="{{AdminStoresGridSection.successMessage}}" userInput="The database was backed up." stepKey="seeAssertDatabaseBackedUpMessage"/>
         <see selector="{{AdminStoresGridSection.successMessage}}" userInput="You deleted the store view." stepKey="seeAssertSuccessDeleteStoreViewMessage"/>
     </actionGroup>
-    <!--AssertStoreViewNotInGrid-->
     <actionGroup name="AssertStoreViewNotInGrid">
         <arguments>
             <argument name="storeViewName" type="string"/>

From 7394aeb9b7c2679558c8e2bda9badfc825eee11d Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Mon, 4 Mar 2019 13:50:06 -0600
Subject: [PATCH 0337/1055] MC-4869: Convert DeleteStoreEntityTest to MFTF

Addressing second set of review comments
---
 ...leteStoreTest.xml => AdminDeleteStoreViewTest.xml} | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 rename app/code/Magento/Store/Test/Mftf/Test/{AdminDeleteStoreTest.xml => AdminDeleteStoreViewTest.xml} (83%)

diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml
similarity index 83%
rename from app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreTest.xml
rename to app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml
index 37829f4782413..380f6c31f98a7 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminDeleteStoreViewTest.xml
@@ -7,10 +7,10 @@
 -->
 <!-- Test XML Example -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-        <test name="AdminDeleteStoreTest">
+        <test name="AdminDeleteStoreViewTest">
             <annotations>
                 <stories value="Delete Store View"/>
-                <title value="DeleteStoreEntityTestVariation1"/>
+                <title value="Delete Store View and Save Backup"/>
                 <description value="Test log in to Stores and Delete Store View"/>
                 <testCaseId value="MC-14303"/>
                 <severity value="CRITICAL"/>
@@ -31,19 +31,20 @@
                 <actionGroup ref="logout" stepKey="logout"/>
             </after>
 
-            <!--AssertStoreSuccessDeleteAndBackupMessages-->
+            <!--Delete custom store view and verify AssertStoreSuccessDeleteMessage And BackupMessage-->
             <actionGroup ref="DeleteCustomStoreViewBackupEnabledYesActionGroup" stepKey="deleteCustomStoreView">
                 <argument name="storeViewName" value="{{storeViewData.name}}"/>
             </actionGroup>
 
-            <!--AssertStoreNotInGrid-->
+            <!--Verify deleted store view not present in grid and verify AssertStoreNotInGrid Message-->
             <actionGroup ref="AssertStoreViewNotInGrid" stepKey="verifyDeletedStoreViewNotInGrid">
                 <argument name="storeViewName" value="{{storeViewData.name}}"/>
             </actionGroup>
 
-            <!--Go to backup index page, verify AssertBackupInGrid-->
+            <!--Go to backup index page and verify AssertBackupInGrid-->
             <amOnPage url="{{BackupIndexPage.url}}" stepKey="goToBackupIndexPage"/>
             <waitForPageLoad stepKey="waitForBackupIndexPageLoad"/>
+            <see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{WebSetupWizardBackup.name}}" stepKey="seeBackupInGrid"/>
             <!--Delete database backup-->
             <actionGroup ref="deleteBackup" stepKey="deleteDatabaseBackup">
                 <argument name="backup" value="WebSetupWizardBackup"/>

From bc3f4526a0a3a305aaa22e99aeede10c75015730 Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Mon, 4 Mar 2019 15:25:40 -0600
Subject: [PATCH 0338/1055] MC-4426: Convert ExportProductsTest to MFTF

---
 .../ActionGroup/AdminExportActionGroup.xml    | 22 ++++++++++++-------
 .../Test/AdminExportBundleProductTest.xml     |  9 +++++---
 ...portGroupedProductWithSpecialPriceTest.xml |  8 +++++--
 ...figurableProductsWithCustomOptionsTest.xml | 10 ++++++---
 ...igurableProductsWithAssignedImagesTest.xml | 10 ++++++---
 ...ableProductAssignedToCustomWebsiteTest.xml |  8 +++++--
 ...rtSimpleProductWithCustomAttributeTest.xml |  8 +++++--
 .../Section/AdminExportAttributeSection.xml   |  8 +++----
 8 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
index 21b81648ea479..63248dd53fc1b 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
@@ -10,10 +10,10 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
 
     <!-- Export products using filtering by attribute -->
-    <actionGroup name="fillFilterExport">
+    <actionGroup name="exportProductsFilterByAttribute">
         <arguments>
-            <argument name="attribute"/>
-            <argument name="attributeData"/>
+            <argument name="attribute" type="string"/>
+            <argument name="attributeData" type="string"/>
         </arguments>
         <selectOption selector="{{AdminExportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
         <waitForElementVisible selector="{{AdminExportMainSection.entityAttributes}}" stepKey="waitForElementVisible"/>
@@ -38,19 +38,25 @@
     </actionGroup>
 
     <!-- Download first file in the grid -->
-    <actionGroup name="downloadProduct">
+    <actionGroup name="downloadFileByRowIndex">
+        <arguments>
+            <argument name="rowIndex" type="string"/>
+        </arguments>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitFormReload"/>
-        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex('0')}}"/>
-        <click stepKey="clickOnDownload" selector="{{AdminExportAttributeSection.download('0')}}" after="clickSelectBtn"/>
+        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex(rowIndex)}}"/>
+        <click stepKey="clickOnDownload" selector="{{AdminExportAttributeSection.download(rowIndex)}}" after="clickSelectBtn"/>
     </actionGroup>
 
     <!-- Delete exported file -->
     <actionGroup name="deleteExportedFile">
+        <arguments>
+            <argument name="rowIndex" type="string"/>
+        </arguments>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitFormReload"/>
-        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex('0')}}"/>
-        <click stepKey="clickOnDownload" selector="{{AdminExportAttributeSection.delete('0')}}" after="clickSelectBtn"/>
+        <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex(rowIndex)}}"/>
+        <click stepKey="clickOnDownload" selector="{{AdminExportAttributeSection.delete(rowIndex)}}" after="clickSelectBtn"/>
         <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
         <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
         <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
index 476e3756f55ca..3a4010f417104 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
@@ -89,7 +89,9 @@
         </before>
         <after>
             <!-- Delete exported file -->
-            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
 
             <!-- Delete products creations -->
             <deleteData createDataKey="createDynamicBundleProduct" stepKey="deleteDynamicBundleProduct"/>
@@ -109,12 +111,13 @@
 
         <!-- Go to export page -->
         <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="goToExportIndexPage"/>
-        <waitForPageLoad stepKey="waitForExportIndexPageLoad" time="10"/>
 
         <!-- Export created below products -->
         <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
 
         <!-- Download product -->
-        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
index adec5daddfeb0..09d9469cb093d 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
@@ -57,7 +57,9 @@
         </before>
         <after>
             <!-- Delete exported file -->
-            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
 
             <!-- Deleted created products -->
             <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
@@ -79,6 +81,8 @@
         <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
 
         <!-- Download product -->
-        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
index 883cdab2951fd..aaeb0cd38cd99 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
@@ -82,7 +82,9 @@
         </before>
         <after>
             <!-- Delete exported file -->
-            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
 
             <!-- Delete configurable product creation -->
             <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
@@ -100,12 +102,14 @@
         <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
 
         <!-- Fill entity attributes data -->
-        <actionGroup ref="fillFilterExport" stepKey="exportProductBySku">
+        <actionGroup ref="exportProductsFilterByAttribute" stepKey="exportProductBySku">
             <argument name="attribute" value="sku"/>
             <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
         </actionGroup>
 
         <!-- Download product -->
-        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
     </test>
 </tests>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
index 10b81c4b1278a..597ee2336b21f 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
@@ -98,7 +98,9 @@
         </before>
         <after>
             <!-- Delete exported file -->
-            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
 
             <!-- Delete configurable product creation -->
             <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
@@ -116,12 +118,14 @@
         <waitForPageLoad stepKey="waitForExportIndexPageLoad"/>
 
         <!-- Fill entity attributes data -->
-        <actionGroup ref="fillFilterExport" stepKey="exportProductBySku">
+        <actionGroup ref="exportProductsFilterByAttribute" stepKey="exportProductBySku">
             <argument name="attribute" value="sku"/>
             <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
         </actionGroup>
 
         <!-- Download product -->
-        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
     </test>
 </tests>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
index 72daebfd93bf7..b1e723e5ee1ff 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
@@ -80,7 +80,9 @@
         </before>
         <after>
             <!-- Delete exported file -->
-            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
 
             <!-- Delete simple product -->
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
@@ -104,6 +106,8 @@
         <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
 
         <!-- Download product -->
-        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
index 6553966b515a4..e3c5cd78397f6 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
@@ -37,7 +37,9 @@
         </before>
         <after>
             <!-- Delete exported file -->
-            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile"/>
+            <actionGroup ref="deleteExportedFile" stepKey="deleteExportedFile">
+                <argument name="rowIndex" value="0"/>
+            </actionGroup>
 
             <!-- Delete product creations -->
             <deleteData createDataKey="createSimpleProductWithCustomAttributeSet" stepKey="deleteSimpleProductWithCustomAttributeSet"/>
@@ -56,6 +58,8 @@
         <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
 
         <!-- Download product -->
-        <actionGroup ref="downloadProduct" stepKey="downloadCreatedProducts"/>
+        <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
+            <argument name="rowIndex" value="0"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
index 1a759867d9535..528ad23aaf2bf 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
@@ -13,9 +13,9 @@
         <element name="search" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
         <element name="chooseAttribute" type="checkbox" selector="//*[@name='export_filter[{{var}}]']/ancestor::tr//input[@type='checkbox']" parameterized="true"/>
         <element name="fillFilter" type="input" selector="//*[@name='export_filter[{{var}}]']/ancestor::tr//input[@type='text']" parameterized="true"/>
-        <element name="continueBtn" type="button" selector="//*[@id='export_filter_container']/button"/>
-        <element name="selectByIndex" type="button" selector="//tr[@data-repeat-index='{{var}}']//button" parameterized="true"/>
-        <element name="download" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Download']" parameterized="true" timeout="10"/>
-        <element name="delete" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Delete']" parameterized="true" timeout="10"/>
+        <element name="continueBtn" type="button" selector="//*[@id='export_filter_container']/button" timeout="30"/>
+        <element name="selectByIndex" type="button" selector="//tr[@data-repeat-index='{{var}}']//button" parameterized="true" timeout="30"/>
+        <element name="download" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Download']" parameterized="true" timeout="30"/>
+        <element name="delete" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Delete']" parameterized="true" timeout="30"/>
     </section>
 </sections>

From 27a01c038f098ab336e779432ecf53421d5562f2 Mon Sep 17 00:00:00 2001
From: vprohorov <prohorov.vital@gmail.com>
Date: Tue, 5 Mar 2019 01:07:53 +0300
Subject: [PATCH 0339/1055] MAGETWO-62728: My Wishlist - quantity input box
 issue

- Fixed js validation
---
 .../view/frontend/web/js/add-to-wishlist.js   | 57 +++++++++----------
 1 file changed, 27 insertions(+), 30 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 7a166b47256cb..b38c5c2cda3ad 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
@@ -63,6 +63,12 @@ define([
                 isFileUploaded = false,
                 self = this;
 
+            if (event.handleObj.selector == this.options.qtyInfo) { //eslint-disable-line eqeqeq
+                this._updateAddToWishlistButton({});
+                event.stopPropagation();
+
+                return;
+            }
             $(event.handleObj.selector).each(function (index, element) {
                 if ($(element).is('input[type=text]') ||
                     $(element).is('input[type=email]') ||
@@ -83,7 +89,9 @@ define([
                 }
             });
 
-            this.bindFormSubmit(isFileUploaded);
+            if (isFileUploaded) {
+                this.bindFormSubmit();
+            }
             this._updateAddToWishlistButton(dataToAdd);
             event.stopPropagation();
         },
@@ -181,45 +189,34 @@ define([
 
         /**
          * Bind form submit.
-         *
-         * @param {Boolean} isFileUploaded
          */
-        bindFormSubmit: function (isFileUploaded) {
+        bindFormSubmit: function () {
             var self = this;
 
             $('[data-action="add-to-wishlist"]').on('click', function (event) {
                 var element, params, form, action;
 
-                if (!$($(self.options.qtyInfo).closest('form')).valid()) {
-                    event.stopPropagation();
-                    event.preventDefault();
-
-                    return;
-                }
-
-                if (isFileUploaded) {
-
-                    element = $('input[type=file]' + self.options.customOptionsInfo);
-                    params = $(event.currentTarget).data('post');
-                    form = $(element).closest('form');
-                    action = params.action;
+                event.stopPropagation();
+                event.preventDefault();
 
-                    if (params.data.id) {
-                        $('<input>', {
-                            type: 'hidden',
-                            name: 'id',
-                            value: params.data.id
-                        }).appendTo(form);
-                    }
+                element = $('input[type=file]' + self.options.customOptionsInfo);
+                params = $(event.currentTarget).data('post');
+                form = $(element).closest('form');
+                action = params.action;
 
-                    if (params.data.uenc) {
-                        action += 'uenc/' + params.data.uenc;
-                    }
+                if (params.data.id) {
+                    $('<input>', {
+                        type: 'hidden',
+                        name: 'id',
+                        value: params.data.id
+                    }).appendTo(form);
+                }
 
-                    $(form).attr('action', action).submit();
-                    event.stopPropagation();
-                    event.preventDefault();
+                if (params.data.uenc) {
+                    action += 'uenc/' + params.data.uenc;
                 }
+
+                $(form).attr('action', action).submit();
             });
         }
     });

From 61f64700be793e58881afcaf9c4cfc35da4291c2 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 4 Mar 2019 16:25:25 -0600
Subject: [PATCH 0340/1055] GraphQL-433: Prepare Quote GraphQL scheme for 2.3.1
 release

---
 app/code/Magento/QuoteGraphQl/etc/schema.graphqls | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index a76f7d59c3f77..dc71c1c8047c5 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -7,8 +7,6 @@ type Query {
 
 type Mutation {
     createEmptyCart: String @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CreateEmptyCart") @doc(description:"Creates an empty shopping cart for a guest or logged in user")
-    applyCouponToCart(input: ApplyCouponToCartInput): ApplyCouponToCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Coupon\\ApplyCouponToCart")
-    removeCouponFromCart(input: RemoveCouponFromCartInput): RemoveCouponFromCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Coupon\\RemoveCouponFromCart")
     setShippingAddressesOnCart(input: SetShippingAddressesOnCartInput): SetShippingAddressesOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingAddressesOnCart")
     applyCouponToCart(input: ApplyCouponToCartInput): ApplyCouponToCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ApplyCouponToCart")
     removeCouponFromCart(input: RemoveCouponFromCartInput): RemoveCouponFromCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\RemoveCouponFromCart")
@@ -98,7 +96,6 @@ type ApplyCouponToCartOutput {
 }
 
 type Cart {
-    cart_id: String
     items: [CartItemInterface]
     applied_coupon: AppliedCoupon
     shipping_addresses: [CartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddresses")

From d90e8317af39a29635b200289586b2b74cbeafb1 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 4 Mar 2019 16:48:06 -0600
Subject: [PATCH 0341/1055] GraphQL-433: Prepare Quote GraphQL scheme for 2.3.1
 release

---
 .../etc/schema.graphqls                       |  2 +-
 .../Magento/QuoteGraphQl/etc/schema.graphqls  | 19 +------------------
 .../Quote/AddSimpleProductToCartTest.php      |  4 +++-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index df95632c4b606..d4780c5c0867a 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -49,7 +49,7 @@ type AddConfigurableProductsToCartOutput {
 }
 
 input ConfigurableProductCartItemInput {
-    data: CartItemDetailsInput!
+    data: CartItemInput!
     variant_sku: String!
     customizable_options:[CustomizableOptionInput!]
 }
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index dc71c1c8047c5..f0a155a86d8b9 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -78,14 +78,6 @@ type SetShippingMethodsOnCartOutput {
     cart: Cart!
 }
 
-# If no address is provided, the system get address assigned to a quote
-# If there's no address at all - the system returns all shipping methods
-input AvailableShippingMethodsOnCartInput {
-    cart_id: String!
-    customer_address_id: Int
-    address: CartAddressInput
-}
-
 input ApplyCouponToCartInput {
     cart_id: String!
     coupon_code: String!
@@ -119,7 +111,7 @@ type CartAddress {
 }
 
 type CartItemQuantity {
-    cart_item_id: String!
+    cart_item_id: Int!
     quantity: Float!
 }
 
@@ -142,11 +134,7 @@ type AvailableShippingMethod {
     carrier_title: String!
     method_code: String!
     method_title: String!
-    error_message: String
     amount: Float!
-    base_amount: Float!
-    price_excl_tax: Float!
-    price_incl_tax: Float!
 }
 
 enum AdressTypeEnum {
@@ -222,8 +210,3 @@ type CartItemSelectedOptionValuePrice {
     units: String!
     type: PriceTypeEnum!
 }
-
-input CartItemDetailsInput {
-    sku: String!
-    qty: Float!
-}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
index 4cbc614e1b8dc..bb5bced73fbb4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
@@ -75,7 +75,9 @@ public function testAddProductIfQuantityIsNotAvailable()
     }
   ) {
     cart {
-      cart_id
+      items {
+        qty
+      }
     }
   }
 }

From 917c9a5f1286777809159f370287ffd58c5b7c8e Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Fri, 1 Mar 2019 16:47:09 -0600
Subject: [PATCH 0342/1055] MAGETWO-98409: Config:set command failed for path
 bigger than 3 depth

---
 app/code/Magento/Config/Model/Config.php      | 25 ++++---
 .../Config/Test/Unit/Model/ConfigTest.php     | 74 ++++++++++++++-----
 2 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index b1074e92cc949..43f2765340a6b 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -520,24 +520,29 @@ public function setDataByPath($path, $value)
         if ($path === '') {
             throw new \UnexpectedValueException('Path must not be empty');
         }
+
         $pathParts = explode('/', $path);
         $keyDepth = count($pathParts);
-        if ($keyDepth !== 3) {
+        if ($keyDepth < 3) {
             throw new \UnexpectedValueException(
-                "Allowed depth of configuration is 3 (<section>/<group>/<field>). Your configuration depth is "
-                . $keyDepth . " for path '$path'"
+                'Minimum depth of configuration is 3. Your configuration depth is ' . $keyDepth . '.'
             );
         }
+
+        $section = array_shift($pathParts);
         $data = [
-            'section' => $pathParts[0],
-            'groups' => [
-                $pathParts[1] => [
-                    'fields' => [
-                        $pathParts[2] => ['value' => $value],
-                    ],
-                ],
+            'fields' => [
+                array_pop($pathParts) => ['value' => $value],
             ],
         ];
+        while ($pathParts) {
+            $data = [
+                'groups' => [
+                    array_pop($pathParts) => $data,
+                ],
+            ];
+        }
+        $data['section'] = $section;
         $this->addData($data);
     }
 
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index bdcb44b756bb2..610ba9e851efb 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -330,22 +330,59 @@ public function testSaveToCheckScopeDataSet()
         $this->model->save();
     }
 
-    public function testSetDataByPath()
+    /**
+     * @param string $path
+     * @param string $value
+     * @param string $section
+     * @param array $groups
+     * @dataProvider setDataByPathDataProvider
+     */
+    public function testSetDataByPath(string $path, string $value, string $section, array $groups)
     {
-        $value = 'value';
-        $path = '<section>/<group>/<field>';
         $this->model->setDataByPath($path, $value);
-        $expected = [
-            'section' => '<section>',
-            'groups' => [
-                '<group>' => [
-                    'fields' => [
-                        '<field>' => ['value' => $value],
+        $this->assertEquals($section, $this->model->getData('section'));
+        $this->assertEquals($groups, $this->model->getData('groups'));
+    }
+
+    /**
+     * @return array
+     */
+    public function setDataByPathDataProvider(): array
+    {
+        return [
+            'depth 3' => [
+                'a/b/c',
+                'value1',
+                'a',
+                [
+                    'b' => [
+                        'fields' => [
+                            'c' => ['value' => 'value1'],
+                        ],
+                    ],
+                ],
+            ],
+            'depth 5' => [
+                'a/b/c/d/e',
+                'value1',
+                'a',
+                [
+                    'b' => [
+                        'groups' => [
+                            'c' => [
+                                'groups' => [
+                                    'd' => [
+                                        'fields' => [
+                                            'e' => ['value' => 'value1'],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
                     ],
                 ],
             ],
         ];
-        $this->assertSame($expected, $this->model->getData());
     }
 
     /**
@@ -359,14 +396,13 @@ public function testSetDataByPathEmpty()
 
     /**
      * @param string $path
-     * @param string $expectedException
-     *
      * @dataProvider setDataByPathWrongDepthDataProvider
      */
-    public function testSetDataByPathWrongDepth($path, $expectedException)
+    public function testSetDataByPathWrongDepth(string $path)
     {
-        $expectedException = 'Allowed depth of configuration is 3 (<section>/<group>/<field>). ' . $expectedException;
-        $this->expectException('\UnexpectedValueException');
+        $currentDepth = count(explode('/', $path));
+        $expectedException = 'Minimum depth of configuration is 3. Your configuration depth is ' . $currentDepth . '.';
+        $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionMessage($expectedException);
         $value = 'value';
         $this->model->setDataByPath($path, $value);
@@ -375,13 +411,11 @@ public function testSetDataByPathWrongDepth($path, $expectedException)
     /**
      * @return array
      */
-    public function setDataByPathWrongDepthDataProvider()
+    public function setDataByPathWrongDepthDataProvider(): array
     {
         return [
-            'depth 2' => ['section/group', "Your configuration depth is 2 for path 'section/group'"],
-            'depth 1' => ['section', "Your configuration depth is 1 for path 'section'"],
-            'depth 4' => ['section/group/field/sub-field', "Your configuration depth is 4 for path"
-                . " 'section/group/field/sub-field'", ],
+            'depth 2' => ['section/group'],
+            'depth 1' => ['section'],
         ];
     }
 }

From 7a7ecde0a4abef36064204c6db0fdeb32981fc21 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Fri, 1 Mar 2019 16:55:21 -0600
Subject: [PATCH 0343/1055] MAGETWO-98409: Config:set command failed for path
 bigger than 3 depth

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

diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 43f2765340a6b..6bdf9af5074f6 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -525,7 +525,7 @@ public function setDataByPath($path, $value)
         $keyDepth = count($pathParts);
         if ($keyDepth < 3) {
             throw new \UnexpectedValueException(
-                'Minimum depth of configuration is 3. Your configuration depth is ' . $keyDepth . '.'
+                'Minimal depth of configuration is 3. Your configuration depth is ' . $keyDepth
             );
         }
 
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index 610ba9e851efb..66163e354cc06 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -401,7 +401,7 @@ public function testSetDataByPathEmpty()
     public function testSetDataByPathWrongDepth(string $path)
     {
         $currentDepth = count(explode('/', $path));
-        $expectedException = 'Minimum depth of configuration is 3. Your configuration depth is ' . $currentDepth . '.';
+        $expectedException = 'Minimal depth of configuration is 3. Your configuration depth is ' . $currentDepth;
         $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionMessage($expectedException);
         $value = 'value';

From 638a1492e59edca8abc0881e9f0d3ea3163a9693 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Mon, 4 Mar 2019 12:14:43 -0600
Subject: [PATCH 0344/1055] MAGETWO-98409: Config:set command failed for path
 bigger than 3 depth

---
 .../Console/Command/ConfigSetCommandTest.php  | 21 +++++++++++++++++++
 .../Magento/Config/_files/system.xml          | 20 ++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Config/_files/system.xml

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 73f1dd9e7b711..e59672f1b5e1a 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
@@ -7,6 +7,8 @@
 namespace Magento\Config\Console\Command;
 
 use Magento\Config\Model\Config\Backend\Admin\Custom;
+use Magento\Config\Model\Config\Structure\Converter;
+use Magento\Config\Model\Config\Structure\Data as StructureData;
 use Magento\Directory\Model\Currency;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -91,6 +93,8 @@ protected function setUp()
     {
         Bootstrap::getInstance()->reinitialize();
         $this->objectManager = Bootstrap::getObjectManager();
+        $this->extendSystemStructure();
+
         $this->scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
         $this->reader = $this->objectManager->get(FileReader::class);
         $this->filesystem = $this->objectManager->get(Filesystem::class);
@@ -123,6 +127,21 @@ protected function tearDown()
         $this->appConfig->reinit();
     }
 
+    /**
+     * Add test system structure to main system structure
+     *
+     * @return void
+     */
+    private function extendSystemStructure()
+    {
+        $document = new \DOMDocument();
+        $document->load(__DIR__ . '/../../_files/system.xml');
+        $converter = $this->objectManager->get(Converter::class);
+        $systemConfig = $converter->convert($document);
+        $structureData = $this->objectManager->get(StructureData::class);
+        $structureData->merge($systemConfig);
+    }
+
     /**
      * @return array
      */
@@ -191,6 +210,8 @@ public function runLockDataProvider()
             ['general/region/display_all', '1'],
             ['general/region/state_required', 'BR,FR', ScopeInterface::SCOPE_WEBSITE, 'base'],
             ['admin/security/use_form_key', '0'],
+            ['general/group/subgroup/field', 'default_value'],
+            ['general/group/subgroup/field', 'website_value', ScopeInterface::SCOPE_WEBSITE, 'base'],
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Config/_files/system.xml b/dev/tests/integration/testsuite/Magento/Config/_files/system.xml
new file mode 100644
index 0000000000000..f0063a3c0bf7f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Config/_files/system.xml
@@ -0,0 +1,20 @@
+<?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_Config:etc/system_file.xsd">
+    <system>
+        <section id="general">
+            <group id="group">
+                <group id="subgroup">
+                    <field id="field" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Label</label>
+                    </field>
+                </group>
+            </group>
+        </section>
+    </system>
+</config>

From 5d285b3f9a5e6f35faa55c51f4391ce5791f0119 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Mon, 4 Mar 2019 17:12:11 -0600
Subject: [PATCH 0345/1055] MC-10964: Wrong calculation of invoiced child items
 in "sales_order_item" table for order with configurable product after partial
 invoice

---
 .../Sales/Model/Service/InvoiceService.php    |  5 +
 .../Model/Service/InvoiceServiceTest.php      | 92 +++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php

diff --git a/app/code/Magento/Sales/Model/Service/InvoiceService.php b/app/code/Magento/Sales/Model/Service/InvoiceService.php
index ba6ae7eb14ba7..02242e92c8bf5 100644
--- a/app/code/Magento/Sales/Model/Service/InvoiceService.php
+++ b/app/code/Magento/Sales/Model/Service/InvoiceService.php
@@ -190,6 +190,11 @@ private function prepareItemsQty(Order $order, array $qtys = [])
                 if ($orderItem->getProductType() == Type::TYPE_BUNDLE && !$orderItem->isShipSeparately()) {
                     $qtys[$orderItem->getId()] = $orderItem->getQtyOrdered() - $orderItem->getQtyInvoiced();
                 } else {
+                    $parentItem = $orderItem->getParentItem();
+                    $parentItemId = $parentItem ? $parentItem->getId() : null;
+                    if ($parentItemId && isset($qtys[$parentItemId])) {
+                        $qtys[$orderItem->getId()] = $qtys[$parentItemId];
+                    }
                     continue;
                 }
             }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.php
new file mode 100644
index 0000000000000..e35c480e44c66
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/InvoiceServiceTest.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\Model\Service;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests \Magento\Sales\Model\Service\InvoiceService
+ */
+class InvoiceServiceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var InvoiceService
+     */
+    private $invoiceService;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->invoiceService = Bootstrap::getObjectManager()->create(InvoiceService::class);
+    }
+
+    /**
+     * @param int $invoiceQty
+     * @magentoDataFixture Magento/Sales/_files/order_configurable_product.php
+     * @return void
+     * @dataProvider prepareInvoiceConfigurableProductDataProvider
+     */
+    public function testPrepareInvoiceConfigurableProduct(int $invoiceQty): void
+    {
+        /** @var OrderInterface $order */
+        $order = Bootstrap::getObjectManager()->create(Order::class)->load('100000001', 'increment_id');
+        $orderItems = $order->getItems();
+        foreach ($orderItems as $orderItem) {
+            if ($orderItem->getParentItemId()) {
+                $parentItemId = $orderItem->getParentItemId();
+            }
+        }
+        $invoice = $this->invoiceService->prepareInvoice($order, [$parentItemId => $invoiceQty]);
+        $invoiceItems = $invoice->getItems();
+        foreach ($invoiceItems as $invoiceItem) {
+            $this->assertEquals($invoiceQty, $invoiceItem->getQty());
+        }
+    }
+
+    public function prepareInvoiceConfigurableProductDataProvider()
+    {
+        return [
+            'full invoice' => [2],
+            'partial invoice' => [1]
+        ];
+    }
+
+    /**
+     * @param int $invoiceQty
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @return void
+     * @dataProvider prepareInvoiceSimpleProductDataProvider
+     */
+    public function testPrepareInvoiceSimpleProduct(int $invoiceQty): void
+    {
+        /** @var OrderInterface $order */
+        $order = Bootstrap::getObjectManager()->create(Order::class)->load('100000001', 'increment_id');
+        $orderItems = $order->getItems();
+        $invoiceQtys = [];
+        foreach ($orderItems as $orderItem) {
+            $invoiceQtys[$orderItem->getItemId()] = $invoiceQty;
+        }
+        $invoice = $this->invoiceService->prepareInvoice($order, $invoiceQtys);
+        $invoiceItems = $invoice->getItems();
+        foreach ($invoiceItems as $invoiceItem) {
+            $this->assertEquals($invoiceQty, $invoiceItem->getQty());
+        }
+    }
+
+    public function prepareInvoiceSimpleProductDataProvider()
+    {
+        return [
+            'full invoice' => [2],
+            'partial invoice' => [1]
+        ];
+    }
+}

From 3e4b38cd782244d50ea3293ccc38078d9567e16e Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 4 Mar 2019 17:56:26 -0600
Subject: [PATCH 0346/1055] GraphQL-433: Prepare Quote GraphQL scheme for 2.3.1
 release

---
 .../etc/schema.graphqls                       |  30 ---
 .../Magento/QuoteGraphQl/etc/schema.graphqls  | 208 +-----------------
 .../Quote/AddSimpleProductToCartTest.php      |   1 +
 .../Magento/GraphQl/Quote/CouponTest.php      |   1 +
 .../Magento/GraphQl/Quote/GetCartTest.php     |   1 +
 .../Quote/SetBillingAddressOnCartTest.php     |   1 +
 .../Quote/SetShippingAddressOnCartTest.php    |   1 +
 7 files changed, 6 insertions(+), 237 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index d4780c5c0867a..267a94a1d434e 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -1,8 +1,5 @@
 # Copyright © Magento, Inc. All rights reserved.
 # See COPYING.txt for license details.
-type Mutation {
-    addConfigurableProductsToCart(input: AddConfigurableProductsToCartInput): AddConfigurableProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
-}
 
 type ConfigurableProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "ConfigurableProduct defines basic features of a configurable product and its simple product variants") {
     variants: [ConfigurableVariant] @doc(description: "An array of variants of products") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\ConfigurableVariant")
@@ -38,30 +35,3 @@ type ConfigurableProductOptionsValues @doc(description: "ConfigurableProductOpti
     store_label: String @doc(description: "The label of the product on the current store")
     use_default_value: Boolean @doc(description: "Indicates whether to use the default_label")
 }
-
-input AddConfigurableProductsToCartInput {
-    cart_id: String!
-    cartItems: [ConfigurableProductCartItemInput!]!
-}
-
-type AddConfigurableProductsToCartOutput {
-    cart: Cart!
-}
-
-input ConfigurableProductCartItemInput {
-    data: CartItemInput!
-    variant_sku: String!
-    customizable_options:[CustomizableOptionInput!]
-}
-
-type ConfigurableCartItem implements CartItemInterface {
-    customizable_options: [SelectedCustomizableOption]!
-    configurable_options: [SelectedConfigurableOption!]!
-}
-
-type SelectedConfigurableOption {
-    id: Int!
-    option_label: String!
-    value_id: Int!
-    value_label: String!
-}
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index f0a155a86d8b9..b314b7118c9d4 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -1,212 +1,6 @@
 # Copyright © Magento, Inc. All rights reserved.
 # See COPYING.txt for license details.
 
-type Query {
-    cart(cart_id: String!): Cart @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Cart") @doc(description:"Returns information about shopping cart")
-}
-
 type Mutation {
-    createEmptyCart: String @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CreateEmptyCart") @doc(description:"Creates an empty shopping cart for a guest or logged in user")
-    setShippingAddressesOnCart(input: SetShippingAddressesOnCartInput): SetShippingAddressesOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingAddressesOnCart")
-    applyCouponToCart(input: ApplyCouponToCartInput): ApplyCouponToCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ApplyCouponToCart")
-    removeCouponFromCart(input: RemoveCouponFromCartInput): RemoveCouponFromCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\RemoveCouponFromCart")
-    setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetBillingAddressOnCart")
-    setShippingMethodsOnCart(input: SetShippingMethodsOnCartInput): SetShippingMethodsOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingMethodsOnCart")
-    addSimpleProductsToCart(input: AddSimpleProductsToCartInput): AddSimpleProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
-}
-
-input SetShippingAddressesOnCartInput {
-    cart_id: String!
-    shipping_addresses: [ShippingAddressInput!]!
-}
-
-input ShippingAddressInput {
-    customer_address_id: Int # Can be provided in one-page checkout and is required for multi-shipping checkout
-    address: CartAddressInput
-    cart_items: [CartItemQuantityInput!]
-}
-
-input CartItemQuantityInput {
-    cart_item_id: Int!
-    quantity: Float!
-}
-
-input SetBillingAddressOnCartInput {
-    cart_id: String!
-    billing_address: BillingAddressInput!
-}
-
-input BillingAddressInput {
-    customer_address_id: Int
-    address: CartAddressInput
-    use_for_shipping: Boolean
-}
-
-input CartAddressInput {
-    firstname: String!
-    lastname: String!
-    company: String
-    street: [String!]!
-    city: String!
-    region: String
-    postcode: String
-    country_code: String!
-    telephone: String!
-    save_in_address_book: Boolean!
-}
-
-input SetShippingMethodsOnCartInput {
-    cart_id: String!
-    shipping_methods: [ShippingMethodForAddressInput!]!
-}
-
-input ShippingMethodForAddressInput {
-    cart_address_id: Int!
-    carrier_code: String!
-    method_code: String!
-}
-
-type SetBillingAddressOnCartOutput {
-    cart: Cart!
-}
-
-type SetShippingAddressesOnCartOutput {
-    cart: Cart!
-}
-
-type SetShippingMethodsOnCartOutput {
-    cart: Cart!
-}
-
-input ApplyCouponToCartInput {
-    cart_id: String!
-    coupon_code: String!
-}
-
-type ApplyCouponToCartOutput {
-    cart: Cart!
-}
-
-type Cart {
-    items: [CartItemInterface]
-    applied_coupon: AppliedCoupon
-    shipping_addresses: [CartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddresses")
-    billing_address: CartAddress! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
-}
-
-type CartAddress {
-    firstname: String
-    lastname: String
-    company: String
-    street: [String]
-    city: String
-    region: CartAddressRegion
-    postcode: String
-    country: CartAddressCountry
-    telephone: String
-    address_type: AdressTypeEnum
-    items_weight: Float
-    customer_notes: String
-    cart_items: [CartItemQuantity]
-}
-
-type CartItemQuantity {
-    cart_item_id: Int!
-    quantity: Float!
-}
-
-type CartAddressRegion {
-    code: String
-    label: String
-}
-
-type CartAddressCountry {
-    code: String
-    label: String
-}
-
-type SelectedShippingMethod {
-    amount: Float!
-}
-
-type AvailableShippingMethod {
-    carrier_code: String!
-    carrier_title: String!
-    method_code: String!
-    method_title: String!
-    amount: Float!
-}
-
-enum AdressTypeEnum {
-    SHIPPING
-    BILLING
-}
-
-type AppliedCoupon {
-    code: String!
-}
-
-input RemoveCouponFromCartInput {
-    cart_id: String!
-}
-
-type RemoveCouponFromCartOutput {
-    cart: Cart
-}
-
-input AddSimpleProductsToCartInput {
-    cart_id: String!
-    cartItems: [SimpleProductCartItemInput!]!
-}
-
-input SimpleProductCartItemInput {
-    data: CartItemInput!
-    customizable_options:[CustomizableOptionInput!]
-}
-
-input CustomizableOptionInput {
-    id: Int!
-    value: String!
-}
-
-type AddSimpleProductsToCartOutput {
-    cart: Cart!
-}
-
-type SimpleCartItem implements CartItemInterface @doc(description: "Simple Cart Item") {
-    customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
-}
-
-input CartItemInput {
-    sku: String!
-    qty: Float!
-}
-
-interface CartItemInterface @typeResolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CartItemTypeResolver") {
-    id: String!
-    qty: Float!
-    product: ProductInterface!
-}
-
-type SelectedCustomizableOption {
-    id: Int!
-    label: String!
-    type: String!
-    is_required: Int!
-    values: [SelectedCustomizableOptionValue!]!
-    sort_order: Int!
-}
-
-type SelectedCustomizableOptionValue {
-    id: Int!
-    label: String!
-    value: String!
-    price: CartItemSelectedOptionValuePrice!
-    sort_order: Int!
-}
-
-type CartItemSelectedOptionValuePrice {
-    value: Float!
-    units: String!
-    type: PriceTypeEnum!
+    createEmptyCart: String @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CreateEmptyCart") @doc(description:"Creates empty shopping cart for guest or logged in user")
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
index bb5bced73fbb4..be87fc7d552e1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
@@ -35,6 +35,7 @@ class AddSimpleProductToCartTest extends GraphQlAbstract
      */
     protected function setUp()
     {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/434');
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quote = $objectManager->create(Quote::class);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
index 1f8ad06a9f8ed..eeff35ea1bcda 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
@@ -35,6 +35,7 @@ class CouponTest extends GraphQlAbstract
 
     protected function setUp()
     {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/434');
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->create(QuoteResource::class);
         $this->quote = $objectManager->create(Quote::class);
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 44cd2ef526bd5..369504524d2fc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
@@ -44,6 +44,7 @@ class GetCartTest extends GraphQlAbstract
      */
     protected function setUp()
     {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/434');
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->create(QuoteResource::class);
         $this->quote = $objectManager->create(Quote::class);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetBillingAddressOnCartTest.php
index bfe57109d107d..763220973ae54 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetBillingAddressOnCartTest.php
@@ -44,6 +44,7 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
 
     protected function setUp()
     {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/434');
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
index c3685c88ae487..044edb91bc8e5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
@@ -44,6 +44,7 @@ class SetShippingAddressOnCartTest extends GraphQlAbstract
 
     protected function setUp()
     {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/434');
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);

From 473f9a5438ba08dc850d624e08f4f28f896af790 Mon Sep 17 00:00:00 2001
From: Denis Kopylov <dkopylov@magenius.team>
Date: Tue, 5 Mar 2019 09:42:36 +0300
Subject: [PATCH 0347/1055] [FIX] Change deprecation annotation
 (https://github.com/magento/magento2/issues/21419)

---
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php    | 2 +-
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php    | 2 +-
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php       | 2 +-
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Info.php       | 2 +-
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
index 0cf6b6a9867d1..41ce705c77607 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -13,7 +13,7 @@
 
 /**
  * @api
- * @deprecated Empty class
+ * @deprecated
  * @since 100.0.2
  */
 class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
index 5f40e96bfa6ff..f63d083bf56b6 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -13,7 +13,7 @@
 
 /**
  * @api
- * @deprecated Empty class
+ * @deprecated
  * @since 100.0.2
  */
 class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
index c4e94ec503175..1fc73c05f6f86 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -13,7 +13,7 @@
 
 /**
  * @api
- * @deprecated Empty class
+ * @deprecated
  * @since 100.0.2
  */
 class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
index f83c122910ebd..e6067392bae48 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -13,7 +13,7 @@
 
 /**
  * @api
- * @deprecated Empty class
+ * @deprecated
  * @since 100.0.2
  */
 class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
index 3e6f225842e01..724ffd90f87db 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -13,7 +13,7 @@
 
 /**
  * @api
- * @deprecated Empty class
+ * @deprecated
  * @since 100.0.2
  */
 class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column

From 17561929f9089b76afaff886c86c71693cf5918c Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Tue, 5 Mar 2019 10:47:09 +0300
Subject: [PATCH 0348/1055] MAGETWO-58226: Calendar Custom Options are
 displayed broken on Storefront if JS validation is performed

- Fix functional test
---
 .../Magento/Catalog/Test/Block/Product/View/CustomOptions.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index dcc8cce970098..99ff9b73b92eb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -128,7 +128,8 @@ class CustomOptions extends Form
      *
      * @var string
      */
-    private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "required field")]';
+    private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "required field")' .
+    'and not(contains(@style,\'display\'))]';
 
     /**
      * Get product options

From c105a2fec056ebf9d7aef32310f0a82218b5230c Mon Sep 17 00:00:00 2001
From: mageprince <mail.mageprince@gmail.com>
Date: Tue, 5 Mar 2019 14:40:34 +0530
Subject: [PATCH 0349/1055] Fix admin search filter page break

---
 .../module/data-grid/data-grid-header/_data-grid-filters.less    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
index 6e03e1d0cebaa..ef4481bdd520b 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
@@ -354,6 +354,7 @@
 
 .admin__current-filters-list-wrap {
     width: 100%;
+    word-break: break-all;
 }
 
 .admin__current-filters-list {

From 318425fafd4d92dbabcf89d332dedf9f27978f63 Mon Sep 17 00:00:00 2001
From: Cristiano Casciotti <teknoman84@gmail.com>
Date: Tue, 5 Mar 2019 12:02:18 +0100
Subject: [PATCH 0350/1055] Fix for issue #21510

---
 app/code/Magento/Indexer/Model/Indexer.php             |  2 +-
 .../Magento/Indexer/Test/Unit/Model/IndexerTest.php    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
index 87a7cce58e1a5..8f3e6b475b466 100644
--- a/app/code/Magento/Indexer/Model/Indexer.php
+++ b/app/code/Magento/Indexer/Model/Indexer.php
@@ -361,7 +361,7 @@ public function getLatestUpdated()
                 return $this->getView()->getUpdated();
             }
         }
-        return $this->getState()->getUpdated();
+        return $this->getState()->getUpdated() ?: '';
     }
 
     /**
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
index 6b7cc12218990..ae0d721a549bd 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
@@ -164,7 +164,12 @@ public function testGetLatestUpdated($getViewIsEnabled, $getViewGetUpdated, $get
                 }
             }
         } else {
-            $this->assertEquals($getStateGetUpdated, $this->model->getLatestUpdated());
+            $actualGetLatestUpdated = $this->model->getLatestUpdated();
+            $this->assertEquals($getStateGetUpdated, $actualGetLatestUpdated);
+
+            if ($getStateGetUpdated === null) {
+                $this->assertNotNull($actualGetLatestUpdated);
+            }
         }
     }
 
@@ -182,7 +187,8 @@ public function getLatestUpdatedDataProvider()
             [true, '', '06-Jan-1944'],
             [true, '06-Jan-1944', ''],
             [true, '', ''],
-            [true, '06-Jan-1944', '05-Jan-1944']
+            [true, '06-Jan-1944', '05-Jan-1944'],
+            [false, null, null],
         ];
     }
 

From 486e21c19a6678d3a1b6b0e259408fb1d205bceb Mon Sep 17 00:00:00 2001
From: Cristiano Casciotti <teknoman84@gmail.com>
Date: Tue, 5 Mar 2019 14:27:58 +0100
Subject: [PATCH 0351/1055] Changed variable name for codacy quality review

---
 app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
index ae0d721a549bd..ca2da9585f934 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
@@ -164,11 +164,11 @@ public function testGetLatestUpdated($getViewIsEnabled, $getViewGetUpdated, $get
                 }
             }
         } else {
-            $actualGetLatestUpdated = $this->model->getLatestUpdated();
-            $this->assertEquals($getStateGetUpdated, $actualGetLatestUpdated);
+            $getLatestUpdated = $this->model->getLatestUpdated();
+            $this->assertEquals($getStateGetUpdated, $getLatestUpdated);
 
             if ($getStateGetUpdated === null) {
-                $this->assertNotNull($actualGetLatestUpdated);
+                $this->assertNotNull($getLatestUpdated);
             }
         }
     }

From f4d4d9b7fbe6ab7b0b4721d476b46239d44a2b4d Mon Sep 17 00:00:00 2001
From: Nainesh <nainesh@twojay.in>
Date: Tue, 5 Mar 2019 19:25:10 +0530
Subject: [PATCH 0352/1055] fixes-for-#20414::Recent orders grid not aligned
 from left in mobile as all content aligned from left

---
 .../luma/Magento_Sales/web/css/source/_module.less    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
index 1e4a92fa0701f..f49c588f16f9f 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
@@ -392,6 +392,17 @@
         &.orders-recent {
             &:extend(.abs-account-table-margin-mobile all);
             &:extend(.abs-no-border-top all);
+            .table-order-items {
+                &.table {
+                    tbody {
+                        > tr {
+                            > td.col {
+                                padding-left: 0;
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 

From 6c820d361171287a89a1f89c0202867c02df2044 Mon Sep 17 00:00:00 2001
From: Nazarn96 <nazarn96@gmail.com>
Date: Fri, 1 Mar 2019 15:55:16 +0200
Subject: [PATCH 0353/1055] Remove Environment emulation to better performance

---
 .../Controller/Adminhtml/Sitemap/Generate.php | 12 +++---------
 app/code/Magento/Sitemap/Model/Observer.php   | 19 +------------------
 .../Model/ResourceModel/Catalog/Product.php   |  1 +
 .../Sitemap/Test/Unit/Model/ObserverTest.php  | 13 +------------
 4 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
index 9592ab6f57c55..c8edefa00cc86 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
@@ -10,6 +10,9 @@
 use Magento\Store\Model\App\Emulation;
 use Magento\Framework\App\ObjectManager;
 
+/**
+ * Generate sitemap file
+ */
 class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
     /** @var \Magento\Store\Model\App\Emulation $appEmulation */
@@ -44,14 +47,7 @@ public function execute()
         // if sitemap record exists
         if ($sitemap->getId()) {
             try {
-                //We need to emulate to get the correct frontend URL for the product images
-                $this->appEmulation->startEnvironmentEmulation(
-                    $sitemap->getStoreId(),
-                    \Magento\Framework\App\Area::AREA_FRONTEND,
-                    true
-                );
                 $sitemap->generateXml();
-
                 $this->messageManager->addSuccessMessage(
                     __('The sitemap "%1" has been generated.', $sitemap->getSitemapFilename())
                 );
@@ -59,8 +55,6 @@ public function execute()
                 $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addExceptionMessage($e, __('We can\'t generate the sitemap right now.'));
-            } finally {
-                $this->appEmulation->stopEnvironmentEmulation();
             }
         } else {
             $this->messageManager->addErrorMessage(__('We can\'t find a sitemap to generate.'));
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index bd7a84f601b77..ce74d738c4bc3 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sitemap\Model;
 
-use Magento\Store\Model\App\Emulation;
 use Magento\Sitemap\Model\EmailNotification as SitemapEmail;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
@@ -57,11 +56,6 @@ class Observer
      */
     private $collectionFactory;
 
-    /**
-     * @var Emulation
-     */
-    private $appEmulation;
-
     /**
      * @var $emailNotification
      */
@@ -72,17 +66,14 @@ class Observer
      * @param ScopeConfigInterface $scopeConfig
      * @param CollectionFactory $collectionFactory
      * @param EmailNotification $emailNotification
-     * @param Emulation $appEmulation
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         CollectionFactory $collectionFactory,
-        SitemapEmail $emailNotification,
-        Emulation $appEmulation
+        SitemapEmail $emailNotification
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->collectionFactory = $collectionFactory;
-        $this->appEmulation = $appEmulation;
         $this->emailNotification = $emailNotification;
     }
 
@@ -114,17 +105,9 @@ public function scheduledGenerateSitemaps()
         foreach ($collection as $sitemap) {
             /* @var $sitemap \Magento\Sitemap\Model\Sitemap */
             try {
-                $this->appEmulation->startEnvironmentEmulation(
-                    $sitemap->getStoreId(),
-                    \Magento\Framework\App\Area::AREA_FRONTEND,
-                    true
-                );
-
                 $sitemap->generateXml();
             } catch (\Exception $e) {
                 $errors[] = $e->getMessage();
-            } finally {
-                $this->appEmulation->stopEnvironmentEmulation();
             }
         }
         if ($errors && $recipient) {
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
index 82024b3b015e5..4d678f5c1cb94 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -389,6 +389,7 @@ protected function _prepareProduct(array $productRow, $storeId)
      */
     protected function _loadProductImages($product, $storeId)
     {
+        $this->_storeManager->setCurrentStore($storeId);
         /** @var $helper \Magento\Sitemap\Helper\Data */
         $helper = $this->_sitemapData;
         $imageIncludePolicy = $helper->getProductImageIncludePolicy($storeId);
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
index 5fae54ff3c5d0..09f5418bbd762 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
@@ -118,7 +118,7 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
             ->method('getStoreId')
             ->willReturn($storeId);
 
-        $this->sitemapMock->expects($this->at(1))
+        $this->sitemapMock->expects($this->once())
             ->method('generateXml')
             ->willThrowException(new \Exception($exception));
 
@@ -130,17 +130,6 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
             )
             ->willReturn('error-recipient@example.com');
 
-        $this->appEmulationMock->expects($this->at(0))
-            ->method('startEnvironmentEmulation')
-            ->with(
-                $storeId,
-                Area::AREA_FRONTEND,
-                true
-            );
-
-        $this->appEmulationMock->expects($this->at(1))
-            ->method('stopEnvironmentEmulation');
-
         $this->observer->scheduledGenerateSitemaps();
     }
 }

From f893a925bbf5a92967a79509beefa4314b897f23 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 5 Mar 2019 17:32:16 +0200
Subject: [PATCH 0354/1055] ENGCOM-4302: Static test fix.

---
 .../Reports/Model/ResourceModel/Order/Collection.php      | 8 +++++++-
 1 file changed, 7 insertions(+), 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 19549f7181aa9..33dfdcffc9a48 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -830,7 +830,13 @@ protected function getTotalsExpression(
             ? '(main_table.base_subtotal - %2$s - %1$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s))'
             : '((main_table.base_subtotal - %1$s - %2$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s)) '
                 . ' * main_table.base_to_global_rate)';
-        return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountRefunded, $baseDiscountCanceled);
+        return sprintf(
+            $template,
+            $baseSubtotalRefunded,
+            $baseSubtotalCanceled,
+            $baseDiscountRefunded,
+            $baseDiscountCanceled
+        );
     }
 
     /**

From 4de27d15b08789f88aafa0f69dab42a940223386 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Tue, 5 Mar 2019 10:12:40 -0600
Subject: [PATCH 0355/1055] MC-4434: Convert DeleteSearchTermEntityTest to MFTF

Addressing review comments
---
 .../ActionGroup/AdminCatalogSearchTermActionGroup.xml | 11 ++++-------
 .../StorefrontCatalogSearchTermActionGroup.xml        |  2 +-
 .../Section/AdminCatalogSearchTermIndexSection.xml    |  4 ++--
 .../Mftf/Section/AdminCatalogSearchTermNewSection.xml |  4 ++--
 .../Test/Mftf/Test/AdminDeleteSearchTermTest.xml      | 10 +++++-----
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
index a9444a4e5baa6..33ffa4fe1b296 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminCatalogSearchTermActionGroup.xml
@@ -8,7 +8,6 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!--Add new search term and AssertSearchTermSaveSuccessMessage-->
     <actionGroup name="AssertSearchTermSaveSuccessMessage">
         <arguments>
             <argument name="searchQuery" type="string"/>
@@ -21,13 +20,12 @@
         <click selector="{{AdminCatalogSearchTermIndexSection.addNewSearchTermButton}}" stepKey="clickAddNewSearchTermButton"/>
         <waitForPageLoad stepKey="waitForAdminCatalogSearchTermNewPageLoad"/>
         <fillField selector="{{AdminCatalogSearchTermNewSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQueryTextBox"/>
-        <click selector="{{AdminCatalogSearchTermNewSection.store('storeValue')}}" stepKey="selectMainWebsiteStore"/>
+        <selectOption selector="{{AdminCatalogSearchTermNewSection.store}}" userInput="{{storeValue}}" stepKey="selectStoreValue"/>
         <fillField selector="{{AdminCatalogSearchTermNewSection.redirectUrl}}" userInput="{{redirectUrl}}" stepKey="fillRedirectUrl"/>
-        <click selector="{{AdminCatalogSearchTermNewSection.displayInSuggestedTerm('displayInSuggestedTerm')}}" stepKey="selectDisplayInSuggestedTerm"/>
+        <selectOption selector="{{AdminCatalogSearchTermNewSection.displayInSuggestedTerm}}" userInput="{{displayInSuggestedTerm}}" stepKey="selectDisplayInSuggestedTerm"/>
         <click selector="{{AdminCatalogSearchTermNewSection.saveSearchButton}}" stepKey="clickSaveSearchButton"/>
         <see selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" userInput="You saved the search term." stepKey="seeSaveSuccessMessage"/>
     </actionGroup>
-    <!--Search and delete search term and AssertSearchTermSuccessDeleteMessage-->
     <actionGroup name="AssertSearchTermSuccessDeleteMessage">
         <arguments>
             <argument name="searchQuery" type="string"/>
@@ -39,13 +37,12 @@
         <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
         <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
         <waitForPageLoad stepKey="waitForSearchResultLoad"/>
-        <checkOption selector="{{AdminCatalogSearchTermIndexSection.checkBox}}" stepKey="checkCheckBox"/>
-        <selectOption selector="{{AdminCatalogSearchTermIndexSection.delete}}" userInput="delete" stepKey="selectDeleteOption"/>
+        <click selector="{{AdminCatalogSearchTermIndexSection.nthRow('1')}}" stepKey="checkFirstRow"/>
+        <selectOption selector="{{AdminCatalogSearchTermIndexSection.massActions}}" userInput="delete" stepKey="selectDeleteOption"/>
         <click selector="{{AdminCatalogSearchTermIndexSection.submit}}" stepKey="clickSubmitButton"/>
         <click selector="{{AdminCatalogSearchTermIndexSection.okButton}}" stepKey="clickOkButton"/>
         <see selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" userInput="Total of 1 record(s) were deleted." stepKey="seeSuccessMessage"/>
     </actionGroup>
-    <!--Verify deleted search term in grid and AssertSearchTermNotInGridMessage-->
     <actionGroup name="AssertSearchTermNotInGrid">
         <arguments>
             <argument name="searchQuery" type="string"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
index 5714cb4eb9f9c..a825e06f490a5 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
@@ -16,7 +16,7 @@
         </arguments>
         <amOnPage url="{{StorefrontProductPage.url('url_key')}}" stepKey="goToMagentoStorefrontPage"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{SimpleTerm.search_query}}" stepKey="fillSearchQuery"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
         <waitForPageLoad stepKey="waitForSearchTextBox"/>
         <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
         <waitForPageLoad stepKey="waitForSearch"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
index 812c302f9c00a..5491c27228387 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
@@ -12,10 +12,10 @@
         <element name="addNewSearchTermButton" type="button" selector="//div[@class='page-actions-buttons']/button[@id='add']" timeout="30"/>
         <element name="resetFilterButton" type="button" selector="//button[@class='action-default scalable action-reset action-tertiary']" timeout="30"/>
         <element name="searchButton" type="button" selector="//button[@class='action-default scalable action-secondary']" timeout="30"/>
-        <element name="delete" type="text" selector="//div[@class='admin__grid-massaction-form']//select[@id='search_term_grid_massaction-select']"/>
+        <element name="massActions" type="text" selector="//div[@class='admin__grid-massaction-form']//select[@id='search_term_grid_massaction-select']"/>
         <element name="submit" type="button" selector="//button[@class='action-default scalable']/span" timeout="30"/>
         <element name="searchQuery" type="text" selector="//tr[@class='data-grid-filters']//td/input[@name='search_query']"/>
-        <element name="checkBox" type="checkbox" selector="//label[@class='data-grid-checkbox-cell-inner']/input[@name='search']"/>
+        <element name="nthRow" type="checkbox" selector="//tbody/tr['{{rowNum}}']//input[@name='search']" parameterized="true"/>
         <element name="okButton" type="button" selector="//button[@class='action-primary action-accept']/span" timeout="30"/>
         <element name="emptyRecords" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
     </section>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml
index 7922e994c4965..a7d577a7508c0 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermNewSection.xml
@@ -10,9 +10,9 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCatalogSearchTermNewSection">
         <element name="searchQuery" type="text" selector="//div[@class='admin__field-control control']/input[@id='query_text']"/>
-        <element name="store" type="text" selector="//select[@id='store_id']//optgroup/option[contains(.,'{{store}}')]" parameterized="true"/>
+        <element name="store" type="text" selector="//select[@id='store_id']"/>
         <element name="redirectUrl" type="text" selector="//div[@class='admin__field-control control']/input[@id='redirect']"/>
-        <element name="displayInSuggestedTerm" type="select" selector="//select[@name='display_in_terms']/option[contains(.,'{{text}}')]" parameterized="true"/>
+        <element name="displayInSuggestedTerm" type="select" selector="//select[@name='display_in_terms']"/>
         <element name="saveSearchButton" type="button" selector="//button[@id='save']/span[@class='ui-button-text']" timeout="30"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml
index dc9d99fabefc6..c72ed424ef307 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminDeleteSearchTermTest.xml
@@ -10,8 +10,8 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminDeleteSearchTermTest">
         <annotations>
-            <stories value="DeleteSearchTerm"/>
-            <title value="DeleteSearchTermEntityTestVariation1"/>
+            <stories value="Search terms"/>
+            <title value="Delete Search Term and Verify Storefront"/>
             <description value="Test log in to SearchTerm and DeleteSearchTerm"/>
             <testCaseId value="MC-13988"/>
             <severity value="CRITICAL"/>
@@ -35,9 +35,9 @@
         <!--Add new search term-->
         <actionGroup ref="AssertSearchTermSaveSuccessMessage" stepKey="addNewSearchTerm">
             <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
-            <argument name="storeValue" value="Default Store View"/>
+            <argument name="storeValue" value="{{SimpleTerm.store_id}}"/>
             <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
-            <argument name="displayInSuggestedTerm" value="No"/>
+            <argument name="displayInSuggestedTerm" value="{{SimpleTerm.display_in_terms}}"/>
         </actionGroup>
 
         <!--Search and delete search term and AssertSearchTermSuccessDeleteMessage-->
@@ -50,7 +50,7 @@
             <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
         </actionGroup>
 
-        <!--Verify AssertSearchTermNotOnFrontend-->
+        <!--Go to storefront and Verify AssertSearchTermNotOnFrontend-->
         <actionGroup ref="AssertSearchTermNotOnFrontend" stepKey="verifySearchTermNotOnFrontend">
             <argument name="searchQuery" value="{{SimpleTerm.search_query}}"/>
             <argument name="url_key" value="$$simpleProduct.custom_attributes[url_key]$$"/>

From a8a8e22c67a28900d826088ee500f4e1d965f0e7 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Tue, 5 Mar 2019 10:50:09 -0600
Subject: [PATCH 0356/1055] MC-4454: Convert
 CreateDuplicateUrlCategoryEntityTest to MFTF

---
 .../Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml     | 7 ++++---
 .../Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml    | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
index c658e8b359f81..e31f7193739cb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
@@ -277,13 +277,14 @@
     </actionGroup>
     <actionGroup name="adminFillAndSaveCategoryForm">
         <arguments>
-            <argument name="category" type="string"/>
+            <argument name="categoryName" type="string"/>
+            <argument name="categoryUrlKey" type="string"/>
         </arguments>
-        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="$$category.name$$" stepKey="enterCategoryName"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryName}}" stepKey="enterCategoryName"/>
         <scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSearchEngineOptimization"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSEO"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="$$category.custom_attributes[url_key]$$" stepKey="enterURLKey"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{categoryUrlKey}}" stepKey="enterURLKey"/>
         <scrollToTopOfPage stepKey="scrollToTheTopOfPage"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
index 4865e3a89b67a..79f901952dd75 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateCategoryTest.xml
@@ -10,7 +10,7 @@
     <test name="AdminCreateDuplicateCategoryTest">
         <annotations>
             <stories value="Create category"/>
-            <title value="CreateDuplicateUrlCategoryEntityTestVariation1_Subcategory_RequiredFields"/>
+            <title value="Create Duplicate Category With Already Existed UrlKey"/>
             <description value="Login as admin and create duplicate category"/>
             <testCaseId value="MC-14702"/>
             <severity value="CRITICAL"/>
@@ -31,7 +31,8 @@
 
         <!-- Fill the Category form with same name and urlKey as initially created category(SimpleSubCategory) -->
         <actionGroup ref="adminFillAndSaveCategoryForm" stepKey="fillCategoryForm">
-            <argument name="category" value="category"/>
+             <argument name="categoryName" value="$$category.name$$"/>
+             <argument name="categoryUrlKey" value="$$category.custom_attributes[url_key]$$"/>
         </actionGroup>
 
         <!-- Assert error message -->

From eaab9229eea7cd11215261c03b24e39f3a5bffe0 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Tue, 5 Mar 2019 11:01:44 -0600
Subject: [PATCH 0357/1055] MC-4874: Convert CreateWebsiteEntityTest to MFTF

Addressing review comments
---
 .../Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml     | 5 ++---
 .../Store/Test/Mftf/Section/AdminStoresGridSection.xml     | 2 +-
 .../Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml        | 7 +++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
index dd8bd7b6789a2..ca614ec24138c 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
@@ -47,16 +47,15 @@
         <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillWebsiteField"/>
         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
-        <seeElement selector="{{AdminStoresGridSection.nthRow(websiteName)}}" stepKey="seeAssertWebsiteInGrid"/>
+        <seeElement selector="{{AdminStoresGridSection.websiteName(websiteName)}}" stepKey="seeAssertWebsiteInGrid"/>
     </actionGroup>
 
     <actionGroup name="AssertWebsiteForm">
         <arguments>
             <argument name="websiteName" type="string"/>
             <argument name="websiteCode" type="string"/>
-            <argument name="websiteId"/>
         </arguments>
-        <click selector="{{AdminStoresGridSection.nthRow(websiteName)}}" stepKey="clickWebsiteFirstRowInGrid"/>
+        <click selector="{{AdminStoresGridSection.websiteName(websiteName)}}" stepKey="clickWebsiteFirstRowInGrid"/>
         <waitForPageLoad stepKey="waitTillWebsiteFormPageIsOpened"/>
         <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabWebsiteIdFromCurrentUrl"/>
         <seeInCurrentUrl url="/system_store/editWebsite/website_id/{$grabWebsiteIdFromCurrentUrl}" stepKey="seeWebsiteId"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index c3b3fc8fa342d..b07587b70302e 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -21,6 +21,6 @@
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
         <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
-        <element name="nthRow" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
+        <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
      </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
index 44b774eed372f..9d845cb237852 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
@@ -10,7 +10,7 @@
         <test name="AdminCreateWebsiteTest">
             <annotations>
                 <stories value="Create Website"/>
-                <title value="CreateWebsiteEntityTestVariation1"/>
+                <title value="Create Website and Verify Store Form"/>
                 <description value="Test log in to Stores and Create Website Test"/>
                 <testCaseId value="MC-14302"/>
                 <severity value="CRITICAL"/>
@@ -34,16 +34,15 @@
                 <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
 
-            <!--Search created website in grid and AssertWebsiteInGrid-->
+            <!--Search created website in grid and verify AssertWebsiteInGrid-->
             <actionGroup ref="AssertWebsiteInGrid" stepKey="seeWebsiteInGrid">
                 <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
 
-            <!--AssertWebsiteForm and AssertWebsiteOnStoreForm-->
+            <!--Verify website name and websitecode on website form (AssertWebsiteForm and AssertWebsiteOnStoreForm)-->
             <actionGroup ref="AssertWebsiteForm" stepKey="seeWebsiteForm">
                 <argument name="websiteName" value="{{customWebsite.name}}"/>
                 <argument name="websiteCode" value="{{customWebsite.code}}"/>
-                <argument name="websiteId" value="admin/system_store/editWebsite/website_id/{$grabWebsiteIdFromCurrentUrl}"/>
             </actionGroup>
         </test>
 </tests>
\ No newline at end of file

From c082b36a81a4c035cdf6d94f8ae156514df54b56 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 5 Mar 2019 11:07:01 -0600
Subject: [PATCH 0358/1055] MC-15085: Cannot install Magento without
 ConfigurableProduct module

---
 .../PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
index c5871ddc3a373..a3c9e7b39217d 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
@@ -9,7 +9,7 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="NewProductsListWidgetSimpleProductTest">
-        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
     </test>
     <test name="NewProductsListWidgetConfigurableProductTest">
         <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
@@ -18,7 +18,7 @@
         <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
     </test>
     <test name="NewProductsListWidgetVirtualProductTest">
-        <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
+        <actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
     </test>
     <test name="NewProductsListWidgetBundleProductTest">
         <actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>

From 03bc6bb7e4459f0181aa63af9b6dd332db2cd457 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Tue, 5 Mar 2019 11:25:11 -0600
Subject: [PATCH 0359/1055] ENGCOM-4389 Elasticsearch6 implementation

---
 app/code/Magento/Elasticsearch/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index a821506f5ef6e..c6ac38c1e4005 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "~2.0|~5.1"
+        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
     },
     "suggest": {
         "magento/module-config": "*"

From 59fa0e9ae1b32b00441ec585b9b0b5d98324c586 Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Tue, 5 Mar 2019 11:26:10 -0600
Subject: [PATCH 0360/1055] MC-4425: Convert ImportProductsTest to MFTF

---
 ...AssertProductInfoOnEditPageActionGroup.xml |  22 ++++
 .../AssertProductOnAdminGridActionGroup.xml   |  17 +++
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  42 ++++++
 ...oductsWithAddUpdateBehaviorActionGroup.xml |  29 +++++
 ...ProductsWithReplaceBehaviorActionGroup.xml |  29 +++++
 ...mportProductsWithAddUpdateBehaviorTest.xml | 122 ++++++++++++++++++
 ...nImportProductsWithReplaceBehaviorTest.xml |  43 ++++++
 .../AdminDeleteWebsiteActionGroup.xml         |   1 +
 ...StoreFrontProductValidationActionGroup.xml |  21 +++
 .../tests/_data/catalog_import_products.csv   |   4 +
 10 files changed, 330 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithAddUpdateBehaviorActionGroup.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithReplaceBehaviorActionGroup.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.xml
 create mode 100644 dev/tests/acceptance/tests/_data/catalog_import_products.csv

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.xml
new file mode 100644
index 0000000000000..7917fe68aaebc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInfoOnEditPageActionGroup.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="AssertProductInfoOnEditPageActionGroup" extends="OpenEditProductOnBackendActionGroup">
+        <arguments>
+            <argument name="product" type="entity"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="seeProductStockStatus"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml
new file mode 100644
index 0000000000000..963c9d9f1c911
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnAdminGridActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="AssertProductOnAdminGridActionGroup" extends="viewProductInAdminGrid">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+       <remove keyForRemoval="clickClearFiltersAfter"/>
+    </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 0b3a31194ea36..1c107d315a2b9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -60,6 +60,48 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="SimpleProductAfterImport1" type="product">
+        <data key="sku">SimpleProductForTest1</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name">SimpleProductAfterImport1</data>
+        <data key="price">250.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="urlKey">simple-product-for-test-1</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="SimpleProductAfterImport2" type="product">
+        <data key="sku">SimpleProductForTest2</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name">SimpleProductAfterImport2</data>
+        <data key="price">300.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="urlKey">simple-product-for-test-2</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
+    <entity name="SimpleProductAfterImport3" type="product">
+        <data key="sku">SimpleProductForTest3</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name">SimpleProductAfterImport3</data>
+        <data key="price">350.00</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <data key="urlKey">simple-product-for-test-3</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
     <entity name="SimpleProduct2" type="product">
         <data key="sku" unique="suffix">SimpleProduct</data>
         <data key="type_id">simple</data>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithAddUpdateBehaviorActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithAddUpdateBehaviorActionGroup.xml
new file mode 100644
index 0000000000000..53406ed25e3c0
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithAddUpdateBehaviorActionGroup.xml
@@ -0,0 +1,29 @@
+<?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="AdminImportProductsWithAddUpdateBehaviorActionGroup">
+        <arguments>
+            <argument name="importFile" type="string"/>
+            <argument name="importMessage" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
+        <waitForPageLoad stepKey="AdminImportMainSectionLoad"/>
+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Add/Update" stepKey="selectReplaceOption"/>
+        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
+        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
+        <waitForPageLoad stepKey="AdminImportMainSectionLoad2"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
+        <waitForPageLoad stepKey="AdminMessagesSection"/>
+        <see selector="{{AdminMessagesSection.notice}}" userInput="{{importMessage}}" stepKey="seeImportMessage"/>
+        </actionGroup>
+    </actionGroups>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithReplaceBehaviorActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithReplaceBehaviorActionGroup.xml
new file mode 100644
index 0000000000000..5e7c3d164e067
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithReplaceBehaviorActionGroup.xml
@@ -0,0 +1,29 @@
+<?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="AdminImportProductsWithReplaceBehaviorActionGroup">
+        <arguments>
+            <argument name="importFile" type="string"/>
+            <argument name="importMessage" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
+        <waitForPageLoad stepKey="AdminImportMainSectionLoad"/>
+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Replace" stepKey="selectReplaceOption"/>
+        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
+        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
+        <waitForPageLoad stepKey="AdminImportMainSectionLoad2"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
+        <waitForPageLoad stepKey="AdminMessagesSection"/>
+        <see selector="{{AdminMessagesSection.notice}}" userInput="{{importMessage}}" stepKey="assertNotice"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
new file mode 100644
index 0000000000000..72156ce57294f
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
@@ -0,0 +1,122 @@
+<?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="AdminImportProductsWithAddUpdateBehaviorTest">
+        <annotations>
+            <description value="Verify Magento native import products with add/update behavior."/>
+            <stories value="Verify Magento native import products with add/update behavior."/>
+            <features value="Import/Export"/>
+            <title value="Verify Magento native import products with add/update behavior."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-47724"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <!--Create Simple Product1-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct1">
+                <field key="name">SimpleProductForTest1</field>
+                <field key="sku">SimpleProductForTest1</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Login as Admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create Website -->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
+                <argument name="newWebsiteName" value="secondWebsite"/>
+                <argument name="websiteCode" value="second_website"/>
+            </actionGroup>
+
+            <!-- Create store group -->
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
+                <argument name="website" value="secondWebsite"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+
+            <!-- Create store view -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+       </before>
+        <after>
+            <!-- Delete all products that replaced products in the before block post import -->
+            <deleteData stepKey="deleteSimpleProduct1" url="/V1/products/SimpleProductForTest1"/>
+            <deleteData stepKey="deleteSimpleProduct2" url="/V1/products/SimpleProductForTest2"/>
+            <deleteData stepKey="deleteSimpleProduct3" url="/V1/products/SimpleProductForTest3"/>
+
+            <!-- Delete category created in the before block -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!--Delete website created in the before block -->
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite" before="logoutFromAdmin">
+                <argument name="websiteName" value="secondWebsite"/>
+            </actionGroup>
+
+            <!--Logout-->
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+
+        </after>
+
+        <!-- Import products with add/update behavior -->
+        <actionGroup ref="AdminImportProductsWithAddUpdateBehaviorActionGroup" stepKey="adminImportProducts">
+            <argument name="importFile" value="catalog_import_products.csv"/>
+            <argument name="importMessage" value="Created: 2, Updated: 1, Deleted: 0"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product1 on grid-->
+        <actionGroup ref="AssertProductOnAdminGridActionGroup" stepKey="assertSimpleProduct1OnAdminGrid">
+            <argument name="product" value="SimpleProductAfterImport1"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product1 on edit page-->
+        <actionGroup ref="AssertProductInfoOnEditPageActionGroup" stepKey="assertSimpleProduct1OnEditPage">
+            <argument name="product" value="SimpleProductAfterImport1"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product2 on grid-->
+        <actionGroup ref="AssertProductOnAdminGridActionGroup" stepKey="assertSimpleProduct2OnAdminGrid">
+            <argument name="product" value="SimpleProductAfterImport2"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product2 on edit page-->
+        <actionGroup ref="AssertProductInfoOnEditPageActionGroup" stepKey="assertSimpleProduct2OnEditPage">
+            <argument name="product" value="SimpleProductAfterImport2"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product3 on grid-->
+        <actionGroup ref="AssertProductOnAdminGridActionGroup" stepKey="assertSimpleProduct3OnAdminGrid">
+            <argument name="product" value="SimpleProductAfterImport3"/>
+        </actionGroup>
+
+        <!-- Assert Simple Product3 on edit page-->
+        <actionGroup ref="AssertProductInfoOnEditPageActionGroup" stepKey="assertSimpleProduct3OnEditPage">
+            <argument name="product" value="SimpleProductAfterImport3"/>
+        </actionGroup>
+
+        <!-- Assert SimpleProduct1 on store front-->
+        <actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct1Validation">
+            <argument name="product" value="SimpleProductAfterImport1"/>
+        </actionGroup>
+        
+        <!-- Assert SimpleProduct2 on store front-->
+        <actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct2Validation">
+            <argument name="product" value="SimpleProductAfterImport2"/>
+        </actionGroup>
+
+        <!-- Assert SimpleProduct3 on store front-->
+        <actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct3Validation">
+            <argument name="product" value="SimpleProductAfterImport3"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
new file mode 100644
index 0000000000000..6a006814d4471
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
@@ -0,0 +1,43 @@
+<?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="AdminImportProductsWithReplaceBehaviorTest" extends="AdminImportProductsWithAddUpdateBehaviorTest">
+        <annotations>
+            <description value="Verify Magento native import products with replace behavior."/>
+            <stories value="Verify Magento native import products with replace behavior."/>
+            <features value="Import/Export"/>
+            <title value="Verify Magento native import products with replace behavior."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-47719"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <!--Create Simple Product2-->
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct2">
+                <field key="name">SimpleProductForTest2</field>
+                <field key="sku">SimpleProductForTest2</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!--Create Simple Product3-->
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct3">
+                <field key="name">SimpleProductForTest3</field>
+                <field key="sku">SimpleProductForTest3</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <!-- Import products with replace behavior -->
+        <actionGroup ref="AdminImportProductsWithReplaceBehaviorActionGroup" stepKey="adminImportProducts">
+            <argument name="importFile" value="catalog_import_products.csv"/>
+            <argument name="importMessage" value="Created: 3, Updated: 0, Deleted: 3"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
index 58fd0a3f0bc2b..1721e3185402e 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
@@ -19,6 +19,7 @@
         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditWebsitePage"/>
+        <waitForPageLoad stepKey="waitForDeleteStoreGroupSectionLoad" time="30"/>
         <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteWebsiteButton"/>
         <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.xml
new file mode 100644
index 0000000000000..f11394c643ad7
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StoreFrontProductValidationActionGroup.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="StoreFrontProductValidationActionGroup">
+        <arguments>
+            <argument name="product" type="entity"/>
+        </arguments>
+        <amOnPage url="{{StorefrontProductPage.url(product.urlKey)}}" stepKey="seeProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{product.name}}" stepKey="seeProductInStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{product.sku}}" stepKey="seeCorrectSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{product.price}}" stepKey="seeCorrectPrice"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/_data/catalog_import_products.csv b/dev/tests/acceptance/tests/_data/catalog_import_products.csv
new file mode 100644
index 0000000000000..7732f15d4ce3a
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/catalog_import_products.csv
@@ -0,0 +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,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
+SimpleProductForTest1,,Default,simple,"Default","base,second_website",SimpleProductAfterImport1,,,1.0000,1,"Taxable Goods","Catalog, Search",250.0000,,,,simple-product-for-test-1,,,,,,,,,,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
+SimpleProductForTest2,,Default,simple,"Default",base,SimpleProductAfterImport2,,,1.0000,1,"Taxable Goods","Catalog, Search",300.0000,,,,simple-product-for-test-2,,,,,,,,,,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
+SimpleProductForTest3,,Default,simple,"Default","base,second_website",SimpleProductAfterImport3,,,1.0000,1,"Taxable Goods","Catalog, Search",350.0000,,,,simple-product-for-test-3,,,,,,,,,,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,100.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,,,,,,,,,,,,,,,,,,,
\ No newline at end of file

From 33b888e0bb853f1a9d4a6e6e85a528792102a47a Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Tue, 5 Mar 2019 11:31:59 -0600
Subject: [PATCH 0361/1055] MC-4425: Convert ImportProductsTest to MFTF

---
 .../Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
index 72156ce57294f..cdef15d2a0924 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
@@ -48,7 +48,7 @@
                 <argument name="StoreGroup" value="customStoreGroup"/>
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
-       </before>
+        </before>
         <after>
             <!-- Delete all products that replaced products in the before block post import -->
             <deleteData stepKey="deleteSimpleProduct1" url="/V1/products/SimpleProductForTest1"/>
@@ -65,7 +65,6 @@
 
             <!--Logout-->
             <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
-
         </after>
 
         <!-- Import products with add/update behavior -->

From 132b6366787d0f0971100f80c811fe5e5ff3681c Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Tue, 5 Mar 2019 11:39:08 -0600
Subject: [PATCH 0362/1055] MC-4425: Convert ImportProductsTest to MFTF

---
 .../Test/AdminImportProductsWithAddUpdateBehaviorTest.xml     | 4 ++--
 .../Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
index cdef15d2a0924..22d79334796af 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
@@ -19,7 +19,7 @@
             <group value="importExport"/>
         </annotations>
         <before>
-            <!--Create Simple Product1-->
+            <!-- Create Simple Product1 -->
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createSimpleProduct1">
                 <field key="name">SimpleProductForTest1</field>
@@ -63,7 +63,7 @@
                 <argument name="websiteName" value="secondWebsite"/>
             </actionGroup>
 
-            <!--Logout-->
+            <!-- Logout -->
             <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
 
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
index 6a006814d4471..89008340675bb 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
@@ -19,14 +19,14 @@
             <group value="importExport"/>
         </annotations>
         <before>
-            <!--Create Simple Product2-->
+            <!-- Create Simple Product2 -->
             <createData entity="SimpleProduct" stepKey="createSimpleProduct2">
                 <field key="name">SimpleProductForTest2</field>
                 <field key="sku">SimpleProductForTest2</field>
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
 
-            <!--Create Simple Product3-->
+            <!-- Create Simple Product3 -->
             <createData entity="SimpleProduct" stepKey="createSimpleProduct3">
                 <field key="name">SimpleProductForTest3</field>
                 <field key="sku">SimpleProductForTest3</field>

From cbfbc8662d78ad46de151b3b8113b4cd03c89835 Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Tue, 5 Mar 2019 11:47:54 -0600
Subject: [PATCH 0363/1055] MC-4425: Convert ImportProductsTest to MFTF

Added migrated tags
---
 .../Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml  | 1 +
 .../Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml    | 1 +
 .../CatalogImportExport/Test/TestCase/ImportProductsTest.xml    | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
index 22d79334796af..954a2ee2d9d5d 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-47724"/>
             <group value="importExport"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <!-- Create Simple Product1 -->
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
index 89008340675bb..3ebe1f59885ba 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-47719"/>
             <group value="importExport"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <!-- Create Simple Product2 -->
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml
index edb0aad954fbb..77e5e2b91d93f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ImportProductsTest.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\CatalogImportExport\Test\TestCase\ImportProductsTest" summary="Import products">
         <variation name="ImportProductVariation1" ticketId="MAGETWO-47724" summary="Import Products with Add/Update Behavior">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="import/data" xsi:type="array">
                 <item name="entity" xsi:type="string">Products</item>
                 <item name="behavior" xsi:type="string">Add/Update</item>
@@ -38,6 +39,7 @@
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertProductsInGrid" />
         </variation>
         <variation name="ImportProductVariation2" ticketId="MAGETWO-47719" summary="Import Products assigned to different websites with Replace Behavior">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="import/data/entity" xsi:type="string">Products</data>
             <data name="import/data/behavior" xsi:type="string">Replace</data>
             <data name="import/data/validation_strategy" xsi:type="string">Stop on Error</data>

From 190b72ae5a159d4be2dfb7f4a09ec7eb590fc587 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Tue, 5 Mar 2019 11:49:44 -0600
Subject: [PATCH 0364/1055] MC-4903: Convert UpdateProductUrlRewriteEntityTest
 to MFTF

---
 .../Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml    | 10 ++++------
 .../StorefrontUrlRewriteRedirectActionGroup.xml        |  1 +
 .../UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml       |  1 +
 .../UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml |  2 --
 ...ateProductUrlRewriteAndAddTemporaryRedirectTest.xml |  8 +++-----
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
index 5886b40c4547b..c82c8d3d088f3 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
@@ -77,14 +77,12 @@
     </actionGroup>
     <actionGroup name="AdminUpdateUrlRewrite">
         <arguments>
-            <argument name="requestPath" type="string"/>
-            <argument name="redirectTypeValue" type="string"/>
-            <argument name="description" type="string"/>
+            <argument name="urlRewrite" defaultValue="updateUrlRewrite"/>
         </arguments>
-        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{urlRewrite.request_path}}" stepKey="fillRequestPath"/>
         <click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
-        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue('redirectTypeValue')}}" stepKey="selectRedirectTypeValue"/>
-        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue(urlRewrite.redirect_type_label)}}" stepKey="selectRedirectTypeValue"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{urlRewrite.description}}" stepKey="fillDescription"/>
         <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
     </actionGroup>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/StorefrontUrlRewriteRedirectActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/StorefrontUrlRewriteRedirectActionGroup.xml
index a299e1689d6a7..482038a28ccb9 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/StorefrontUrlRewriteRedirectActionGroup.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/StorefrontUrlRewriteRedirectActionGroup.xml
@@ -30,3 +30,4 @@
         <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{productSku}}" stepKey="seeProductSkuInStoreFrontPage"/>
     </actionGroup>
 </actionGroups>
+
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
index 942882be259f9..a580e68639c7e 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
@@ -23,5 +23,6 @@
         <data key="redirect_type_label">Temporary (302)</data>
         <data key="store_id">1</data>
         <data key="store">Default Store View</data>
+        <data key="description">Update Url Rewrite</data>
     </entity>
 </entities>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml b/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
index 84cf00ac08999..f33a1dee8e8bd 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
@@ -9,12 +9,10 @@
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateUrlRewrite" dataType="urlRewrite" type="create" auth="adminFormKey" url="/admin/url_rewrite/save/" method="POST" successRegex="/messages-message-success/">
-        <!--<object key="urlRewrite" dataType="urlRewrite">-->
         <field key="store_id">integer</field>
         <field key="redirect_type">integer</field>
         <field key="request_path">string</field>
         <field key="target_path">string</field>
         <field key="description">string</field>
-        <!--</object>-->
     </operation>
 </operations>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml
index cbb3680f37345..29b8365fb690a 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest.xml
@@ -9,7 +9,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminUpdateProductUrlRewriteAndAddTemporaryRedirectTest">
         <annotations>
-            <stories value="Update URL rewrite"/>
+            <stories value="URL Rewrite"/>
             <title value="Update Product URL Rewrites"/>
             <description value="Login as Admin and update product UrlRewrite and add Temporary redirect type "/>
             <testCaseId value="MC-5351"/>
@@ -33,16 +33,14 @@
 
         <!-- Open UrlRewrite Edit page and update the fields  -->
         <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateCategoryUrlRewrite">
-            <argument name="requestPath" value="{{defaultUrlRewrite.request_path}}"/>
-            <argument name="redirectTypeValue" value="Temporary (302)"/>
-            <argument name="description" value="Update Product Url Rewrite"/>
+            <argument name="urlRewrite" value="updateUrlRewrite"/>
         </actionGroup>
 
         <!-- Assert product Url Rewrite in StoreFront -->
         <actionGroup ref="AssertStorefrontProductRedirect" stepKey="assertProductUrlRewriteInStoreFront">
             <argument name="productName" value="$$createProduct.name$$"/>
             <argument name="productSku" value="$$createProduct.sku$$"/>
-            <argument name="productRequestPath" value="{{defaultUrlRewrite.request_path}}"/>
+            <argument name="productRequestPath" value="{{updateUrlRewrite.request_path}}"/>
         </actionGroup>
     </test>
 </tests>

From 00a0f85d97caa49fd7670eac2bdd379e9262eddf Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Tue, 5 Mar 2019 12:12:53 -0600
Subject: [PATCH 0365/1055] ENGCOM-4389 Elasticsearch6 implementation

---
 app/code/Magento/Elasticsearch6/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index c289d8cd3e4e4..26b6c8c678ade 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -9,7 +9,7 @@
         "magento/module-search": "*",
         "magento/module-store": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~6.1"
+        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
     },
     "suggest": {
         "magento/module-config": "*"

From 40f42a534d191e14c5fe8e649108ea01e436091a Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 5 Mar 2019 12:16:41 -0600
Subject: [PATCH 0366/1055] MC-15094: When switch to specific store view -
 field Price not disabled but checkbox "Use Default Value" is checked

---
 .../Catalog/Test/Mftf/Section/AdminProductFormSection.xml | 8 ++++++++
 .../adminhtml/web/js/components/price-configurable.js     | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 3f67e4b087cc4..890eb548dd9e5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -13,23 +13,30 @@
         <element name="attributeSetFilterResult" type="input" selector="div[data-index='attribute_set_id'] .action-menu-item._last" timeout="30"/>
         <element name="attributeSetFilterResultByName" type="text" selector="//label/span[text() = '{{var}}']" timeout="30" parameterized="true"/>
         <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
+        <element name="productNameDisabled" type="input" selector=".admin__field[data-index=name] input[disabled=true]"/>
         <element name="RequiredNameIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
         <element name="RequiredSkuIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=sku]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
         <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
+        <element name="productSkuDisabled" type="input" selector=".admin__field[data-index=sku] input[disabled=true]"/>
         <element name="enableProductAttributeLabel" type="text" selector="//span[text()='Enable Product']/parent::label"/>
         <element name="enableProductAttributeLabelWrapper" type="text" selector="//span[text()='Enable Product']/parent::label/parent::div"/>
         <element name="productStatus" type="checkbox" selector="input[name='product[status]']"/>
+        <element name="productStatusDisabled" type="checkbox" selector="input[name='product[status]'][disabled]"/>
         <element name="enableProductLabel" type="checkbox" selector="input[name='product[status]']+label"/>
         <element name="productStatusUseDefault" type="checkbox" selector="input[name='use_default[status]']"/>
         <element name="productNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
+        <element name="productPriceDisabled" type="input" selector=".admin__field[data-index=price] input[disabled=true]"/>
+        <element name="productPriceUseDefault" type="checkbox" selector=".admin__field[data-index=price] [name='use_default[price]']"/>
         <element name="productTaxClass" type="select" selector="//*[@name='product[tax_class_id]']"/>
+        <element name="productTaxClassDisabled" type="select" selector="select[name='product[tax_class_id]'][disabled=true]"/>
         <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="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')]" timeout="30"/>
         <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']"/>
+        <element name="productStockStatusDisabled" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]'][disabled=true]"/>
         <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]']"/>
@@ -47,6 +54,7 @@
         <element name="productFormTab" type="button" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]" parameterized="true"/>
         <element name="productFormTabState" type="text" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]/parent::*/parent::*[@data-state-collapsible='{{state}}']" parameterized="true"/>
         <element name="visibility" type="select" selector="//select[@name='product[visibility]']"/>
+        <element name="visibilityDisabled" type="select" selector="select[name='product[visibility]'][disabled=true]"/>
         <element name="visibilityUseDefault" type="checkbox" selector="//input[@name='use_default[visibility]']"/>
         <element name="divByDataIndex" type="input" selector="div[data-index='{{var}}']" parameterized="true"/>
         <element name="setProductAsNewFrom" type="input" selector="input[name='product[news_from_date]']"/>
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 b2ef35546eea8..62ab7f0565259 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
@@ -11,6 +11,9 @@ define([
 
     return Abstract.extend({
         defaults: {
+            listens: {
+                isConfigurable: 'handlePriceValue'
+            },
             imports: {
                 isConfigurable: '!ns = ${ $.ns }, index = configurable-matrix:isEmpty'
             },
@@ -24,10 +27,6 @@ define([
             this._super();
             // resolve initial disable state
             this.handlePriceValue(this.isConfigurable);
-            // add listener to track "configurable" type
-            this.setListeners({
-                isConfigurable: 'handlePriceValue'
-            });
 
             return this;
         },

From 7ab162f0c910f36a9cb493ea050f44abe5594741 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Tue, 5 Mar 2019 14:36:32 -0600
Subject: [PATCH 0367/1055] MC-4455: Convert CreateDuplicateUrlProductEntity to
 MFTF

---
 .../ActionGroup/AdminProductActionGroup.xml   | 16 +++++++------
 .../Test/AdminCreateDuplicateProductTest.xml  | 24 +++++++++++++++----
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index d2d95d811c43d..709f74ede09aa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -430,29 +430,31 @@
         <click selector="{{AdminAddUpSellProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
     </actionGroup>
-    <actionGroup name="createDuplicateProduct">
+    <actionGroup name="adminFillAndSaveProductForm">
         <arguments>
-            <argument name="product" defaultValue="$$createSimpleProduct$$" />
-            <argument name="quantity" defaultValue="defaultSimpleProduct.quantity"/>
+            <argument name="product" defaultValue="defaultSimpleProduct"/>
+            <argument name="productName" type="string"/>
+            <argument name="productUrlKey" type="string"/>
+            <argument name="categoryName" type="string"/>
         </arguments>
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductIndexPage"/>
         <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
         <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickOnAddNewProduct"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{productName}}" stepKey="fillProductName"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
-        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{quantity}}" stepKey="fillProductQty"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="fillProductQty"/>
         <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="selectStockStatus"/>
         <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
         <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{categoryName}}]" stepKey="searchAndSelectCategory"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="scrollToSectionHeader"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-        <fillField userInput="{{product.custom_attributes[url_key]}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+        <fillField userInput="{{productUrlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollTopPageProduct"/>
         <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveProductButton" />
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
         <waitForPageLoad stepKey="waitForProductToSave"/>
-        <see selector="{{AdminProductFormSection.successMessage}}"  userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
index 81a0916be6e77..68dfc44aa886a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
@@ -10,22 +10,36 @@
     <test name="AdminCreateDuplicateProductTest">
         <annotations>
             <stories value="Create Product"/>
-            <title value="CreateDuplicateUrlProductEntityTestVariation1"/>
+            <title value="Create Duplicate Product With Existed Subcategory Name And UrlKey"/>
             <description value="Login as admin and create duplicate Product"/>
             <testCaseId value="MC-14714"/>
             <severity value="CRITICAL"/>
             <group value="mtf_migrated"/>
         </annotations>
+
         <before>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
+            <createData entity="SubCategory" stepKey="category"/>
+            <createData entity="Two_nested_categories" stepKey="subCategory">
+                <requiredEntity createDataKey="category"/>
+            </createData>
         </before>
         <after>
-            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="subCategory" stepKey="deleteSubCategory"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
-        <!-- Create duplicate Product and Save the Product -->
-        <actionGroup ref="createDuplicateProduct" stepKey="createDuplicateProduct"/>
+        <!-- Create Product using above created Subcategory Name and SubCategory UrlKey and Save the Product -->
+        <actionGroup ref="adminFillAndSaveProductForm" stepKey="createDuplicateProduct">
+            <argument name="product" value="defaultSimpleProduct"/>
+            <argument name="productName" value="$$subCategory.name$$"/>
+            <argument name="productUrlKey" value="$$subCategory.custom_attributes[url_key]$$"/>
+            <argument name="categoryName" value="$$category.name$$"/>
+        </actionGroup>
+
+        <!--Assert Error Message -->
+        <see selector="{{AdminProductFormSection.successMessage}}"  userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
     </test>
 </tests>

From a0d827c02a6c90061fd298b0596d932ee2d189bd Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Tue, 5 Mar 2019 14:47:03 -0600
Subject: [PATCH 0368/1055] MC-4873: Convert UpdateWebsiteEntityTest to MFTF

---
 .../AdminCreateWebsiteActionGroup.xml         | 26 ++++++++
 .../Store/Test/Mftf/Data/WebsiteData.xml      |  6 +-
 .../Mftf/Section/AdminStoresGridSection.xml   |  3 +-
 .../Test/Mftf/Test/AdminUpdateWebsiteTest.xml | 59 +++++++++++++++++++
 4 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
index ef8d77c8824ff..ca614ec24138c 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
@@ -36,4 +36,30 @@
         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
         <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabFromCurrentUrl"/>
     </actionGroup>
+
+    <actionGroup name="AssertWebsiteInGrid">
+        <arguments>
+            <argument name="websiteName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillWebsiteField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <seeElement selector="{{AdminStoresGridSection.websiteName(websiteName)}}" stepKey="seeAssertWebsiteInGrid"/>
+    </actionGroup>
+
+    <actionGroup name="AssertWebsiteForm">
+        <arguments>
+            <argument name="websiteName" type="string"/>
+            <argument name="websiteCode" type="string"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.websiteName(websiteName)}}" stepKey="clickWebsiteFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitTillWebsiteFormPageIsOpened"/>
+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabWebsiteIdFromCurrentUrl"/>
+        <seeInCurrentUrl url="/system_store/editWebsite/website_id/{$grabWebsiteIdFromCurrentUrl}" stepKey="seeWebsiteId"/>
+        <seeInField selector="{{AdminNewWebsiteSection.name}}" userInput="{{websiteName}}" stepKey="seeAssertWebsiteName"/>
+        <seeInField selector="{{AdminNewWebsiteSection.code}}" userInput="{{websiteCode}}" stepKey="seeAssertWebsiteCode"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
index f636336524f01..ae605256a2819 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
@@ -23,4 +23,8 @@
         <data key="name" unique="suffix">Custom Website</data>
         <data key="code" unique="suffix">custom_website</data>
     </entity>
-</entities>
+    <entity name="updateCustomWebsite" extends="customWebsite">
+        <data key="name" unique="suffix">website_upd</data>
+        <data key="code" unique="suffix">code_upd</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index 592af42f2de30..d7006fd01b2ff 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -23,5 +23,6 @@
         <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
         <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
         <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
+        <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
      </section>
-</sections>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml
new file mode 100644
index 0000000000000..6b666126569ae
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateWebsiteTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateWebsiteTest">
+        <annotations>
+            <stories value="Update Website"/>
+            <title value="Update Website and Verify Store Form"/>
+            <description value="Test log in to Stores and Update Website Test"/>
+            <testCaseId value="MC-14301"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create website-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{updateCustomWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Search created custom website in grid-->
+        <actionGroup ref="AssertWebsiteInGrid" stepKey="seeWebsiteInGrid">
+            <argument name="websiteName" value="{{customWebsite.name}}"/>
+        </actionGroup>
+        <click selector="{{AdminStoresGridSection.websiteName(customWebsite.name)}}" stepKey="clickWebsiteFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitForWebsiteFormPageToOpen"/>
+        <!--Update website name and website code as per data created and verify AssertWebsiteSuccessSaveMessage-->
+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+            <argument name="newWebsiteName" value="{{updateCustomWebsite.name}}"/>
+            <argument name="websiteCode" value="{{updateCustomWebsite.code}}"/>
+        </actionGroup>
+
+        <!--Search updated custom website(from above step) in grid and verify AssertWebsiteInGrid-->
+        <actionGroup ref="AssertWebsiteInGrid" stepKey="seeUpdatedWebsiteInGrid">
+            <argument name="websiteName" value="{{updateCustomWebsite.name}}"/>
+        </actionGroup>
+
+        <!--Verify updated website name and updated websitecode on website form (AssertWebsiteForm and AssertWebsiteOnStoreForm)-->
+        <actionGroup ref="AssertWebsiteForm" stepKey="seeUpdatedWebsiteForm">
+            <argument name="websiteName" value="{{updateCustomWebsite.name}}"/>
+            <argument name="websiteCode" value="{{updateCustomWebsite.code}}"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file

From 828b39374794f11c5689dd03e24a8300ba57b2e4 Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Tue, 5 Mar 2019 15:27:58 -0600
Subject: [PATCH 0369/1055] MC-4425: Convert ImportProductsTest to MFTF

Merged 2 action groups with parametrization
---
 ...xml => AdminImportProductsActionGroup.xml} |  5 ++--
 ...ProductsWithReplaceBehaviorActionGroup.xml | 29 -------------------
 ...mportProductsWithAddUpdateBehaviorTest.xml |  3 +-
 ...nImportProductsWithReplaceBehaviorTest.xml |  3 +-
 4 files changed, 7 insertions(+), 33 deletions(-)
 rename app/code/Magento/ImportExport/Test/Mftf/ActionGroup/{AdminImportProductsWithAddUpdateBehaviorActionGroup.xml => AdminImportProductsActionGroup.xml} (90%)
 delete mode 100644 app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithReplaceBehaviorActionGroup.xml

diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithAddUpdateBehaviorActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
similarity index 90%
rename from app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithAddUpdateBehaviorActionGroup.xml
rename to app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
index 53406ed25e3c0..a9100b4730b8c 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithAddUpdateBehaviorActionGroup.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
@@ -8,8 +8,9 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminImportProductsWithAddUpdateBehaviorActionGroup">
+    <actionGroup name="AdminImportProductsActionGroup">
         <arguments>
+            <argument name="behavior" type="string"/>
             <argument name="importFile" type="string"/>
             <argument name="importMessage" type="string"/>
         </arguments>
@@ -17,7 +18,7 @@
         <waitForPageLoad stepKey="AdminImportMainSectionLoad"/>
         <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
         <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
-        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Add/Update" stepKey="selectReplaceOption"/>
+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="{{behavior}}" stepKey="selectImportOption"/>
         <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
         <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
         <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithReplaceBehaviorActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithReplaceBehaviorActionGroup.xml
deleted file mode 100644
index 5e7c3d164e067..0000000000000
--- a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithReplaceBehaviorActionGroup.xml
+++ /dev/null
@@ -1,29 +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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminImportProductsWithReplaceBehaviorActionGroup">
-        <arguments>
-            <argument name="importFile" type="string"/>
-            <argument name="importMessage" type="string"/>
-        </arguments>
-        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
-        <waitForPageLoad stepKey="AdminImportMainSectionLoad"/>
-        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
-        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
-        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Replace" stepKey="selectReplaceOption"/>
-        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
-        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
-        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-        <waitForPageLoad stepKey="AdminImportMainSectionLoad2"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
-        <waitForPageLoad stepKey="AdminMessagesSection"/>
-        <see selector="{{AdminMessagesSection.notice}}" userInput="{{importMessage}}" stepKey="assertNotice"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
index 954a2ee2d9d5d..f3238293e5713 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
@@ -69,7 +69,8 @@
         </after>
 
         <!-- Import products with add/update behavior -->
-        <actionGroup ref="AdminImportProductsWithAddUpdateBehaviorActionGroup" stepKey="adminImportProducts">
+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProducts">
+            <argument name="behavior" value="Add/Update"/>
             <argument name="importFile" value="catalog_import_products.csv"/>
             <argument name="importMessage" value="Created: 2, Updated: 1, Deleted: 0"/>
         </actionGroup>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
index 3ebe1f59885ba..d45b294a34e4f 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
@@ -36,7 +36,8 @@
         </before>
 
         <!-- Import products with replace behavior -->
-        <actionGroup ref="AdminImportProductsWithReplaceBehaviorActionGroup" stepKey="adminImportProducts">
+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProducts">
+            <argument name="behavior" value="Replace"/>
             <argument name="importFile" value="catalog_import_products.csv"/>
             <argument name="importMessage" value="Created: 3, Updated: 0, Deleted: 3"/>
         </actionGroup>

From 4a44ec94dfdafebd38ffad36ad4ef3dd38a6ad7b Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 5 Mar 2019 15:36:22 -0600
Subject: [PATCH 0370/1055] MC-15094: When switch to specific store view -
 field Price not disabled but checkbox "Use Default Value" is checked

---
 .../view/adminhtml/web/js/components/price-configurable.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 62ab7f0565259..b2ef35546eea8 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
@@ -11,9 +11,6 @@ define([
 
     return Abstract.extend({
         defaults: {
-            listens: {
-                isConfigurable: 'handlePriceValue'
-            },
             imports: {
                 isConfigurable: '!ns = ${ $.ns }, index = configurable-matrix:isEmpty'
             },
@@ -27,6 +24,10 @@ define([
             this._super();
             // resolve initial disable state
             this.handlePriceValue(this.isConfigurable);
+            // add listener to track "configurable" type
+            this.setListeners({
+                isConfigurable: 'handlePriceValue'
+            });
 
             return this;
         },

From e174556e48b99c31d7d52125ae6e1b2e9da62ce9 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 5 Mar 2019 16:12:29 -0600
Subject: [PATCH 0371/1055] MC-15006: Incorrect Prolong responses

- check if session already exists in prolong action
---
 .../src/Magento/Setup/Controller/Session.php  | 37 +++++++++++--------
 .../Test/Unit/Controller/SessionTest.php      | 33 ++++++++++++++++-
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/setup/src/Magento/Setup/Controller/Session.php b/setup/src/Magento/Setup/Controller/Session.php
index e310dd485ace5..f4f7274168850 100644
--- a/setup/src/Magento/Setup/Controller/Session.php
+++ b/setup/src/Magento/Setup/Controller/Session.php
@@ -52,23 +52,28 @@ public function prolongAction()
         try {
             if ($this->serviceManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
                 $objectManager = $this->objectManagerProvider->get();
-                /** @var \Magento\Framework\App\State $adminAppState */
-                $adminAppState = $objectManager->get(\Magento\Framework\App\State::class);
-                $adminAppState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
-                $sessionConfig = $objectManager->get(\Magento\Backend\Model\Session\AdminConfig::class);
-                /** @var \Magento\Backend\Model\Url $backendUrl */
-                $backendUrl = $objectManager->get(\Magento\Backend\Model\Url::class);
-                $urlPath = parse_url($backendUrl->getBaseUrl(), PHP_URL_PATH);
-                $cookiePath = $urlPath . 'setup';
-                $sessionConfig->setCookiePath($cookiePath);
                 /* @var \Magento\Backend\Model\Auth\Session $session */
-                $session = $objectManager->create(
-                    \Magento\Backend\Model\Auth\Session::class,
-                    [
-                        'sessionConfig' => $sessionConfig,
-                        'appState' => $adminAppState
-                    ]
-                );
+                $session = $objectManager->get(\Magento\Backend\Model\Auth\Session::class);
+                // check if session was already set in \Magento\Setup\Mvc\Bootstrap\InitParamListener::authPreDispatch
+                if (!$session->isSessionExists()) {
+                    /** @var \Magento\Framework\App\State $adminAppState */
+                    $adminAppState = $objectManager->get(\Magento\Framework\App\State::class);
+                    $adminAppState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
+                    $sessionConfig = $objectManager->get(\Magento\Backend\Model\Session\AdminConfig::class);
+                    /** @var \Magento\Backend\Model\Url $backendUrl */
+                    $backendUrl = $objectManager->get(\Magento\Backend\Model\Url::class);
+                    $urlPath = parse_url($backendUrl->getBaseUrl(), PHP_URL_PATH);
+                    $cookiePath = $urlPath . 'setup';
+                    $sessionConfig->setCookiePath($cookiePath);
+                    /* @var \Magento\Backend\Model\Auth\Session $session */
+                    $session = $objectManager->create(
+                        \Magento\Backend\Model\Auth\Session::class,
+                        [
+                            'sessionConfig' => $sessionConfig,
+                            'appState' => $adminAppState
+                        ]
+                    );
+                }
                 $session->prolong();
                 return new \Zend\View\Model\JsonModel(['success' => true]);
             }
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
index f8e5e7cdc4d70..216013ebfc8d9 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/SessionTest.php
@@ -48,6 +48,12 @@ public function testUnloginAction()
             $this->createPartialMock(\Magento\Framework\App\DeploymentConfig::class, ['isAvailable']);
         $deployConfigMock->expects($this->once())->method('isAvailable')->will($this->returnValue(true));
 
+        $sessionMock = $this->createPartialMock(
+            \Magento\Backend\Model\Auth\Session::class,
+            ['prolong', 'isSessionExists']
+        );
+        $sessionMock->expects($this->once())->method('isSessionExists')->will($this->returnValue(false));
+
         $stateMock = $this->createPartialMock(\Magento\Framework\App\State::class, ['setAreaCode']);
         $stateMock->expects($this->once())->method('setAreaCode');
 
@@ -57,6 +63,7 @@ public function testUnloginAction()
         $urlMock = $this->createMock(\Magento\Backend\Model\Url::class);
 
         $returnValueMap = [
+            [\Magento\Backend\Model\Auth\Session::class, $sessionMock],
             [\Magento\Framework\App\State::class, $stateMock],
             [\Magento\Backend\Model\Session\AdminConfig::class, $sessionConfigMock],
             [\Magento\Backend\Model\Url::class, $urlMock]
@@ -68,7 +75,6 @@ public function testUnloginAction()
             ->method('get')
             ->will($this->returnValueMap($returnValueMap));
 
-        $sessionMock = $this->createPartialMock(\Magento\Backend\Model\Auth\Session::class, ['prolong']);
         $this->objectManager->expects($this->once())
             ->method('create')
             ->will($this->returnValue($sessionMock));
@@ -87,4 +93,29 @@ public function testIndexAction()
         $viewModel = $controller->unloginAction();
         $this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $viewModel);
     }
+
+    /**
+     * @covers \Magento\Setup\Controller\SystemConfig::prolongAction
+     */
+    public function testProlongActionWithExistingSession()
+    {
+        $this->objectManagerProvider->expects($this->once())->method('get')->will(
+            $this->returnValue($this->objectManager)
+        );
+        $deployConfigMock =
+            $this->createPartialMock(\Magento\Framework\App\DeploymentConfig::class, ['isAvailable']);
+        $deployConfigMock->expects($this->once())->method('isAvailable')->will($this->returnValue(true));
+        $sessionMock = $this->createPartialMock(
+            \Magento\Backend\Model\Auth\Session::class,
+            ['prolong', 'isSessionExists']
+        );
+        $sessionMock->expects($this->once())->method('isSessionExists')->will($this->returnValue(true));
+
+        $this->serviceManager->expects($this->once())->method('get')->will($this->returnValue($deployConfigMock));
+        $this->objectManager->expects($this->once())
+            ->method('get')
+            ->will($this->returnValue($sessionMock));
+        $controller = new Session($this->serviceManager, $this->objectManagerProvider);
+        $this->assertEquals(new \Zend\View\Model\JsonModel(['success' => true]), $controller->prolongAction());
+    }
 }

From e5874bfa260f9fba9ef5ebb3c2a2cb1d64a0795c Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 5 Mar 2019 18:38:47 -0600
Subject: [PATCH 0372/1055] MC-15006: Incorrect Prolong responses

- fix DocBlocks
---
 setup/src/Magento/Setup/Controller/Session.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setup/src/Magento/Setup/Controller/Session.php b/setup/src/Magento/Setup/Controller/Session.php
index f4f7274168850..c9caa5a8de792 100644
--- a/setup/src/Magento/Setup/Controller/Session.php
+++ b/setup/src/Magento/Setup/Controller/Session.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Setup\Controller;
 
+/**
+ * Sets up session for setup/index.php/session/prolong or redirects to error page
+ */
 class Session extends \Zend\Mvc\Controller\AbstractActionController
 {
     /**
@@ -83,6 +86,8 @@ public function prolongAction()
     }
 
     /**
+     * Unlogin action, return 401 error page
+     *
      * @return \Zend\View\Model\ViewModel|\Zend\Http\Response
      */
     public function unloginAction()

From 9ab463fda7bab8d58c791dd4ba07fe4ec8407943 Mon Sep 17 00:00:00 2001
From: amol2jcommerce <amol@twojay.in>
Date: Wed, 6 Mar 2019 11:18:04 +0530
Subject: [PATCH 0373/1055] changes for
 Whitespace-issues-for-related-cross-and-upsell-grids

---
 .../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 d477c08fc9553..e5915969c91b9 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
@@ -397,7 +397,7 @@
     .page-products.page-layout-3columns {
         .products-grid {
             .product-item {
-                margin-left: 2%;
+                margin-left: 0;
                 width: calc(~'(100% - 4%) / 3');
 
                 &:nth-child(3n + 1) {

From ac855ab3f65b34641757c13d4afa88b257538f6b Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sun, 24 Feb 2019 12:37:03 +0100
Subject: [PATCH 0374/1055] [Test coverage] add to cart simple/virtual products
 with custom options

---
 .../Quote/AddSimpleProductToCartTest.php      | 167 ++++++++++++++
 .../Quote/AddVirtualProductToCartTest.php     | 209 ++++++++++++++++++
 .../_files/product_simple_with_options.php    | 106 +++++++++
 .../product_simple_with_options_rollback.php  |  24 ++
 .../_files/product_virtual_with_options.php   | 106 +++++++++
 .../product_virtual_with_options_rollback.php |  24 ++
 6 files changed, 636 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
index 4cbc614e1b8dc..00189519f5048 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
@@ -12,6 +12,7 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 
 class AddSimpleProductToCartTest extends GraphQlAbstract
 {
@@ -30,6 +31,11 @@ class AddSimpleProductToCartTest extends GraphQlAbstract
      */
     private $quoteIdToMaskedId;
 
+    /**
+     * @var ProductCustomOptionRepositoryInterface
+     */
+    private $productCustomOptionsRepository;
+
     /**
      * @inheritdoc
      */
@@ -39,6 +45,79 @@ protected function setUp()
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quote = $objectManager->create(Quote::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->productCustomOptionsRepository = $objectManager->get(ProductCustomOptionRepositoryInterface::class);
+    }
+
+    /**
+     * Test adding a simple product to the shopping cart with all supported
+     * customizable options assigned
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddSimpleProductWithOptions()
+    {
+        $sku = 'simple';
+        $qty = 1;
+
+        $customOptionsValues = $this->getCustomOptionsValuesForQuery($sku);
+
+        /* Generate customizable options fragment for GraphQl request */
+        $queryCustomizableOptions = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {  
+  addSimpleProductsToCart(
+    input: {
+      cart_id: "{$maskedQuoteId}", 
+      cartItems: [
+        {
+          data: {
+            qty: $qty
+            sku: "$sku"
+          },
+          customizable_options: $queryCustomizableOptions  
+        }
+      ]
+    }
+  ) {
+    cart {
+      items {
+        ... on SimpleCartItem {
+          customizable_options {
+            label
+              values {
+                value  
+              }
+            }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('items', $response['addSimpleProductsToCart']['cart']);
+        self::assertCount(1, $response['addSimpleProductsToCart']['cart']);
+
+        $customizableOptionsOutput = $response['addSimpleProductsToCart']['cart']['items'][0]['customizable_options'];
+        $assignedOptionsCount = count($customOptionsValues);
+        for ($counter = 0; $counter < $assignedOptionsCount; $counter++) {
+            self::assertEquals(
+                $customOptionsValues[$counter]['value'],
+                $customizableOptionsOutput[$counter]['values'][0]['value']
+            );
+        }
     }
 
     /**
@@ -83,4 +162,92 @@ public function testAddProductIfQuantityIsNotAvailable()
 
         $this->graphQlQuery($query);
     }
+
+    /**
+     * Test adding a simple product with empty values for required options
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddSimpleProductWithNoRequiredOptionsSet()
+    {
+        $sku = 'simple';
+        $qty = 1;
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {  
+  addSimpleProductsToCart(
+    input: {
+      cart_id: "{$maskedQuoteId}", 
+      cartItems: [
+        {
+          data: {
+            qty: $qty
+            sku: "$sku"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      items {
+        ... on SimpleCartItem {
+          customizable_options {
+            label
+              values {
+                value  
+              }
+            }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        self::expectExceptionMessage(
+            'The product\'s required option(s) weren\'t entered. Make sure the options are entered and try again.'
+        );
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Generate an array with test values for customizable options
+     * based on the option type
+     *
+     * @param string $sku
+     * @return array
+     */
+    private function getCustomOptionsValuesForQuery(string $sku): array
+    {
+        $customOptions = $this->productCustomOptionsRepository->getList($sku);
+        $customOptionsValues = [];
+
+        foreach ($customOptions as $customOption) {
+            $optionType = $customOption->getType();
+            if ($optionType == 'field' || $optionType == 'area') {
+                $customOptionsValues[] = [
+                    'id' => (int) $customOption->getOptionId(),
+                    'value' => 'test'
+                ];
+            } elseif ($optionType == 'drop_down') {
+                $optionSelectValues = $customOption->getValues();
+                $customOptionsValues[] = [
+                    'id' => (int) $customOption->getOptionId(),
+                    'value' => reset($optionSelectValues)->getOptionTypeId()
+                ];
+            }
+        }
+
+        return $customOptionsValues;
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php
new file mode 100644
index 0000000000000..4e1f97ec17ee6
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+
+class AddVirtualProductToCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var ProductCustomOptionRepositoryInterface
+     */
+    private $productCustomOptionsRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->productCustomOptionsRepository = $objectManager->get(ProductCustomOptionRepositoryInterface::class);
+    }
+
+    /**
+     * Test adding a virtual product to the shopping cart with all supported
+     * customizable options assigned
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual_with_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddVirtualProductWithOptions()
+    {
+        $sku = 'virtual';
+        $qty = 1;
+
+        $customOptionsValues = $this->getCustomOptionsValuesForQuery($sku);
+
+        /* Generate customizable options fragment for GraphQl request */
+        $queryCustomizableOptions = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {  
+  addVirtualProductsToCart(
+    input: {
+      cart_id: "{$maskedQuoteId}", 
+      cartItems: [
+        {
+          data: {
+            qty: $qty
+            sku: "$sku"
+          },
+          customizable_options: $queryCustomizableOptions  
+        }
+      ]
+    }
+  ) {
+    cart {
+      items {
+        ... on VirtualCartItem {
+          customizable_options {
+            label
+              values {
+                value  
+              }
+            }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('items', $response['addVirtualProductsToCart']['cart']);
+        self::assertCount(1, $response['addVirtualProductsToCart']['cart']);
+
+        $customizableOptionsOutput = $response['addVirtualProductsToCart']['cart']['items'][0]['customizable_options'];
+        $assignedOptionsCount = count($customOptionsValues);
+        for ($counter = 0; $counter < $assignedOptionsCount; $counter++) {
+            self::assertEquals(
+                $customOptionsValues[$counter]['value'],
+                $customizableOptionsOutput[$counter]['values'][0]['value']
+            );
+        }
+    }
+
+    /**
+     * Test adding a virtual product with empty values for required options
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual_with_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddVirtualProductWithNoRequiredOptionsSet()
+    {
+        $sku = 'virtual';
+        $qty = 1;
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {  
+  addVirtualProductsToCart(
+    input: {
+      cart_id: "{$maskedQuoteId}", 
+      cartItems: [
+        {
+          data: {
+            qty: $qty
+            sku: "$sku"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      items {
+        ... on VirtualCartItem {
+          customizable_options {
+            label
+              values {
+                value  
+              }
+            }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        self::expectExceptionMessage(
+            'The product\'s required option(s) weren\'t entered. Make sure the options are entered and try again.'
+        );
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Generate an array with test values for customizable options
+     * based on the option type
+     *
+     * @param string $sku
+     * @return array
+     */
+    private function getCustomOptionsValuesForQuery(string $sku): array
+    {
+        $customOptions = $this->productCustomOptionsRepository->getList($sku);
+        $customOptionsValues = [];
+
+        foreach ($customOptions as $customOption) {
+            $optionType = $customOption->getType();
+            if ($optionType == 'field' || $optionType == 'area') {
+                $customOptionsValues[] = [
+                    'id' => (int) $customOption->getOptionId(),
+                    'value' => 'test'
+                ];
+            } elseif ($optionType == 'drop_down') {
+                $optionSelectValues = $customOption->getValues();
+                $customOptionsValues[] = [
+                    'id' => (int) $customOption->getOptionId(),
+                    'value' => reset($optionSelectValues)->getOptionTypeId()
+                ];
+            }
+        }
+
+        return $customOptionsValues;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
new file mode 100644
index 0000000000000..b139f6865a2f4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+
+$product->setTypeId(
+    'simple'
+)->setAttributeSetId(
+    4
+)->setWebsiteIds(
+    [1]
+)->setName(
+    'Virtual Product With Custom Options'
+)->setSku(
+    'simple'
+)->setPrice(
+    10
+)->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
+)->setCanSaveCustomOptions(
+    true
+)->setStockData(
+    [
+        'qty' => 100,
+        'is_in_stock' => 1,
+        'manage_stock' => 1,
+    ]
+)->setHasOptions(true);
+
+$options = [
+    [
+        'title' => 'test_option_code_1',
+        'type' => 'field',
+        'is_require' => true,
+        'sort_order' => 1,
+        'price' => -10.0,
+        'price_type' => 'fixed',
+        'sku' => 'sku1',
+        'max_characters' => 10,
+    ],
+    [
+        'title' => 'area option',
+        'type' => 'area',
+        'is_require' => true,
+        'sort_order' => 2,
+        'price' => 20.0,
+        'price_type' => 'percent',
+        'sku' => 'sku2',
+        'max_characters' => 20
+    ],
+    [
+        'title' => 'drop_down option',
+        'type' => 'drop_down',
+        'is_require' => false,
+        'sort_order' => 4,
+        'values' => [
+            [
+                'title' => 'drop_down option 1',
+                'price' => 10,
+                'price_type' => 'fixed',
+                'sku' => 'drop_down option 1 sku',
+                'sort_order' => 1,
+            ],
+            [
+                'title' => 'drop_down option 2',
+                'price' => 20,
+                'price_type' => 'fixed',
+                'sku' => 'drop_down option 2 sku',
+                'sort_order' => 2,
+            ],
+        ],
+    ]
+];
+
+$customOptions = [];
+
+/** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
+$customOptionFactory = $objectManager->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+
+foreach ($options as $option) {
+    /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $customOption */
+    $customOption = $customOptionFactory->create(['data' => $option]);
+    $customOption->setProductSku($product->getSku());
+
+    $customOptions[] = $customOption;
+}
+
+$product->setOptions($customOptions);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
new file mode 100644
index 0000000000000..386e98ceedec4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\ProductRepository::class
+);
+try {
+    $product = $repository->get('simple', false, null, true);
+    $product->delete();
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Entity already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
new file mode 100644
index 0000000000000..eb215df02b35e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+
+$product->setTypeId(
+    'virtual'
+)->setAttributeSetId(
+    4
+)->setWebsiteIds(
+    [1]
+)->setName(
+    'Virtual Product With Custom Options'
+)->setSku(
+    'virtual'
+)->setPrice(
+    10
+)->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
+)->setCanSaveCustomOptions(
+    true
+)->setStockData(
+    [
+        'qty' => 100,
+        'is_in_stock' => 1,
+        'manage_stock' => 1,
+    ]
+)->setHasOptions(true);
+
+$options = [
+    [
+        'title' => 'test_option_code_1',
+        'type' => 'field',
+        'is_require' => true,
+        'sort_order' => 1,
+        'price' => -10.0,
+        'price_type' => 'fixed',
+        'sku' => 'sku1',
+        'max_characters' => 10,
+    ],
+    [
+        'title' => 'area option',
+        'type' => 'area',
+        'is_require' => true,
+        'sort_order' => 2,
+        'price' => 20.0,
+        'price_type' => 'percent',
+        'sku' => 'sku2',
+        'max_characters' => 20
+    ],
+    [
+        'title' => 'drop_down option',
+        'type' => 'drop_down',
+        'is_require' => false,
+        'sort_order' => 4,
+        'values' => [
+            [
+                'title' => 'drop_down option 1',
+                'price' => 10,
+                'price_type' => 'fixed',
+                'sku' => 'drop_down option 1 sku',
+                'sort_order' => 1,
+            ],
+            [
+                'title' => 'drop_down option 2',
+                'price' => 20,
+                'price_type' => 'fixed',
+                'sku' => 'drop_down option 2 sku',
+                'sort_order' => 2,
+            ],
+        ],
+    ]
+];
+
+$customOptions = [];
+
+/** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
+$customOptionFactory = $objectManager->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+
+foreach ($options as $option) {
+    /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $customOption */
+    $customOption = $customOptionFactory->create(['data' => $option]);
+    $customOption->setProductSku($product->getSku());
+
+    $customOptions[] = $customOption;
+}
+
+$product->setOptions($customOptions);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
new file mode 100644
index 0000000000000..0e9b9c4697bdd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\ProductRepository::class
+);
+try {
+    $product = $repository->get('virtual', false, null, true);
+    $product->delete();
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Entity already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From a04f8f8446921d4312a4cf753335b90c6463c33d Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 6 Mar 2019 09:18:20 +0100
Subject: [PATCH 0375/1055] Test coverage: Set OfflineShipping methods on Cart

---
 .../SetOfflineShippingMethodsOnCartTest.php   | 352 ++++++++++++++++++
 1 file changed, 352 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
new file mode 100644
index 0000000000000..99661e4cd342f
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
@@ -0,0 +1,352 @@
+<?php
+/**
+ * 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 setting offline shipping methods on cart
+ */
+class SetOfflineShippingOnCartTest 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);
+    }
+
+    /**
+     * Test for general routine of setting a shipping method on shopping cart
+     *
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetShippingMethodOnCart()
+    {
+        $shippingCarrierCode = 'flatrate';
+        $shippingMethodCode = 'flatrate';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $shippingAddress = $this->quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        $response = $this->sendRequestWithToken($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        self::assertCount(1, $addressesInformation);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetFlatrateOnCart()
+    {
+        $this->setShippingMethodAndCheckResponse(
+            'flatrate',
+            'flatrate',
+            '10',
+            'Flat Rate - Fixed'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetTableRatesOnCart()
+    {
+        $this->setShippingMethodAndCheckResponse(
+            'tablerate',
+            'bestway',
+            '10',
+            'Best Way - Table Rate'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetFreeShippingOnCart()
+    {
+        $this->setShippingMethodAndCheckResponse(
+            'freeshipping',
+            'freeshipping',
+            '0',
+            'Free Shipping - Free'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetUpsOnCart()
+    {
+        $this->setShippingMethodAndCheckResponse(
+            'ups',
+            'GND',
+            '15.61',
+            'United Parcel Service - Ground'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetShippingMethodWithWrongCartId()
+    {
+        $shippingCarrierCode = 'flatrate';
+        $shippingMethodCode = 'flatrate';
+        $shippingAddressId = '1';
+        $maskedQuoteId = 'invalid';
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        self::expectExceptionMessage("Could not find a cart with ID \"$maskedQuoteId\"");
+        $this->sendRequestWithToken($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetNonExistingShippingMethod()
+    {
+        $shippingCarrierCode = 'non';
+        $shippingMethodCode = 'existing';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $shippingAddress = $this->quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        self::expectExceptionMessage("Carrier with such method not found: $shippingCarrierCode, $shippingMethodCode");
+        $this->sendRequestWithToken($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetShippingMethodWithNonExistingAddress()
+    {
+        $shippingCarrierCode = 'flatrate';
+        $shippingMethodCode = 'flatrate';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $shippingAddressId = '-20';
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        self::expectExceptionMessage("Could not find a cart address with ID \"$shippingAddressId\"");
+        $this->sendRequestWithToken($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetShippingMethodByGuestToCustomerCart()
+    {
+        $shippingCarrierCode = 'flatrate';
+        $shippingMethodCode = 'flatrate';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $shippingAddress = $this->quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        self::expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Send request for setting the requested shipping method and check the output
+     *
+     * @param string $shippingCarrierCode
+     * @param string $shippingMethodCode
+     * @param string $shippingAmount
+     * @param string $shippingLabel
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function setShippingMethodAndCheckResponse(
+        string $shippingCarrierCode,
+        string $shippingMethodCode,
+        string $shippingAmount,
+        string $shippingLabel
+    ) {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $shippingAddress = $this->quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $shippingMethodCode,
+            $shippingCarrierCode,
+            $shippingAddressId
+        );
+
+        $response = $this->sendRequestWithToken($query);
+
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['carrier_code'], $shippingCarrierCode);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['method_code'], $shippingMethodCode);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['amount'], $shippingAmount);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['label'], $shippingLabel);
+    }
+
+    /**
+     * Generates query for setting the specified shipping method on cart
+     *
+     * @param string $maskedQuoteId
+     * @param string $shippingMethodCode
+     * @param string $shippingCarrierCode
+     * @param string $shippingAddressId
+     * @return string
+     */
+    private function prepareMutationQuery(
+        string $maskedQuoteId,
+        string $shippingMethodCode,
+        string $shippingCarrierCode,
+        string $shippingAddressId
+    ) : string {
+        return <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: 
+    {
+      cart_id: "$maskedQuoteId", 
+      shipping_methods: [{
+        cart_address_id: $shippingAddressId
+        method_code: "$shippingMethodCode"
+        carrier_code: "$shippingCarrierCode"
+      }]
+      }) {
+    
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+          amount
+        }
+      }
+    }
+  }
+}
+
+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);
+    }
+}
\ No newline at end of file

From a80943f529a337b36f59d3964a8448816f5e2532 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 6 Mar 2019 10:18:36 +0200
Subject: [PATCH 0376/1055] ENGCOM-20434: fixed type inconsistency

---
 .../ProcessUrlRewriteOnChangeProductVisibilityObserver.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
index 56393c619f4ef..2337bb3646bd7 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeProductVisibilityObserver.php
@@ -49,6 +49,6 @@ public function execute(Observer $observer)
             return;
         }
 
-        $this->adaptUrlRewritesToVisibility->execute($productIds, $visibility);
+        $this->adaptUrlRewritesToVisibility->execute($productIds, (int)$visibility);
     }
 }

From 0902e4fd3f51a3ad8ae24c4e914379df6252dfed Mon Sep 17 00:00:00 2001
From: Davit_Zakharyan <davit_zakharyan@epam.com>
Date: Wed, 6 Mar 2019 12:42:00 +0400
Subject: [PATCH 0377/1055] MAGETWO-91523: [2.3] Allowed countries restriction
 for a default website is applied to backend customer grid

- Added automated test script.
---
 .../SetAccountSharingOptionActionGroup.xml    |  25 ++++
 ...siteCountryOptionsToDefaultActionGroup.xml |  20 ++++
 ...dminStoresCustomerConfigurationSection.xml |   3 +
 .../Test/Mftf/Section/GeneralSection.xml      |   5 +
 ...CountriesRestrictionApplyOnBackendTest.xml | 113 ++++++++++++++++++
 .../Section/AdminDataGridHeaderSection.xml    |   1 +
 6 files changed, 167 insertions(+)
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/SetAccountSharingOptionActionGroup.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/SetMainWebsiteCountryOptionsToDefaultActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml

diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/SetAccountSharingOptionActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/SetAccountSharingOptionActionGroup.xml
new file mode 100644
index 0000000000000..113383a296d08
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/SetAccountSharingOptionActionGroup.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="SetAccountSharingOptionActionGroup">
+        <arguments>
+            <argument name="option" defaultValue="Per Website" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminStoresCustomerConfigurationPage.url}}" stepKey="goToCustomerConfigurationPage"/>
+        <conditionalClick selector="{{AdminStoresCustomerConfigurationSection.accountSharingOptionsTab}}" dependentSelector="{{AdminStoresCustomerConfigurationSection.shareCustomerAccountInherit}}" visible="false" stepKey="expandAccountSharingOptionsTab"/>
+        <waitForElementVisible selector="{{AdminStoresCustomerConfigurationSection.shareCustomerAccountInherit}}" stepKey="waitSystemValueCheckboxToBeVisible"/>
+        <uncheckOption selector="{{AdminStoresCustomerConfigurationSection.shareCustomerAccountInherit}}" stepKey="uncheck"/>
+        <selectOption selector="{{AdminStoresCustomerConfigurationSection.shareCustomerAccount}}" userInput="{{option}}" stepKey="setAccountSharingOption"/>
+        <click selector="{{AdminStoresCustomerConfigurationSection.accountSharingOptionsTab}}" stepKey="collapseTab"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig"/>
+        <waitForPageLoad stepKey="waitConfigToBeSaved"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/SetMainWebsiteCountryOptionsToDefaultActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/SetMainWebsiteCountryOptionsToDefaultActionGroup.xml
new file mode 100644
index 0000000000000..9b922df0b3e3e
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/SetMainWebsiteCountryOptionsToDefaultActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SetMainWebsiteCountryOptionsToDefaultActionGroup">
+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation3"/>
+        <waitForElementVisible selector="{{CountryOptionsSection.topDestinations}}" stepKey="waitCheckboxToBeVisible3"/>
+        <checkOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="setToDefault1"/>
+        <checkOption selector="{{CountryOptionsSection.generalCountryDefaultInherit}}" stepKey="setToDefault2"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveDefaultConfig"/>
+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
+        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
index 823be383ce123..634d3490df05c 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
@@ -10,5 +10,8 @@
         <element name="createNewAccOpt" type="button" selector="#customer_create_account-head"/>
         <element name="enableAutoAssignCustomerGroup" type="button" selector="#customer_create_account_auto_group_assign"/>
         <element name="groupForValidVATIdIntraUnion" type="select" selector="#customer_create_account_viv_intra_union_group"/>
+        <element name="accountSharingOptionsTab" type="button" selector="#customer_account_share-head"/>
+        <element name="shareCustomerAccountInherit" type="checkbox" selector="#customer_account_share_scope_inherit"/>
+        <element name="shareCustomerAccount" type="select" selector="#customer_account_share_scope"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
index d007c860782aa..dbec3683cf2d1 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
@@ -38,6 +38,11 @@
         <element name="countryOptions" type="button" selector="#general_country-head"/>
         <element name="countryOptionsOpen" type="button" selector="#general_country-head.open"/>
         <element name="topDestinations" type="select" selector="#general_country_destinations"/>
+        <element name="allowedCountries" type="select" selector="#general_country_allow"/>
+        <element name="notAllowedCountry" type="button" selector="#general_country_allow option:not([selected])"/>
+        <element name="generalCountryAllowInherit" type="checkbox" selector="#general_country_allow_inherit"/>
+        <element name="generalCountryDefaultInherit" type="checkbox" selector="#general_country_default_inherit"/>
+        <element name="generalCountryDefault" type="select" selector="#general_country_default"/>
     </section>
     <section name="StateOptionsSection">
         <element name="stateOptions" type="button" selector="#general_region-head"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
new file mode 100644
index 0000000000000..5939d5cdaada7
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -0,0 +1,113 @@
+<?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="AllowedCountriesRestrictionApplyOnBackendTest">
+        <annotations>
+            <title value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
+            <description value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
+            <features value="Module/ Customer"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-6441"/>
+            <useCaseId value="MAGETWO-91523"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+
+            <!--Create new website,store and store view-->
+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="goToAdminSystemStorePage"/>
+            <actionGroup ref="AdminCreateWebsite" stepKey="AdminCreateNewWebsite">
+                <argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
+                <argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStore" stepKey="AdminCreateNewStore">
+                <argument name="website" value="{{NewWebSiteData.name}}"/>
+                <argument name="storeGroupName" value="{{NewStoreData.name}}"/>
+                <argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreView" stepKey="AdminCreateNewStoreView">
+                <argument name="StoreGroup" value="NewStoreData"/>
+            </actionGroup>
+            <!--Set account sharing option - Default value is 'Per Website'-->
+            <actionGroup ref="SetAccountSharingOptionActionGroup" stepKey="setAccountSharingOptionToDefault"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        </before>
+        <after>
+            <!--delete all created data and set main website country options to default-->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
+                <argument name="websiteName" value="{{NewWebSiteData.name}}"/>
+            </actionGroup>
+            <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigGeneralPage2"/>
+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup">
+                <argument name="website" value="_defaultWebsite"/>
+            </actionGroup>
+            <actionGroup ref="SetMainWebsiteCountryOptionsToDefaultActionGroup" stepKey="setCountryOptionsToDefault"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Check that all countries are allowed initially and get amount-->
+        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigGeneralPage"/>
+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation"/>
+        <waitForElementVisible selector="{{CountryOptionsSection.allowedCountries}}" stepKey="waitTabToExpand"/>
+        <executeJS function="return document.querySelectorAll('{{CountryOptionsSection.allowedCountries}} option').length" stepKey="CountriesAmount"/>
+        <checkOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="markAllCountriesAsAvailable"/>
+        <click selector="{{CountryOptionsSection.countryOptions}}" stepKey="collapseTab"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
+        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
+        <!-- Create customer for US -->
+        <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
+        <!-- Switch to first website, allow only Canada and set Canada as default country-->
+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup">
+            <argument name="website" value="_defaultWebsite"/>
+        </actionGroup>
+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation2"/>
+        <waitForElementVisible selector="{{CountryOptionsSection.allowedCountries}}" stepKey="waitAllowedCountriesToBeVisible"/>
+        <uncheckOption selector="{{CountryOptionsSection.generalCountryDefaultInherit}}" stepKey="uncheckCheckbox1"/>
+        <selectOption selector="{{CountryOptionsSection.generalCountryDefault}}" userInput="Canada" stepKey="chooseCanada1"/>
+        <uncheckOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="uncheckCheckbox2"/>
+        <selectOption selector="{{CountryOptionsSection.allowedCountries}}" userInput="Canada" stepKey="chooseCanada2"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig2"/>
+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration2"/>
+        <!--Switch to second website and allow all countries except Canada-->
+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup2">
+            <argument name="website" value="NewWebSiteData"/>
+        </actionGroup>
+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation3"/>
+        <waitForElementVisible selector="{{CountryOptionsSection.allowedCountries}}" stepKey="waitAllowedCountriesToBeVisible2"/>
+        <uncheckOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="uncheckCheckbox3"/>
+        <unselectOption selector="{{CountryOptionsSection.allowedCountries}}" userInput="Canada" stepKey="unselectCanada"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig3"/>
+        <waitForPageLoad stepKey="waitForSavingSystemConfiguration3"/>
+        <amOnPage url="{{AdminEditCustomerPage.url($$createCustomer.id$$)}}" stepKey="goToCustomerEditPage"/>
+        <waitForPageLoad stepKey="waitPageToLoad"/>
+        <!--Open created customer details page and change US address to Canada address-->
+        <actionGroup ref="OpenEditCustomerAddressFromAdminActionGroup" stepKey="editCustomerAddress">
+            <argument name="address" value="US_Address_CA"/>
+        </actionGroup>
+        <selectOption selector="{{AdminEditCustomerAddressesSection.country}}" userInput="Canada" stepKey="selectCountry"/>
+        <selectOption selector="{{AdminEditCustomerAddressesSection.state}}" userInput="Quebec" stepKey="selectState"/>
+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="saveAddress"/>
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <click stepKey="saveCustomer" selector="{{AdminCustomerAccountInformationSection.saveCustomerAndContinueEdit}}"/>
+        <waitForPageLoad stepKey="waitForCustomersPage"/>
+        <!--Go to Customers grid and check that filter countries amount is the same as initial allowed countries amount-->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersGrid"/>
+        <waitForPageLoad stepKey="waitForCustomersGrid"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomersGrid"/>
+        <executeJS function="var len = document.querySelectorAll('{{AdminDataGridHeaderSection.countryOptions}}').length; return len-1;" stepKey="CountriesAmount2"/>
+        <assertEquals expected='($CountriesAmount)' expectedType="integer" actual="($CountriesAmount2)" stepKey="assertCountryAmounts"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
index 4ee38e30f98e6..f881cf5c05cfc 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
@@ -16,6 +16,7 @@
         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
         <element name="filterFieldInput" type="input" selector=".admin__data-grid-filters input[name='{{name}}']" parameterized="true"/>
         <element name="filterFieldSelect" type="select" selector=".admin__data-grid-filters select[name='{{name}}']" parameterized="true"/>
+        <element name="countryOptions" type="button" selector=".admin__data-grid-filters select[name=billing_country_id] option"/>
         <element name="cancelFilters" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>

From fd3344be60488b5f59c4fcffb1080c2a7689ad81 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 6 Mar 2019 11:18:49 +0200
Subject: [PATCH 0378/1055] ENGCOM-4400: Static test fix.

---
 app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index 5364f6bd21e15..eecfa65b189d1 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -15,7 +15,7 @@ define([
             var items, i, reload;
 
             $(this.options.emptyCartButton).on('click', $.proxy(function (event) {
-                if (event.detail == 0) {
+                if (event.detail === 0) {
                     return;
                 }
 

From 990a373803fc004b5da6bd20ca9d3149744a9f42 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 6 Mar 2019 12:38:37 +0200
Subject: [PATCH 0379/1055] 429 - Test coverage: nonExistentCart 1. Add none
 existing cart test - Could not find a cart with ID "non_existent_masked_id"

---
 .../Customer/SetBillingAddressOnCartTest.php  | 34 +++++++++++++++++++
 .../Customer/SetPaymentMethodOnCartTest.php   | 34 +++++++++++++++++++
 .../Guest/SetBillingAddressOnCartTest.php     | 33 ++++++++++++++++++
 .../Guest/SetPaymentMethodOnCartTest.php      | 33 ++++++++++++++++++
 4 files changed, 134 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 1a93c011e80a8..06926e0a0b2e9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -403,6 +403,40 @@ public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testSetBillingAddressOnNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getCartQuery($maskedQuoteId);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartQuery(
+        string $maskedQuoteId
+    ) : string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+      qty
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index bbc77b6c39740..a2bbbfe135fa1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -151,6 +151,40 @@ public function testSetPaymentMethodToAnotherCustomerCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testPaymentMethodOnNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getCartQuery($maskedQuoteId);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartQuery(
+        string $maskedQuoteId
+    ) : string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+      qty
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 880d6aa0f406f..0bb7c9741197f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -244,6 +244,39 @@ public function testSetBillingAddressFromAddressBook()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testSetBillingAddressOnNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getCartQuery($maskedQuoteId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartQuery(
+        string $maskedQuoteId
+    ) : string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+      qty
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 7484b2af7569d..5117fce04a915 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -126,6 +126,17 @@ public function testSetPaymentMethodToCustomerCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testSetPaymentOnNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getCartQuery($maskedQuoteId);
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode
@@ -155,6 +166,28 @@ private function prepareMutationQuery(
 QUERY;
     }
 
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartQuery(
+        string $maskedQuoteId
+    ) : string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+      qty
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+
     /**
      * @param string $reversedQuoteId
      * @param int $customerId

From cf6e2d1a4baa9e609a7b5b3e6ad4d87b1f8c86f2 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 6 Mar 2019 13:25:13 +0200
Subject: [PATCH 0380/1055] Fix static tests.

---
 .../Newsletter/Controller/Subscriber/Confirm.php      | 11 +++++++++--
 .../Newsletter/Controller/Subscriber/NewAction.php    |  1 +
 .../Newsletter/Controller/Subscriber/Unsubscribe.php  |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
index fc25b56a40095..957b0f64532b8 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
@@ -4,12 +4,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Newsletter\Controller\Subscriber;
 
-class Confirm extends \Magento\Newsletter\Controller\Subscriber
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Confirm subscritpion controller.
+ */
+class Confirm extends \Magento\Newsletter\Controller\Subscriber implements HttpGetActionInterface
 {
     /**
-     * Subscription confirm action
+     * Subscription confirm action.
+     *
      * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index a8599df2a89df..7557f1610b4f4 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Newsletter\Controller\Subscriber;
 
 use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
index 03389558cb6c0..e37a3786e140a 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Unsubscribe.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Newsletter\Controller\Subscriber;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;

From d25acf2d178c53210b24313116f72a6f83c50de0 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Wed, 6 Mar 2019 13:56:14 +0300
Subject: [PATCH 0381/1055] MAGETWO-96127: [2.3.x] Catalog grid page number
 resets after Save and Close action.

- Support statefull current page.
---
 .../Ui/view/base/web/js/grid/paging/paging.js       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
index 11fdbad21d251..bfd35d1092dd8 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
@@ -19,7 +19,9 @@ define([
         defaults: {
             template: 'ui/grid/paging/paging',
             totalTmpl: 'ui/grid/paging-total',
+            totalRecords: 0,
             pageSize: 20,
+            pages: 1,
             current: 1,
             selectProvider: 'ns = ${ $.ns }, index = ids',
 
@@ -45,11 +47,12 @@ define([
             },
 
             statefull: {
+                pageSize: true,
                 current: true
             },
 
             listens: {
-                'pages': 'updateCounter',
+                'pages': 'onPagesChange',
                 'pageSize': 'onPageSizeChange',
                 'totalRecords': 'updateCounter',
                 '${ $.provider }:params.filters': 'goFirst'
@@ -225,13 +228,11 @@ define([
         /**
          * Calculates new page cursor based on the
          * previous and current page size values.
-         *
-         * @returns {Number} Updated cursor value.
          */
         updateCursor: function () {
             var cursor  = this.current - 1,
                 size    = this.pageSize,
-                oldSize = this.previousSize,
+                oldSize = typeof this.previousSize === 'undefined' ? this.pageSize : this.previousSize,
                 delta   = cursor * (oldSize  - size) / size;
 
             delta = size > oldSize ?
@@ -242,9 +243,7 @@ define([
 
             this.previousSize = size;
 
-            if (delta) {
-                this.setPage(cursor);
-            }
+            this.setPage(cursor);
 
             return this;
         },

From 67f6c81864f6774df7e282c66115f8a2adbbb4b6 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 6 Mar 2019 13:56:24 +0200
Subject: [PATCH 0382/1055] Fix static tests.

---
 .../Catalog/Api/ProductRenderListInterface.php      | 10 +++++++---
 .../Block/Product/View/Options/AbstractOptions.php  |  7 ++++++-
 app/code/Magento/Checkout/Block/Cart/Totals.php     | 13 +++++++++++++
 .../Customer/Model/Attribute/Data/Postcode.php      |  7 +++++--
 .../Model/Product/Type/PriceWithDimensionTest.php   |  1 +
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
index 508bdcb290e63..954acd35a07db 100644
--- a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
@@ -4,18 +4,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Api;
 
 /**
- * Interface which provides product renders information for products
+ * Interface which provides product renders information for products.
+ *
  * @api
  * @since 101.1.0
  */
 interface ProductRenderListInterface
 {
     /**
-     * Collect and retrieve the list of product render info
-     * This info contains raw prices and formatted prices, product name, stock status, store_id, etc
+     * Collect and retrieve the list of product render info.
+     *
+     * This info contains raw prices and formatted prices, product name, stock status, store_id, etc.
+     *
      * @see \Magento\Catalog\Api\Data\ProductRenderInfoDtoInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 2a410cba01c0e..059580b9b5eae 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -9,11 +9,14 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
+
 namespace Magento\Catalog\Block\Product\View\Options;
 
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
 
 /**
+ * Product aoptions section abstract block.
+ *
  * @api
  * @since 100.0.2
  */
@@ -46,7 +49,7 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
-     * @param \Magento\Catalog\Helper\Data $catalogData,
+     * @param \Magento\Catalog\Helper\Data $catalogData
      * @param array $data
      */
     public function __construct(
@@ -123,6 +126,8 @@ public function getFormattedPrice()
     }
 
     /**
+     * Retrieve formatted price.
+     *
      * @return string
      *
      * @deprecated
diff --git a/app/code/Magento/Checkout/Block/Cart/Totals.php b/app/code/Magento/Checkout/Block/Cart/Totals.php
index 52eb5fa0ad6c4..7ac5c1c149cc6 100644
--- a/app/code/Magento/Checkout/Block/Cart/Totals.php
+++ b/app/code/Magento/Checkout/Block/Cart/Totals.php
@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Block\Cart;
 
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
 
 /**
+ * Totals cart block.
+ *
  * @api
  */
 class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
@@ -62,6 +65,8 @@ public function __construct(
     }
 
     /**
+     * Retrieve encoded js layout.
+     *
      * @return string
      */
     public function getJsLayout()
@@ -74,6 +79,8 @@ public function getJsLayout()
     }
 
     /**
+     * Retrieve totals from cache.
+     *
      * @return array
      */
     public function getTotals()
@@ -85,6 +92,8 @@ public function getTotals()
     }
 
     /**
+     * Set totals to cache.
+     *
      * @param array $value
      * @return $this
      * @codeCoverageIgnore
@@ -96,6 +105,8 @@ public function setTotals($value)
     }
 
     /**
+     * Create totals block and set totals.
+     *
      * @param string $code
      * @return BlockInterface
      */
@@ -121,6 +132,8 @@ protected function _getTotalRenderer($code)
     }
 
     /**
+     * Get totals html.
+     *
      * @param mixed $total
      * @param int|null $area
      * @param int $colspan
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
index a46663d86a184..b1602e8ca1939 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model\Attribute\Data;
 
 use Magento\Directory\Helper\Data as DirectoryHelper;
@@ -13,7 +14,8 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface as MagentoTimezone;
 
 /**
- * Customer Address Postal/Zip Code Attribute Data Model
+ * Customer Address Postal/Zip Code Attribute Data Model.
+ *
  * This Data Model Has to Be Set Up in additional EAV attribute table
  */
 class Postcode extends \Magento\Eav\Model\Attribute\Data\AbstractData
@@ -40,7 +42,8 @@ public function __construct(
     }
 
     /**
-     * Validate postal/zip code
+     * Validate postal/zip code.
+     *
      * Return true and skip validation if country zip code is optional
      *
      * @param array|string $value
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
index a2906993a7c53..fe39de2729eac 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product\Type;

From 435d698ffd31c779eac0768f7aef5af24e8648df Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 6 Mar 2019 15:17:34 +0300
Subject: [PATCH 0383/1055] MAGETWO-64838: Unable to create order from store
 front if customer address custom attribute is required.

- Code refactoring;
---
 .../Magento/Customer/Controller/Address/File/Upload.php   | 2 +-
 .../Webapi/CustomAttribute/PreprocessorInterface.php      | 8 ++++----
 .../Magento/Framework/Webapi/ServiceInputProcessor.php    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Address/File/Upload.php b/app/code/Magento/Customer/Controller/Address/File/Upload.php
index dbbea482b0e52..adb4c7abd1729 100644
--- a/app/code/Magento/Customer/Controller/Address/File/Upload.php
+++ b/app/code/Magento/Customer/Controller/Address/File/Upload.php
@@ -91,6 +91,7 @@ public function execute()
                     $result = $this->processError(($errorMessage));
                 } else {
                     $result = $fileUploader->upload();
+                    $this->moveTmpFileToSuitableFolder($result);
                 }
             }
         } catch (LocalizedException $e) {
@@ -100,7 +101,6 @@ public function execute()
             $result = $this->processError($e->getMessage(), $e->getCode());
         }
 
-        $this->moveTmpFileToSuitableFolder($result);
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         $resultJson->setData($result);
diff --git a/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
index 0f8743f057601..26a13ebcc07b7 100644
--- a/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
@@ -11,19 +11,19 @@
 interface PreprocessorInterface
 {
     /**
-     * Check if this attribute data should be prepared
+     * Check if this attribute data should be processed
      *
      * @param string $key
      * @param mixed $attribute
      * @return bool
      */
-    public function shouldBePrepared($key, $attribute);
+    public function shouldBeProcessed($key, $attribute);
 
     /**
-     * Prepare attribute object according to type rules
+     * Process attribute object according to type rules
      *
      * @param string $key
      * @param mixed $attribute
      */
-    public function prepare($key, &$attribute);
+    public function process($key, &$attribute);
 }
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index 616cbd6596522..45f2a8b931101 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -349,8 +349,8 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
     private function runCustomAttributePreprocessors($key, &$customAttribute)
     {
         foreach ($this->customAttributePreprocessors as $attributePreprocessor) {
-            if ($attributePreprocessor->shouldBePrepared($key, $customAttribute)) {
-                $attributePreprocessor->prepare($key, $customAttribute);
+            if ($attributePreprocessor->shouldBeProcessed($key, $customAttribute)) {
+                $attributePreprocessor->process($key, $customAttribute);
             }
         }
     }

From e1d5544a5a09d44420df6a787f54774e1072ecdb Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 6 Mar 2019 14:27:21 +0200
Subject: [PATCH 0384/1055] graphQl-427: adjusted code coverage of set shipping
 address feature

---
 .../SetShippingAddressOnCartTest.php          | 195 +++-----
 .../Guest/SetShippingAddressOnCartTest.php    | 442 ++++++++++++++++++
 2 files changed, 496 insertions(+), 141 deletions(-)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/{ => Customer}/SetShippingAddressOnCartTest.php (71%)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
similarity index 71%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 4916bb2aa78c3..1d381bc944ec1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -5,17 +5,14 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\Quote;
+namespace Magento\GraphQl\Quote\Customer;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Multishipping\Helper\Data;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\TestFramework\ObjectManager;
 
 /**
  * Test for set shipping addresses on cart mutation
@@ -53,10 +50,11 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      */
-    public function testSetNewShippingAddressByGuest()
+    public function testSetNewShippingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->assignQuoteToCustomer();
 
         $query = <<<QUERY
 mutation {
@@ -91,8 +89,8 @@ public function testSetNewShippingAddressByGuest()
         postcode
         telephone
         country {
-          code
           label
+          code
         }
         address_type
       }
@@ -100,7 +98,7 @@ public function testSetNewShippingAddressByGuest()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
         $cartResponse = $response['setShippingAddressesOnCart']['cart'];
@@ -111,12 +109,15 @@ public function testSetNewShippingAddressByGuest()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage The current customer isn't authorized.
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @dataProvider requestWithoutRequiredParamsDataProvider
+     * @param string $params
+     * @param string $expectedException
+     * @throws \Exception
      */
-    public function testSetShippingAddressFromAddressBookByGuest()
+    public function testSetNewShippingAddressWithEmptyRequiredParams(string $params, string $expectedException)
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->assignQuoteToCustomer();
 
         $query = <<<QUERY
 mutation {
@@ -125,7 +126,9 @@ public function testSetShippingAddressFromAddressBookByGuest()
       cart_id: "$maskedQuoteId"
       shipping_addresses: [
         {
-          customer_address_id: 1
+          address: {
+            $params
+          }
         }
       ]
     }
@@ -138,16 +141,21 @@ public function testSetShippingAddressFromAddressBookByGuest()
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->expectExceptionMessage(
+            $expectedException
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
      */
-    public function testSetNewShippingAddressByRegisteredCustomer()
+    public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_virtual_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -174,30 +182,13 @@ public function testSetNewShippingAddressByRegisteredCustomer()
   ) {
     cart {
       shipping_addresses {
-        firstname
-        lastname
-        company
-        street
         city
-        postcode
-        telephone
-        country {
-          label
-          code
-        }
-        address_type
       }
     }
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-
-        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
-        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
-        self::assertArrayHasKey('shipping_addresses', $cartResponse);
-        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
-        $this->assertNewShippingAddressFields($shippingAddressResponse);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -205,7 +196,7 @@ public function testSetNewShippingAddressByRegisteredCustomer()
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
      */
-    public function testSetShippingAddressFromAddressBookByRegisteredCustomer()
+    public function testSetShippingAddressFromAddressBook()
     {
         $maskedQuoteId = $this->assignQuoteToCustomer();
 
@@ -277,36 +268,6 @@ public function testSetNotExistedShippingAddressFromAddressBook()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage The shipping address must contain either "customer_address_id" or "address".
-     */
-    public function testSetShippingAddressWithoutAddresses()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
-
-        $query = <<<QUERY
-mutation {
-  setShippingAddressesOnCart(
-    input: {
-      cart_id: "$maskedQuoteId"
-      shipping_addresses: [
-        {}
-      ]
-    }
-  ) {
-    cart {
-      shipping_addresses {
-        city
-      }
-    }
-  }
-}
-QUERY;
-        $this->graphQlQuery($query);
-    }
-
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
@@ -355,13 +316,15 @@ public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
     }
 
     /**
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage You cannot specify multiple shipping addresses.
+     * @expectedExceptionMessage The current user cannot use address with ID "1"
      */
-    public function testSetMultipleNewShippingAddresses()
+    public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 2);
 
         $query = <<<QUERY
 mutation {
@@ -370,57 +333,21 @@ public function testSetMultipleNewShippingAddresses()
       cart_id: "$maskedQuoteId"
       shipping_addresses: [
         {
-          address: {
-            firstname: "test firstname"
-            lastname: "test lastname"
-            company: "test company"
-            street: ["test street 1", "test street 2"]
-            city: "test city"
-            region: "test region"
-            postcode: "887766"
-            country_code: "US"
-            telephone: "88776655"
-            save_in_address_book: false
-          }
-        },
-        {
-          address: {
-            firstname: "test firstname 2"
-            lastname: "test lastname 2"
-            company: "test company 2"
-            street: ["test street 1", "test street 2"]
-            city: "test city"
-            region: "test region"
-            postcode: "887766"
-            country_code: "US"
-            telephone: "88776655"
-            save_in_address_book: false
-          }
+          customer_address_id: 1
         }
       ]
     }
   ) {
     cart {
       shipping_addresses {
-        city
+        postcode
       }
     }
   }
 }
 QUERY;
-        /** @var \Magento\Config\Model\ResourceModel\Config $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
-        $config->saveConfig(
-            Data::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE,
-            null,
-            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-            0
-        );
-        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-        $config->reinit();
 
-        $this->graphQlQuery($query);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
@@ -428,11 +355,10 @@ public function testSetMultipleNewShippingAddresses()
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The current user cannot use address with ID "1"
      */
-    public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
+    public function testSetShippingAddressIfCustomerIsNotOwnerOfCart()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 2);
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
 
         $query = <<<QUERY
 mutation {
@@ -454,10 +380,27 @@ public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
   }
 }
 QUERY;
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
 
         $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
+    /**
+     * TODO: currently only the city param is required, do we need to add at least ZIP code?
+     * @return array
+     */
+    public function requestWithoutRequiredParamsDataProvider()
+    {
+        return [
+            [
+                'save_in_address_book: false',
+                'Field CartAddressInput.city of required type String! was not provided'
+            ]
+        ];
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
@@ -512,18 +455,6 @@ private function getHeaderMap(string $username = 'customer@example.com', string
         return $headerMap;
     }
 
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $reversedQuoteId
      * @param int $customerId
@@ -539,22 +470,4 @@ private function assignQuoteToCustomer(
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
-
-    public function tearDown()
-    {
-        /** @var \Magento\Config\Model\ResourceModel\Config $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
-
-        //default state of multishipping config
-        $config->saveConfig(
-            Data::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE,
-            1,
-            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-            0
-        );
-
-        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-        $config->reinit();
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
new file mode 100644
index 0000000000000..522091c1eb2bf
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -0,0 +1,442 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Multishipping\Helper\Data;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * Test for set shipping addresses on cart mutation
+ */
+class SetShippingAddressOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testSetNewShippingAddress()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        address_type
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
+        $this->assertNewShippingAddressFields($shippingAddressResponse);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
+     */
+    public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testSetShippingAddressFromAddressBook()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The shipping address must contain either "customer_address_id" or "address".
+     */
+    public function testSetShippingAddressWithoutAddresses()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {}
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @dataProvider requestWithoutRequiredParamsDataProvider
+     * @param string $params
+     * @param string $expectedException
+     * @throws \Exception
+     */
+    public function testSetNewShippingAddressWithEmptyRequiredParams(string $params, string $expectedException)
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            $params
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage(
+            $expectedException
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage You cannot specify multiple shipping addresses.
+     */
+    public function testSetMultipleNewShippingAddresses()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        },
+        {
+          address: {
+            firstname: "test firstname 2"
+            lastname: "test lastname 2"
+            company: "test company 2"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        /** @var \Magento\Config\Model\ResourceModel\Config $config */
+        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
+        $config->saveConfig(
+            Data::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE,
+            null,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            0
+        );
+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
+        $config = ObjectManager::getInstance()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->reinit();
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     */
+    public function testSetShippingAddressIfCustomerIsNotOwnerOfCart()
+    {
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        postcode
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Verify the all the whitelisted fields for a New Address Object
+     *
+     * @param array $shippingAddressResponse
+     */
+    private function assertNewShippingAddressFields(array $shippingAddressResponse): void
+    {
+        $assertionMap = [
+            ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
+            ['response_field' => 'lastname', 'expected_value' => 'test lastname'],
+            ['response_field' => 'company', 'expected_value' => 'test company'],
+            ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
+            ['response_field' => 'city', 'expected_value' => 'test city'],
+            ['response_field' => 'postcode', 'expected_value' => '887766'],
+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
+            ['response_field' => 'address_type', 'expected_value' => 'SHIPPING']
+        ];
+
+        $this->assertResponseFields($shippingAddressResponse, $assertionMap);
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @param int $customerId
+     * @return string
+     */
+    private function assignQuoteToCustomer(
+        string $reversedQuoteId = 'test_order_with_simple_product_without_address',
+        int $customerId = 1
+    ): string {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $quote->setCustomerId($customerId);
+        $this->quoteResource->save($quote);
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * TODO: currently only the city param is required, do we need to add at least ZIP code?
+     * @return array
+     */
+    public function requestWithoutRequiredParamsDataProvider()
+    {
+        return [
+            [
+                'save_in_address_book: false',
+                'Field CartAddressInput.city of required type String! was not provided'
+            ]
+        ];
+    }
+
+    public function tearDown()
+    {
+        /** @var \Magento\Config\Model\ResourceModel\Config $config */
+        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
+
+        //default state of multishipping config
+        $config->saveConfig(
+            Data::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE,
+            1,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            0
+        );
+
+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
+        $config = ObjectManager::getInstance()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->reinit();
+    }
+}

From 61f9a74d2a1f91cebeb09a1cde880b2c7287a4f4 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 6 Mar 2019 16:22:43 +0300
Subject: [PATCH 0385/1055] MAGETWO-70232: [GITHUB] Import customizable options
 adds it to another product if same SKU is filled#9457

- Fixed an issue with incorrect options saving on new created product;
---
 app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index d210670920ef1..4d5dd57b76f61 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -58,8 +58,7 @@ public function execute($entity, $arguments = [])
             }
         }
         if ($options) {
-            $hasChangedSku = ($entity->getOrigData('sku') !== null && $entity->dataHasChangedFor('sku'));
-            $this->processOptionsSaving($options, $hasChangedSku, $entity->getSku());
+            $this->processOptionsSaving($options, $entity->dataHasChangedFor('sku'), $entity->getSku());
         }
 
         return $entity;

From 40500a7793797e489e3b132e12fe8e3a47c2c050 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Wed, 6 Mar 2019 19:06:14 +0530
Subject: [PATCH 0386/1055] Fixed typo mistake

---
 lib/internal/Magento/Framework/App/FrontControllerInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/App/FrontControllerInterface.php b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
index a552d88e68f50..afd3091097d19 100644
--- a/lib/internal/Magento/Framework/App/FrontControllerInterface.php
+++ b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
@@ -8,7 +8,7 @@
 /**
  * Application front controller responsible for dispatching application requests.
  * Front controller contains logic common for all actions.
- * Evary application area has own front controller
+ * Every application area has own front controller.
  *
  * @api
  */

From d583606dd48748d7ac6571e987c8b04cd8ae19e7 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Wed, 6 Mar 2019 15:53:28 +0200
Subject: [PATCH 0387/1055] MAGETWO-96416: Clicking on a Root Category causes
 all other Root Categories to be expanded to the top-level categories

---
 app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index a67f55235b6df..479e212924f23 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -367,7 +367,7 @@ protected function _getNodeJson($node, $level = 0)
             }
         }
 
-        if ($isParent || $node->getLevel() < 2) {
+        if ($isParent || $node->getLevel() < 1) {
             $item['expanded'] = true;
         }
 

From 4b89ee0063b69c80e52bbfab9be1830acff60266 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 5 Mar 2019 16:53:36 +0100
Subject: [PATCH 0388/1055] Cart totals implementation

---
 .../QuoteGraphQl/Model/Resolver/CartTaxes.php |  65 +++++++++
 .../QuoteGraphQl/Model/Resolver/Totals.php    |  74 ++++++++++
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |  14 ++
 .../GraphQl/Quote/Customer/CartTotalsTest.php | 132 ++++++++++++++++++
 .../_files/product_simple_with_tax.php        |  45 ++++++
 .../product_simple_with_tax_rollback.php      |   8 ++
 .../Checkout/_files/quote_with_tax.php        |  67 +++++++++
 .../_files/quote_with_tax_rollback.php        |  22 +++
 .../_files/customer_with_tax_group.php        |  10 ++
 .../customer_with_tax_group_rollback.php      |   7 +
 10 files changed, 444 insertions(+)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Resolver/CartTaxes.php
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group_rollback.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartTaxes.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartTaxes.php
new file mode 100644
index 0000000000000..53782c488fb82
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartTaxes.php
@@ -0,0 +1,65 @@
+<?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\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\TotalsCollector;
+
+/**
+ * @inheritdoc
+ */
+class CartTaxes implements ResolverInterface
+{
+    /**
+     * @var TotalsCollector
+     */
+    private $totalsCollector;
+
+    /**
+     * @param TotalsCollector $totalsCollector
+     */
+    public function __construct(
+        TotalsCollector $totalsCollector
+    ) {
+        $this->totalsCollector = $totalsCollector;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        $data = [];
+
+        /** @var Quote $quote */
+        $quote = $value['model'];
+        $appliedTaxes = $this->totalsCollector->collectQuoteTotals($value['model'])->getAppliedTaxes();
+
+        if (count($appliedTaxes) == 0) {
+            return [];
+        }
+
+        $currency = $quote->getQuoteCurrencyCode();
+        foreach ($appliedTaxes as $appliedTax) {
+            $data[] = [
+                'label' => $appliedTax['id'],
+                'amount' => ['value' => $appliedTax['amount'], 'currency' => $currency]
+            ];
+        }
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php
new file mode 100644
index 0000000000000..fd77d7a9d0efe
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php
@@ -0,0 +1,74 @@
+<?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\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CartTotalRepositoryInterface;
+
+/**
+ * @inheritdoc
+ */
+class Totals implements ResolverInterface
+{
+    /**
+     * @var CartTotalRepositoryInterface
+     */
+    private $cartTotalRepository;
+
+    /**
+     * @param CartTotalRepositoryInterface $cartTotalRepository
+     */
+    public function __construct(
+        CartTotalRepositoryInterface $cartTotalRepository
+    ) {
+        $this->cartTotalRepository = $cartTotalRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        $cartTotals = $this->cartTotalRepository->get($value['model']->getId());
+
+        $currency = $cartTotals->getQuoteCurrencyCode();
+        $data = $this->addCurrencyCode([
+            'grand_total' => ['value' => $cartTotals->getGrandTotal(), ],
+            'subtotal_including_tax' => ['value' => $cartTotals->getSubtotalInclTax()],
+            'subtotal_excluding_tax' => ['value' => $cartTotals->getSubtotal()],
+            'subtotal_with_discount_excluding_tax' => ['value' => $cartTotals->getSubtotalWithDiscount()]
+        ], $currency);
+
+        $data['model'] = $value['model'];
+
+        return $data;
+    }
+
+    /**
+     * Adds currency code to the totals
+     *
+     * @param array $totals
+     * @param string|null $currencyCode
+     * @return array
+     */
+    private function addCurrencyCode(array $totals, $currencyCode): array
+    {
+        foreach ($totals as &$total) {
+            $total['currency'] = $currencyCode;
+        }
+
+        return $totals;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index e4ced2351572c..24694303f4ec7 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -120,6 +120,19 @@ input PaymentMethodInput {
     additional_data: PaymentMethodAdditionalDataInput
 }
 
+type CartPrices {
+    grand_total: Money
+    subtotal_including_tax: Money
+    subtotal_excluding_tax: Money
+    subtotal_with_discount_excluding_tax: Money
+    applied_taxes: [CartTaxItem] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartTaxes")
+}
+
+type CartTaxItem {
+    amount: Money!
+    label: String!
+}
+
 input PaymentMethodAdditionalDataInput {
 }
 
@@ -150,6 +163,7 @@ type Cart {
     billing_address: CartAddress! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
     available_payment_methods: [AvailablePaymentMethod]  @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AvailablePaymentMethods") @doc(description: "Available payment methods")
     selected_payment_method: SelectedPaymentMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SelectedPaymentMethod")
+    prices: CartPrices @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Totals")
 }
 
 type CartAddress {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
new file mode 100644
index 0000000000000..36da00bdfa790
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test getting cart totals for registered customer
+ */
+class CartTotalsTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quoteFactory = $objectManager->create(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->create(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_tax.php
+     */
+    public function testGetCartTotalsForCustomerWithTaxApplied()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_tax');
+
+        $query = <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    prices {
+      grand_total {
+        value,
+        currency
+      }
+      subtotal_including_tax {
+        value
+        currency
+      }
+      subtotal_excluding_tax {
+        value
+        currency
+      }
+      subtotal_with_discount_excluding_tax {
+        value
+        currency
+      }
+      applied_taxes {
+        label
+        amount {
+          value
+          currency
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->sendRequestWithToken($query);
+
+        self::assertArrayHasKey('prices', $response['cart']);
+        $pricesResponse = $response['cart']['prices'];
+        self::assertEquals(10, $pricesResponse['grand_total']['value']);
+        self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+
+        $appliedTaxesResponse = $pricesResponse['applied_taxes'];
+
+        self::assertEquals('US-CA-*-Rate 1', $appliedTaxesResponse[0]['label']);
+        self::assertEquals(0.83, $appliedTaxesResponse[0]['amount']['value']);
+        self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * 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/Catalog/_files/product_simple_with_tax.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax.php
new file mode 100644
index 0000000000000..00c2e66736468
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory as TaxClassCollectionFactory;
+use Magento\Tax\Model\ClassModel as TaxClassModel;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->create(ProductFactory::class);
+$product = $productFactory->create();
+$product
+    ->setTypeId('simple')
+    ->setId(1)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple')
+    ->setPrice(10)
+    ->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(['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1])
+    ->setQty(22);
+
+
+/** @var TaxClassCollectionFactory $taxClassCollectionFactory */
+$taxClassCollectionFactory = $objectManager->create(TaxClassCollectionFactory::class);
+$taxClassCollection = $taxClassCollectionFactory->create();
+
+/** @var TaxClassModel $taxClass */
+$taxClassCollection->addFieldToFilter('class_type', TaxClassModel::TAX_CLASS_TYPE_PRODUCT);
+$taxClass = $taxClassCollection->getFirstItem();
+
+$product->setCustomAttribute('tax_class_id', $taxClass->getClassId());
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax_rollback.php
new file mode 100644
index 0000000000000..a7d58fdf7f6f6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/product_simple_rollback.php';
+require __DIR__ . '/../../Tax/_files/tax_classes_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax.php
new file mode 100644
index 0000000000000..a8a02f5fe87e5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+
+require __DIR__ . '/../../Customer/_files/customer_with_tax_group.php';
+require __DIR__ . '/../../Customer/_files/customer_address.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_tax.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var AddressRepositoryInterface $addressRepository */
+$addressRepository = $objectManager->get(AddressRepositoryInterface::class);
+$customerAddress = $addressRepository->getById(1);
+$customerAddress->setRegionId(12); // Taxable region
+$addressRepository->save($customerAddress);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+$customer = $customerRepository->get('customer@example.com');
+
+/** @var Address  $quoteAddress */
+$quoteAddress = $objectManager->create(Address::class);
+$quoteAddress->importCustomerAddressData($customerAddress);
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+$quote->setStoreId(
+    1
+)->setIsActive(
+    true
+)->setIsMultiShipping(
+    false
+)->assignCustomer(
+    $customer
+)->setShippingAddress(
+    $quoteAddress
+)->setBillingAddress(
+    $quoteAddress
+)->setCheckoutMethod(
+    'customer'
+)->setReservedOrderId(
+    'test_order_tax'
+)->addProduct(
+    $product
+);
+
+$quote->getShippingAddress()->setRegionId(12);
+
+$quoteRepository = $objectManager->get(
+    \Magento\Quote\Api\CartRepositoryInterface::class
+);
+
+$quoteRepository->save($quote);
+
+/** @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();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_rollback.php
new file mode 100644
index 0000000000000..1e1eb326d7c8a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_rollback.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+require __DIR__ . '/../../Customer/_files/customer_with_tax_group_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_tax_rollback.php';
+
+/** @var $objectManager ObjectManager */
+$objectManager = Bootstrap::getObjectManager();
+$quote = $objectManager->create(Quote::class);
+$quote->load('test_order_tax', 'reserved_order_id')->delete();
+
+/** @var QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(QuoteIdMask::class);
+$quoteIdMask->delete($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group.php
new file mode 100644
index 0000000000000..4792df5cdb2f7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/customer.php';
+
+$customer->setGroupId(3); // 3 is a predefined retailer group
+$customer->save();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group_rollback.php
new file mode 100644
index 0000000000000..48a09a41c7e07
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group_rollback.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/customer_rollback.php';

From 4e8a9bf545f00e0c3e2f5b5c20f6248302c2ac95 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 6 Mar 2019 16:50:27 +0100
Subject: [PATCH 0389/1055] Namespace fix

---
 .../OfflineShipping/SetOfflineShippingMethodsOnCartTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
index 99661e4cd342f..e01dcc4bcd6eb 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\Quote;
+namespace Magento\GraphQl\OfflineShipping;
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\Quote;

From 51cf5897005ebb77d73ca088ce5c2e5fc53ca963 Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Wed, 6 Mar 2019 15:58:17 +0000
Subject: [PATCH 0390/1055] MAGETWO-53037: Product duplication allows to save
 non-unique values for product attributes

- Add message for unique value
---
 .../Controller/Adminhtml/Product/Save.php     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index e84d9ff12906e..825d0ee032d6c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -159,6 +159,7 @@ public function execute()
                 if ($redirectBack === 'duplicate') {
                     $product->unsetData('quantity_and_stock_status');
                     $newProduct = $this->productCopier->copy($product);
+                    $this->checkUniqueAttributes($product);
                     $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
                 }
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
@@ -343,4 +344,25 @@ private function persistMediaData(ProductInterface $product, array $data)
 
         return $data;
     }
+
+    /**
+     * Check unique attributes and add error to message manager
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     */
+    private function checkUniqueAttributes(\Magento\Catalog\Model\Product $product)
+    {
+        $uniqueLabels = [];
+        foreach ($product->getAttributes() as $attribute) {
+            if ($attribute->getIsUnique() && $attribute->getIsUserDefined()
+                && $product->getData($attribute->getAttributeCode()) !== null
+            ) {
+                $uniqueLabels[] = $attribute->getDefaultFrontendLabel();
+            }
+        }
+        if ($uniqueLabels) {
+            $uniqueLabels = implode('", "', $uniqueLabels);
+            $this->messageManager->addErrorMessage(__('The value of attribute(s) "%1" must be unique', $uniqueLabels));
+        }
+    }
 }

From 9b2be29006afb5c30e386144a3ef4315c7539538 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 6 Mar 2019 18:44:27 +0200
Subject: [PATCH 0391/1055] 420 - Test coverage: GetAvailablePaymentMethodsTest
 for Guest 1. Add - testGetPaymentMethodsFromGuestCart() -
 testGetPaymentMethodsFromAnotherCustomerCart() -
 testGetPaymentMethodsIfPaymentsAreNotSet() -
 testGetPaymentMethodsOfNonExistentCart() to
 \Magento\GraphQl\Quote\\Guest\GetAvailablePaymentMethodsTest

---
 .../Guest/GetAvailablePaymentMethodsTest.php  | 78 +++++++++++++++----
 1 file changed, 65 insertions(+), 13 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index a5a08aaf39fb1..2f96ddc4e3824 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -47,21 +47,11 @@ protected function setUp()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      */
-    public function testGetCartWithPaymentMethods()
+    public function testGetPaymentMethodsFromGuestCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
-
-        $query = <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    available_payment_methods {
-      code
-      title
-    }
-  }
-}
-QUERY;
-        $response = $this->graphQlQuery($query);
+        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+        $response      = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('cart', $response);
 
@@ -73,6 +63,68 @@ public function testGetCartWithPaymentMethods()
             'No Payment Information Required',
             $response['cart']['available_payment_methods'][1]['title']
         );
+        self::assertGreaterThan(
+            0,
+            count($response['cart']['available_payment_methods']),
+            'There are no available payment methods for guest cart!'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testGetPaymentMethodsFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Payment/_files/disable_all_payment_methods.php
+     */
+    public function testGetPaymentMethodsIfPaymentsAreNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+        $response      = $this->graphQlQuery($query);
+
+        self::assertEquals(0, count($response['cart']['available_payment_methods']));
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetPaymentMethodsOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartAvailablePaymentMethodsQuery(
+        string $maskedQuoteId
+    ) : string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    available_payment_methods {
+      code
+      title
+    }
+  }
+}
+QUERY;
     }
 
     /**

From 13c627bbd491614b0f0b9f39965dd3a059861fa4 Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Wed, 6 Mar 2019 11:25:00 -0600
Subject: [PATCH 0392/1055] MC-13709: Create configurable product with out of
 stock child product, display out of stock products = yes

---
 ...ateConfigurableProductWithOutOfStockChildProductTest.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithOutOfStockChildProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithOutOfStockChildProductTest.xml
index a2554fbb4e112..9331b1f18fc5c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithOutOfStockChildProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithOutOfStockChildProductTest.xml
@@ -31,7 +31,7 @@
             </getData>
 
             <!-- Create the child that will be a part of the configurable product -->
-            <createData entity="SimpleOutOfStockProduct" stepKey="createSimpleProduct">
+            <createData entity="ApiSimpleOutOfStock" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
                 <requiredEntity createDataKey="getConfigAttributeOption"/>
             </createData>
@@ -99,8 +99,8 @@
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
 
-        <!-- Assert configurable attributes block is absent on product page -->
-        <dontSeeElement selector="{{AdminProductFormConfigurationsSection.createdConfigurationsBlock}}" stepKey="dontSeeCreatedConfigurations"/>
+        <!-- Assert configurable attributes block is present on product page -->
+        <seeElement selector="{{AdminProductFormConfigurationsSection.createdConfigurationsBlock}}" stepKey="seeCreatedConfigurations"/>
 
         <!-- Display out of stock product -->
         <actionGroup ref="displayOutOfStockProduct" stepKey="displayOutOfStockProduct"/>

From ec24b52958f4b54f99fbf20a1b2cd232aa5bc855 Mon Sep 17 00:00:00 2001
From: Raoul Rego <rrego@raouls-mbp.corp.adobe.com>
Date: Wed, 6 Mar 2019 11:58:29 -0600
Subject: [PATCH 0393/1055] MAGETWO-98377: New customer created from admin for
 non default store view receives Welcome Email from default store view

Revert "Small refactoring"

This reverts commit 3b84172faf8612ca7fc54c4c3bb131923e521c01.
---
 app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
index 035013e572833..989de86c09a47 100644
--- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
+++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
@@ -164,11 +164,12 @@ public function afterDelete(CustomerRepository $subject, $result, CustomerInterf
     public function afterGetById(CustomerRepository $subject, CustomerInterface $customer)
     {
         $extensionAttributes = $customer->getExtensionAttributes();
-        $storeId = $this->storeManager->getStore()->getId();
-        $customer->setStoreId($storeId);
+
         if ($extensionAttributes === null) {
             /** @var CustomerExtensionInterface $extensionAttributes */
             $extensionAttributes = $this->extensionFactory->create(CustomerInterface::class);
+            $storeId = $this->storeManager->getStore()->getId();
+            $customer->setStoreId($storeId);
             $customer->setExtensionAttributes($extensionAttributes);
         }
         if ($extensionAttributes->getIsSubscribed() === null) {

From c3e79e2a258063c633309d2cfc09c247a61ac3f9 Mon Sep 17 00:00:00 2001
From: Raoul Rego <rrego@raouls-mbp.corp.adobe.com>
Date: Wed, 6 Mar 2019 12:00:35 -0600
Subject: [PATCH 0394/1055] MAGETWO-98377: New customer created from admin for
 non default store view receives Welcome Email from default store view

Revert "Fixing the customer subscribing from different stores"

This reverts commit c9b52500a52067b8ccfc3329b7456512b6520526.
---
 .../Model/Plugin/CustomerPlugin.php           | 18 +++----------
 .../Unit/Model/Plugin/CustomerPluginTest.php  | 25 -------------------
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
index 989de86c09a47..309bfadab41b3 100644
--- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
+++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
@@ -6,13 +6,11 @@
 namespace Magento\Newsletter\Model\Plugin;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
-use Magento\Customer\Api\Data\CustomerExtensionInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Framework\Api\ExtensionAttributesFactory;
-use Magento\Framework\App\ObjectManager;
 use Magento\Newsletter\Model\ResourceModel\Subscriber;
-use Magento\Newsletter\Model\SubscriberFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Api\Data\CustomerExtensionInterface;
 
 /**
  * Newsletter Plugin for customer
@@ -41,29 +39,21 @@ class CustomerPlugin
      */
     private $customerSubscriptionStatus = [];
 
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
     /**
      * Initialize dependencies.
      *
      * @param SubscriberFactory $subscriberFactory
      * @param ExtensionAttributesFactory $extensionFactory
      * @param Subscriber $subscriberResource
-     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         SubscriberFactory $subscriberFactory,
         ExtensionAttributesFactory $extensionFactory,
-        Subscriber $subscriberResource,
-        StoreManagerInterface $storeManager = null
+        Subscriber $subscriberResource
     ) {
         $this->subscriberFactory = $subscriberFactory;
         $this->extensionFactory = $extensionFactory;
         $this->subscriberResource = $subscriberResource;
-        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -168,8 +158,6 @@ public function afterGetById(CustomerRepository $subject, CustomerInterface $cus
         if ($extensionAttributes === null) {
             /** @var CustomerExtensionInterface $extensionAttributes */
             $extensionAttributes = $this->extensionFactory->create(CustomerInterface::class);
-            $storeId = $this->storeManager->getStore()->getId();
-            $customer->setStoreId($storeId);
             $customer->setExtensionAttributes($extensionAttributes);
         }
         if ($extensionAttributes->getIsSubscribed() === null) {
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
index 3be28cacc93e0..e809b7e37a432 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
@@ -10,8 +10,6 @@
 use Magento\Customer\Api\Data\CustomerExtensionInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Newsletter\Model\ResourceModel\Subscriber;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
 
 class CustomerPluginTest extends \PHPUnit\Framework\TestCase
 {
@@ -55,11 +53,6 @@ class CustomerPluginTest extends \PHPUnit\Framework\TestCase
      */
     private $customerMock;
 
-    /**
-     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $storeManagerMock;
-
     protected function setUp()
     {
         $this->subscriberFactory = $this->getMockBuilder(\Magento\Newsletter\Model\SubscriberFactory::class)
@@ -94,8 +87,6 @@ protected function setUp()
             ->setMethods(['getExtensionAttributes'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
-
         $this->subscriberFactory->expects($this->any())->method('create')->willReturn($this->subscriber);
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -105,7 +96,6 @@ protected function setUp()
                 'subscriberFactory' => $this->subscriberFactory,
                 'extensionFactory' => $this->extensionFactoryMock,
                 'subscriberResource' => $this->subscriberResourceMock,
-                'storeManager' => $this->storeManagerMock,
             ]
         );
     }
@@ -216,7 +206,6 @@ public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet(
     ) {
         $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
         $subscriber = [$subscriberStatusKey => $subscriberStatusValue];
-        $this->prepareStoreData();
 
         $this->extensionFactoryMock->expects($this->any())
             ->method('create')
@@ -244,7 +233,6 @@ public function testAfterGetByIdSetsIsSubscribedFlagIfItIsNotSet()
     {
         $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
         $subscriber = ['subscriber_id' => 1, 'subscriber_status' => 1];
-        $this->prepareStoreData();
 
         $this->customerMock->expects($this->any())
             ->method('getExtensionAttributes')
@@ -279,17 +267,4 @@ public function afterGetByIdDataProvider()
             [null, null, false],
         ];
     }
-
-    /**
-     * Prepare store information
-     *
-     * @return void
-     */
-    private function prepareStoreData()
-    {
-        $storeId = 1;
-        $storeMock = $this->createMock(Store::class);
-        $storeMock->expects($this->any())->method('getId')->willReturn($storeId);
-        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
-    }
 }

From 423bd3abc2c1b59738cbbe9a8928f4617e1854db Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Wed, 6 Mar 2019 12:57:55 -0600
Subject: [PATCH 0395/1055] MC-4436: Convert CreateSearchTermEntityTest to MFTF

---
 ...StorefrontCatalogSearchTermActionGroup.xml | 12 ++++
 .../Mftf/Test/CreateSearchTermEntityTest.xml  | 59 +++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Test/CreateSearchTermEntityTest.xml

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
index a825e06f490a5..83e4ac50a74e6 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml
@@ -22,4 +22,16 @@
         <waitForPageLoad stepKey="waitForSearch"/>
         <see selector="{{StorefrontMessagesSection.noticeMessage}}" userInput="Your search returned no results." stepKey="seeAssertSearchTermNotOnFrontendNoticeMessage"/>
     </actionGroup>
+
+    <actionGroup name="AssertSearchTermOnFrontend">
+        <arguments>
+            <argument name="searchQuery" type="string"/>
+            <argument name="redirectUrl" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
+        <waitForPageLoad stepKey="waitForFillField"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <seeInCurrentUrl url="{{redirectUrl}}" stepKey="checkUrl"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/CreateSearchTermEntityTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/CreateSearchTermEntityTest.xml
new file mode 100644
index 0000000000000..a710f3dd8fa5c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/CreateSearchTermEntityTest.xml
@@ -0,0 +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="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CreateSearchTermTest">
+        <annotations>
+            <stories value="Search terms"/>
+            <title value="Create search term test"/>
+            <description value="Admin should be able to create search term"/>
+            <testCaseId value="MC-13989"/>
+            <severity value="CRITICAL"/>
+            <group value="CatalogSearch"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create simple product -->
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+        </before>
+        <after>
+            <!-- Delete created search term -->
+            <actionGroup ref="AssertSearchTermSuccessDeleteMessage" stepKey="deleteSearchTerm">
+                <argument name="searchQuery" value="$$createSimpleProduct.sku$$"/>
+            </actionGroup>
+
+            <!-- Delete created product -->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to the search terms page and create new search term -->
+        <actionGroup ref="AssertSearchTermSaveSuccessMessage" stepKey="createNewSearchTerm">
+            <argument name="searchQuery" value="$$createSimpleProduct.sku$$"/>
+            <argument name="storeValue" value="{{SimpleTerm.store_id}}"/>
+            <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
+            <argument name="displayInSuggestedTerm" value="{{SimpleTerm.display_in_terms}}"/>
+        </actionGroup>
+
+        <!-- Go to storefront -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!-- Assert created search term on storefront -->
+        <actionGroup ref="AssertSearchTermOnFrontend" stepKey="assertCreatedSearchTermOnFrontend">
+            <argument name="searchQuery" value="$$createSimpleProduct.sku$$"/>
+            <argument name="redirectUrl" value="{{SimpleTerm.redirect}}"/>
+        </actionGroup>
+    </test>
+</tests>

From a2688893e7a690ded6524b4ef382fd729d712236 Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Wed, 6 Mar 2019 15:03:24 -0600
Subject: [PATCH 0396/1055] MC-15289: Customer account group cannot be selected
 while creating a new customer in order

---
 .../Adminhtml/Order/Create/Form/Account.php   | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 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 bb24d2ae15a34..5663c35ba8ac8 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
@@ -133,8 +133,7 @@ protected function _prepareForm()
         $this->_addAttributesToForm($attributes, $fieldset);
 
         $this->_form->addFieldNameSuffix('order[account]');
-        $storeId = (int)$this->_sessionQuote->getStoreId();
-        $this->_form->setValues($this->extractValuesFromAttributes($attributes, $storeId));
+        $this->_form->setValues($this->extractValuesFromAttributes($attributes));
 
         return $this;
     }
@@ -192,10 +191,9 @@ public function getFormValues()
      * Extract the form values from attributes.
      *
      * @param array $attributes
-     * @param int $storeId
      * @return array
      */
-    private function extractValuesFromAttributes(array $attributes, int $storeId): array
+    private function extractValuesFromAttributes(array $attributes): array
     {
         $formValues = $this->getFormValues();
         foreach ($attributes as $code => $attribute) {
@@ -203,26 +201,8 @@ private function extractValuesFromAttributes(array $attributes, int $storeId): a
             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
-        );
-    }
 }

From 5d8807a6042e3e900720610cafae299c6e2008a5 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 6 Mar 2019 15:12:40 -0600
Subject: [PATCH 0397/1055] GraphQL-424: Test coverage: Set OfflineShipping
 methods on Cart

---
 .../SetOfflineShippingMethodsOnCartTest.php   | 147 +-----------------
 1 file changed, 2 insertions(+), 145 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
index e01dcc4bcd6eb..e65ac0275206b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
@@ -51,40 +51,6 @@ protected function setUp()
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
-    /**
-     * Test for general routine of setting a shipping method on shopping cart
-     *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     */
-    public function testSetShippingMethodOnCart()
-    {
-        $shippingCarrierCode = 'flatrate';
-        $shippingMethodCode = 'flatrate';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        $shippingAddress = $this->quote->getShippingAddress();
-        $shippingAddressId = $shippingAddress->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $shippingMethodCode,
-            $shippingCarrierCode,
-            $shippingAddressId
-        );
-
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        self::assertCount(1, $addressesInformation);
-    }
-
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
@@ -142,114 +108,6 @@ public function testSetUpsOnCart()
         );
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     */
-    public function testSetShippingMethodWithWrongCartId()
-    {
-        $shippingCarrierCode = 'flatrate';
-        $shippingMethodCode = 'flatrate';
-        $shippingAddressId = '1';
-        $maskedQuoteId = 'invalid';
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $shippingMethodCode,
-            $shippingCarrierCode,
-            $shippingAddressId
-        );
-
-        self::expectExceptionMessage("Could not find a cart with ID \"$maskedQuoteId\"");
-        $this->sendRequestWithToken($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     */
-    public function testSetNonExistingShippingMethod()
-    {
-        $shippingCarrierCode = 'non';
-        $shippingMethodCode = 'existing';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        $shippingAddress = $this->quote->getShippingAddress();
-        $shippingAddressId = $shippingAddress->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $shippingMethodCode,
-            $shippingCarrierCode,
-            $shippingAddressId
-        );
-
-        self::expectExceptionMessage("Carrier with such method not found: $shippingCarrierCode, $shippingMethodCode");
-        $this->sendRequestWithToken($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     */
-    public function testSetShippingMethodWithNonExistingAddress()
-    {
-        $shippingCarrierCode = 'flatrate';
-        $shippingMethodCode = 'flatrate';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $shippingAddressId = '-20';
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $shippingMethodCode,
-            $shippingCarrierCode,
-            $shippingAddressId
-        );
-
-        self::expectExceptionMessage("Could not find a cart address with ID \"$shippingAddressId\"");
-        $this->sendRequestWithToken($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     */
-    public function testSetShippingMethodByGuestToCustomerCart()
-    {
-        $shippingCarrierCode = 'flatrate';
-        $shippingMethodCode = 'flatrate';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        $shippingAddress = $this->quote->getShippingAddress();
-        $shippingAddressId = $shippingAddress->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $shippingMethodCode,
-            $shippingCarrierCode,
-            $shippingAddressId
-        );
-
-        self::expectExceptionMessage(
-            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-        );
-
-        $this->graphQlQuery($query);
-    }
-
     /**
      * Send request for setting the requested shipping method and check the output
      *
@@ -275,7 +133,7 @@ private function setShippingMethodAndCheckResponse(
         $shippingAddressId = $shippingAddress->getId();
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
 
-        $query = $this->prepareMutationQuery(
+        $query = $this->getQuery(
             $maskedQuoteId,
             $shippingMethodCode,
             $shippingCarrierCode,
@@ -300,7 +158,7 @@ private function setShippingMethodAndCheckResponse(
      * @param string $shippingAddressId
      * @return string
      */
-    private function prepareMutationQuery(
+    private function getQuery(
         string $maskedQuoteId,
         string $shippingMethodCode,
         string $shippingCarrierCode,
@@ -343,7 +201,6 @@ private function prepareMutationQuery(
      */
     private function sendRequestWithToken(string $query): array
     {
-
         $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
 

From 4a7d8b1fd1892f34e63da0ff95e173beeb48d323 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Wed, 6 Mar 2019 15:32:44 -0600
Subject: [PATCH 0398/1055] MQE-1436: Remove composer.json from
 dev/tests/acceptance

- composer/lock file removed, robofile removed.
---
 dev/tests/acceptance/RoboFile.php  |  175 --
 dev/tests/acceptance/composer.json |   25 -
 dev/tests/acceptance/composer.lock | 3534 ----------------------------
 3 files changed, 3734 deletions(-)
 delete mode 100644 dev/tests/acceptance/RoboFile.php
 delete mode 100755 dev/tests/acceptance/composer.json
 delete mode 100644 dev/tests/acceptance/composer.lock

diff --git a/dev/tests/acceptance/RoboFile.php b/dev/tests/acceptance/RoboFile.php
deleted file mode 100644
index e6e9e591bbd8b..0000000000000
--- a/dev/tests/acceptance/RoboFile.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Symfony\Component\Yaml\Yaml;
-
-/** This is project's console commands configuration for Robo task runner.
- *
- * @codingStandardsIgnoreStart
- * @see http://robo.li/
- */
-class RoboFile extends \Robo\Tasks
-{
-    use Robo\Task\Base\loadShortcuts;
-
-    /**
-     * Duplicate the Example configuration files for the Project.
-     * Build the Codeception project.
-     *
-     * @return void
-     */
-    function buildProject()
-    {
-        passthru($this->getBaseCmd("build:project"));
-    }
-
-    /**
-     * Generate all Tests in PHP OR Generate set of tests via passing array of tests
-     *
-     * @param array $tests
-     * @param array $opts
-     * @return \Robo\Result
-     */
-    function generateTests(array $tests, $opts = [
-        'config' => null,
-        'force' => false,
-        'nodes' => null,
-        'lines' => null,
-        'tests' => null
-    ])
-    {
-        $baseCmd = $this->getBaseCmd("generate:tests");
-
-        $mftfArgNames = ['config', 'nodes', 'lines', 'tests'];
-        // append arguments to the end of the command
-        foreach ($opts as $argName => $argValue) {
-            if (in_array($argName, $mftfArgNames) && $argValue !== null) {
-                $baseCmd .= " --$argName $argValue";
-            }
-        }
-
-        // use a separate conditional for the force flag (casting bool to string in php is hard)
-        if ($opts['force']) {
-            $baseCmd .= ' --force';
-        }
-
-        return $this->taskExec($baseCmd)->args($tests)->run();
-    }
-
-    /**
-     * Generate a suite based on name(s) passed in as args.
-     *
-     * @param array $args
-     * @throws Exception
-     * @return \Robo\Result
-     */
-    function generateSuite(array $args)
-    {
-        if (empty($args)) {
-            throw new Exception("Please provide suite name(s) after generate:suite command");
-        }
-        $baseCmd = $this->getBaseCmd("generate:suite");
-        return $this->taskExec($baseCmd)->args($args)->run();
-    }
-
-    /**
-     * Run all Tests with the specified @group tag'.
-     *
-     * @param array $args
-     * @return \Robo\Result
-     */
-    function group(array $args)
-    {
-        $args = array_merge($args, ['-k']);
-        $baseCmd = $this->getBaseCmd("run:group");
-        return $this->taskExec($baseCmd)->args($args)->run();
-    }
-
-    /**
-     * Generate the HTML for the Allure report based on the Test XML output - Allure v1.4.X
-     *
-     * @return \Robo\Result
-     */
-    function allure1Generate()
-    {
-        return $this->_exec('allure generate tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-results'. DIRECTORY_SEPARATOR .' -o tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
-    }
-
-    /**
-     * Generate the HTML for the Allure report based on the Test XML output - Allure v2.3.X
-     *
-     * @return \Robo\Result
-     */
-    function allure2Generate()
-    {
-        return $this->_exec('allure generate tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-results'. DIRECTORY_SEPARATOR .' --output tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .' --clean');
-    }
-
-    /**
-     * Open the HTML Allure report - Allure v1.4.X
-     *
-     * @return \Robo\Result
-     */
-    function allure1Open()
-    {
-        return $this->_exec('allure report open --report-dir tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
-    }
-
-    /**
-     * Open the HTML Allure report - Allure v2.3.X
-     *
-     * @return \Robo\Result
-     */
-    function allure2Open()
-    {
-        return $this->_exec('allure open --port 0 tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
-    }
-
-    /**
-     * Generate and open the HTML Allure report - Allure v1.4.X
-     *
-     * @return \Robo\Result
-     */
-    function allure1Report()
-    {
-        $result1 = $this->allure1Generate();
-
-        if ($result1->wasSuccessful()) {
-            return $this->allure1Open();
-        } else {
-            return $result1;
-        }
-    }
-
-    /**
-     * Generate and open the HTML Allure report - Allure v2.3.X
-     *
-     * @return \Robo\Result
-     */
-    function allure2Report()
-    {
-        $result1 = $this->allure2Generate();
-
-        if ($result1->wasSuccessful()) {
-            return $this->allure2Open();
-        } else {
-            return $result1;
-        }
-    }
-
-    /**
-     * Private function for returning the formatted command for the passthru to mftf bin execution.
-     *
-     * @param string $command
-     * @return string
-     */
-    private function getBaseCmd($command)
-    {
-        $this->writeln("\033[01;31m Use of robo will be deprecated with next major release, please use <root>/vendor/bin/mftf $command \033[0m");
-        chdir(__DIR__);
-        return realpath('../../../vendor/bin/mftf') . " $command";
-    }
-}
\ No newline at end of file
diff --git a/dev/tests/acceptance/composer.json b/dev/tests/acceptance/composer.json
deleted file mode 100755
index 83cad123f8568..0000000000000
--- a/dev/tests/acceptance/composer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "description": "Magento 2 (Open Source) Functional Tests",
-    "type": "project",
-    "version": "1.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "php": "~7.1.3||~7.2.0",
-        "codeception/codeception": "~2.3.4 || ~2.4.0",
-        "consolidation/robo": "^1.0.0",
-        "vlucas/phpdotenv": "^2.4"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\": "tests/functional/Magento"
-        },
-        "files": ["tests/_bootstrap.php"]
-    },
-    "prefer-stable": true
-}
diff --git a/dev/tests/acceptance/composer.lock b/dev/tests/acceptance/composer.lock
deleted file mode 100644
index 5d2c2c5eb1769..0000000000000
--- a/dev/tests/acceptance/composer.lock
+++ /dev/null
@@ -1,3534 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "b93d599d375af66b29edfd8a35875e69",
-    "packages": [
-        {
-            "name": "behat/gherkin",
-            "version": "v4.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
-                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.5|~5",
-                "symfony/phpunit-bridge": "~2.7|~3|~4",
-                "symfony/yaml": "~2.3|~3|~4"
-            },
-            "suggest": {
-                "symfony/yaml": "If you want to parse features, represented in YAML files"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Gherkin": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Gherkin DSL parser for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "BDD",
-                "Behat",
-                "Cucumber",
-                "DSL",
-                "gherkin",
-                "parser"
-            ],
-            "time": "2019-01-16T14:22:17+00:00"
-        },
-        {
-            "name": "codeception/codeception",
-            "version": "2.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5fee32d5c82791548931cbc34806b4de6aa1abfc",
-                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc",
-                "shasum": ""
-            },
-            "require": {
-                "behat/gherkin": "^4.4.0",
-                "codeception/phpunit-wrapper": "^6.0.9|^7.0.6",
-                "codeception/stub": "^2.0",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "facebook/webdriver": ">=1.1.3 <2.0",
-                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
-                "guzzlehttp/psr7": "~1.0",
-                "php": ">=5.6.0 <8.0",
-                "symfony/browser-kit": ">=2.7 <5.0",
-                "symfony/console": ">=2.7 <5.0",
-                "symfony/css-selector": ">=2.7 <5.0",
-                "symfony/dom-crawler": ">=2.7 <5.0",
-                "symfony/event-dispatcher": ">=2.7 <5.0",
-                "symfony/finder": ">=2.7 <5.0",
-                "symfony/yaml": ">=2.7 <5.0"
-            },
-            "require-dev": {
-                "codeception/specify": "~0.3",
-                "facebook/graph-sdk": "~5.3",
-                "flow/jsonpath": "~0.2",
-                "monolog/monolog": "~1.8",
-                "pda/pheanstalk": "~3.0",
-                "php-amqplib/php-amqplib": "~2.4",
-                "predis/predis": "^1.0",
-                "squizlabs/php_codesniffer": "~2.0",
-                "symfony/process": ">=2.7 <5.0",
-                "vlucas/phpdotenv": "^2.4.0"
-            },
-            "suggest": {
-                "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
-                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
-                "codeception/specify": "BDD-style code blocks",
-                "codeception/verify": "BDD-style assertions",
-                "flow/jsonpath": "For using JSONPath in REST module",
-                "league/factory-muffin": "For DataFactory module",
-                "league/factory-muffin-faker": "For Faker support in DataFactory module",
-                "phpseclib/phpseclib": "for SFTP option in FTP Module",
-                "stecman/symfony-console-completion": "For BASH autocompletion",
-                "symfony/phpunit-bridge": "For phpunit-bridge support"
-            },
-            "bin": [
-                "codecept"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": []
-            },
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\": "src\\Codeception",
-                    "Codeception\\Extension\\": "ext"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert@mail.ua",
-                    "homepage": "http://codegyre.com"
-                }
-            ],
-            "description": "BDD-style testing framework",
-            "homepage": "http://codeception.com/",
-            "keywords": [
-                "BDD",
-                "TDD",
-                "acceptance testing",
-                "functional testing",
-                "unit testing"
-            ],
-            "time": "2018-08-01T07:21:49+00:00"
-        },
-        {
-            "name": "codeception/phpunit-wrapper",
-            "version": "7.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "ed4b12beb167dc2ecea293b4f6df6c20ce8d280f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/ed4b12beb167dc2ecea293b4f6df6c20ce8d280f",
-                "reference": "ed4b12beb167dc2ecea293b4f6df6c20ce8d280f",
-                "shasum": ""
-            },
-            "require": {
-                "phpunit/php-code-coverage": "^6.0",
-                "phpunit/phpunit": ">=7.1 <7.6",
-                "sebastian/comparator": "^3.0",
-                "sebastian/diff": "^3.0"
-            },
-            "require-dev": {
-                "codeception/specify": "*",
-                "vlucas/phpdotenv": "^2.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\PHPUnit\\": "src\\"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Davert",
-                    "email": "davert.php@resend.cc"
-                }
-            ],
-            "description": "PHPUnit classes used by Codeception",
-            "time": "2019-01-13T10:34:39+00:00"
-        },
-        {
-            "name": "codeception/stub",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/Stub.git",
-                "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/f50bc271f392a2836ff80690ce0c058efe1ae03e",
-                "reference": "f50bc271f392a2836ff80690ce0c058efe1ae03e",
-                "shasum": ""
-            },
-            "require": {
-                "phpunit/phpunit": ">=4.8 <8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2018-07-26T11:55:37+00:00"
-        },
-        {
-            "name": "consolidation/annotated-command",
-            "version": "2.11.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/004af26391cd7d1cd04b0ac736dc1324d1b4f572",
-                "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572",
-                "shasum": ""
-            },
-            "require": {
-                "consolidation/output-formatters": "^3.4",
-                "php": ">=5.4.5",
-                "psr/log": "^1",
-                "symfony/console": "^2.8|^3|^4",
-                "symfony/event-dispatcher": "^2.5|^3|^4",
-                "symfony/finder": "^2.5|^3|^4"
-            },
-            "require-dev": {
-                "g1a/composer-test-scenarios": "^3",
-                "php-coveralls/php-coveralls": "^1",
-                "phpunit/phpunit": "^6",
-                "squizlabs/php_codesniffer": "^2.7"
-            },
-            "type": "library",
-            "extra": {
-                "scenarios": {
-                    "symfony4": {
-                        "require": {
-                            "symfony/console": "^4.0"
-                        },
-                        "config": {
-                            "platform": {
-                                "php": "7.1.3"
-                            }
-                        }
-                    },
-                    "symfony2": {
-                        "require": {
-                            "symfony/console": "^2.8"
-                        },
-                        "require-dev": {
-                            "phpunit/phpunit": "^4.8.36"
-                        },
-                        "remove": [
-                            "php-coveralls/php-coveralls"
-                        ],
-                        "config": {
-                            "platform": {
-                                "php": "5.4.8"
-                            }
-                        },
-                        "scenario-options": {
-                            "create-lockfile": "false"
-                        }
-                    },
-                    "phpunit4": {
-                        "require-dev": {
-                            "phpunit/phpunit": "^4.8.36"
-                        },
-                        "remove": [
-                            "php-coveralls/php-coveralls"
-                        ],
-                        "config": {
-                            "platform": {
-                                "php": "5.4.8"
-                            }
-                        }
-                    }
-                },
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Consolidation\\AnnotatedCommand\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                }
-            ],
-            "description": "Initialize Symfony Console commands from annotated command class methods.",
-            "time": "2019-02-02T02:29:53+00:00"
-        },
-        {
-            "name": "consolidation/config",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/config.git",
-                "reference": "925231dfff32f05b787e1fddb265e789b939cf4c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/config/zipball/925231dfff32f05b787e1fddb265e789b939cf4c",
-                "reference": "925231dfff32f05b787e1fddb265e789b939cf4c",
-                "shasum": ""
-            },
-            "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "grasmash/expander": "^1",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "g1a/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^5",
-                "satooshi/php-coveralls": "^1.0",
-                "squizlabs/php_codesniffer": "2.*",
-                "symfony/console": "^2.5|^3|^4",
-                "symfony/yaml": "^2.8.11|^3|^4"
-            },
-            "suggest": {
-                "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Consolidation\\Config\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                }
-            ],
-            "description": "Provide configuration services for a commandline tool.",
-            "time": "2018-10-24T17:55:35+00:00"
-        },
-        {
-            "name": "consolidation/log",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/log.git",
-                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.5",
-                "psr/log": "^1.0",
-                "symfony/console": "^2.8|^3|^4"
-            },
-            "require-dev": {
-                "g1a/composer-test-scenarios": "^3",
-                "php-coveralls/php-coveralls": "^1",
-                "phpunit/phpunit": "^6",
-                "squizlabs/php_codesniffer": "^2"
-            },
-            "type": "library",
-            "extra": {
-                "scenarios": {
-                    "symfony4": {
-                        "require": {
-                            "symfony/console": "^4.0"
-                        },
-                        "config": {
-                            "platform": {
-                                "php": "7.1.3"
-                            }
-                        }
-                    },
-                    "symfony2": {
-                        "require": {
-                            "symfony/console": "^2.8"
-                        },
-                        "require-dev": {
-                            "phpunit/phpunit": "^4.8.36"
-                        },
-                        "remove": [
-                            "php-coveralls/php-coveralls"
-                        ],
-                        "config": {
-                            "platform": {
-                                "php": "5.4.8"
-                            }
-                        }
-                    },
-                    "phpunit4": {
-                        "require-dev": {
-                            "phpunit/phpunit": "^4.8.36"
-                        },
-                        "remove": [
-                            "php-coveralls/php-coveralls"
-                        ],
-                        "config": {
-                            "platform": {
-                                "php": "5.4.8"
-                            }
-                        }
-                    }
-                },
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Consolidation\\Log\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                }
-            ],
-            "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
-            "time": "2019-01-01T17:30:51+00:00"
-        },
-        {
-            "name": "consolidation/output-formatters",
-            "version": "3.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19",
-                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19",
-                "shasum": ""
-            },
-            "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "php": ">=5.4.0",
-                "symfony/console": "^2.8|^3|^4",
-                "symfony/finder": "^2.5|^3|^4"
-            },
-            "require-dev": {
-                "g1a/composer-test-scenarios": "^2",
-                "phpunit/phpunit": "^5.7.27",
-                "satooshi/php-coveralls": "^2",
-                "squizlabs/php_codesniffer": "^2.7",
-                "symfony/console": "3.2.3",
-                "symfony/var-dumper": "^2.8|^3|^4",
-                "victorjonsson/markdowndocs": "^1.3"
-            },
-            "suggest": {
-                "symfony/var-dumper": "For using the var_dump formatter"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Consolidation\\OutputFormatters\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                }
-            ],
-            "description": "Format text by applying transformations provided by plug-in formatters.",
-            "time": "2018-10-19T22:35:38+00:00"
-        },
-        {
-            "name": "consolidation/robo",
-            "version": "1.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/Robo.git",
-                "reference": "8bec6a6ea54a7d03d56552a4250c49dec3b3083d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/8bec6a6ea54a7d03d56552a4250c49dec3b3083d",
-                "reference": "8bec6a6ea54a7d03d56552a4250c49dec3b3083d",
-                "shasum": ""
-            },
-            "require": {
-                "consolidation/annotated-command": "^2.10.2",
-                "consolidation/config": "^1.0.10",
-                "consolidation/log": "~1",
-                "consolidation/output-formatters": "^3.1.13",
-                "consolidation/self-update": "^1",
-                "grasmash/yaml-expander": "^1.3",
-                "league/container": "^2.2",
-                "php": ">=5.5.0",
-                "symfony/console": "^2.8|^3|^4",
-                "symfony/event-dispatcher": "^2.5|^3|^4",
-                "symfony/filesystem": "^2.5|^3|^4",
-                "symfony/finder": "^2.5|^3|^4",
-                "symfony/process": "^2.5|^3|^4"
-            },
-            "replace": {
-                "codegyre/robo": "< 1.0"
-            },
-            "require-dev": {
-                "codeception/aspect-mock": "^1|^2.1.1",
-                "codeception/base": "^2.3.7",
-                "codeception/verify": "^0.3.2",
-                "g1a/composer-test-scenarios": "^3",
-                "goaop/framework": "~2.1.2",
-                "goaop/parser-reflection": "^1.1.0",
-                "natxet/cssmin": "3.0.4",
-                "nikic/php-parser": "^3.1.5",
-                "patchwork/jsqueeze": "~2",
-                "pear/archive_tar": "^1.4.4",
-                "php-coveralls/php-coveralls": "^1",
-                "phpunit/php-code-coverage": "~2|~4",
-                "squizlabs/php_codesniffer": "^2.8"
-            },
-            "suggest": {
-                "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
-                "natxet/CssMin": "For minifying CSS files in taskMinify",
-                "patchwork/jsqueeze": "For minifying JS files in taskMinify",
-                "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
-            },
-            "bin": [
-                "robo"
-            ],
-            "type": "library",
-            "extra": {
-                "scenarios": {
-                    "symfony4": {
-                        "require": {
-                            "symfony/console": "^4"
-                        },
-                        "config": {
-                            "platform": {
-                                "php": "7.1.3"
-                            }
-                        }
-                    },
-                    "symfony2": {
-                        "require": {
-                            "symfony/console": "^2.8"
-                        },
-                        "remove": [
-                            "goaop/framework"
-                        ],
-                        "config": {
-                            "platform": {
-                                "php": "5.5.9"
-                            }
-                        },
-                        "scenario-options": {
-                            "create-lockfile": "false"
-                        }
-                    }
-                },
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Robo\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Davert",
-                    "email": "davert.php@resend.cc"
-                }
-            ],
-            "description": "Modern task runner",
-            "time": "2019-02-08T20:59:23+00:00"
-        },
-        {
-            "name": "consolidation/self-update",
-            "version": "1.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/self-update.git",
-                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54",
-                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0",
-                "symfony/console": "^2.8|^3|^4",
-                "symfony/filesystem": "^2.5|^3|^4"
-            },
-            "bin": [
-                "scripts/release"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "SelfUpdate\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                },
-                {
-                    "name": "Alexander Menk",
-                    "email": "menk@mestrona.net"
-                }
-            ],
-            "description": "Provides a self:update command for Symfony Console applications.",
-            "time": "2018-10-28T01:52:03+00:00"
-        },
-        {
-            "name": "container-interop/container-interop",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "shasum": ""
-            },
-            "require": {
-                "psr/container": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Interop\\Container\\": "src/Interop/Container/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "homepage": "https://github.com/container-interop/container-interop",
-            "time": "2017-02-14T19:40:03+00:00"
-        },
-        {
-            "name": "dflydev/dot-access-data",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
-                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Dflydev\\DotAccessData": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dragonfly Development Inc.",
-                    "email": "info@dflydev.com",
-                    "homepage": "http://dflydev.com"
-                },
-                {
-                    "name": "Beau Simensen",
-                    "email": "beau@dflydev.com",
-                    "homepage": "http://beausimensen.com"
-                },
-                {
-                    "name": "Carlos Frutos",
-                    "email": "carlos@kiwing.it",
-                    "homepage": "https://github.com/cfrutos"
-                }
-            ],
-            "description": "Given a deep data structure, access data by dot notation.",
-            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
-            "keywords": [
-                "access",
-                "data",
-                "dot",
-                "notation"
-            ],
-            "time": "2017-01-20T21:14:22+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "squizlabs/php_codesniffer": "^3.0.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2017-07-22T11:58:36+00:00"
-        },
-        {
-            "name": "facebook/webdriver",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/facebook/php-webdriver.git",
-                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
-                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "ext-zip": "*",
-                "php": "^5.6 || ~7.0",
-                "symfony/process": "^2.8 || ^3.1 || ^4.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.0",
-                "jakub-onderka/php-parallel-lint": "^0.9.2",
-                "php-coveralls/php-coveralls": "^2.0",
-                "php-mock/php-mock-phpunit": "^1.1",
-                "phpunit/phpunit": "^5.7",
-                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-                "squizlabs/php_codesniffer": "^2.6",
-                "symfony/var-dumper": "^3.3 || ^4.0"
-            },
-            "suggest": {
-                "ext-SimpleXML": "For Firefox profile creation"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-community": "1.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Facebook\\WebDriver\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "description": "A PHP client for Selenium WebDriver",
-            "homepage": "https://github.com/facebook/php-webdriver",
-            "keywords": [
-                "facebook",
-                "php",
-                "selenium",
-                "webdriver"
-            ],
-            "time": "2018-05-16T17:37:13+00:00"
-        },
-        {
-            "name": "grasmash/expander",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/grasmash/expander.git",
-                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-                "shasum": ""
-            },
-            "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "php": ">=5.4"
-            },
-            "require-dev": {
-                "greg-1-anderson/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^4|^5.5.4",
-                "satooshi/php-coveralls": "^1.0.2|dev-master",
-                "squizlabs/php_codesniffer": "^2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Grasmash\\Expander\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Grasmick"
-                }
-            ],
-            "description": "Expands internal property references in PHP arrays file.",
-            "time": "2017-12-21T22:14:55+00:00"
-        },
-        {
-            "name": "grasmash/yaml-expander",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/grasmash/yaml-expander.git",
-                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-                "shasum": ""
-            },
-            "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "php": ">=5.4",
-                "symfony/yaml": "^2.8.11|^3|^4"
-            },
-            "require-dev": {
-                "greg-1-anderson/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^4.8|^5.5.4",
-                "satooshi/php-coveralls": "^1.0.2|dev-master",
-                "squizlabs/php_codesniffer": "^2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Grasmash\\YamlExpander\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Grasmick"
-                }
-            ],
-            "description": "Expands internal property references in a yaml file.",
-            "time": "2017-12-16T16:06:03+00:00"
-        },
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
-            },
-            "suggest": {
-                "psr/log": "Required for using the Log middleware"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.3-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2018-04-22T15:46:56+00:00"
-        },
-        {
-            "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle promises library",
-            "keywords": [
-                "promise"
-            ],
-            "time": "2016-12-20T10:07:11+00:00"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "1.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "9f83dded91781a01c63574e387eaa769be769115"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
-                "reference": "9f83dded91781a01c63574e387eaa769be769115",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0",
-                "ralouphie/getallheaders": "^2.0.5"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "PSR-7 message implementation that also provides common utility methods",
-            "keywords": [
-                "http",
-                "message",
-                "psr-7",
-                "request",
-                "response",
-                "stream",
-                "uri",
-                "url"
-            ],
-            "time": "2018-12-04T20:46:45+00:00"
-        },
-        {
-            "name": "league/container",
-            "version": "2.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/container.git",
-                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
-                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
-                "shasum": ""
-            },
-            "require": {
-                "container-interop/container-interop": "^1.2",
-                "php": "^5.4.0 || ^7.0"
-            },
-            "provide": {
-                "container-interop/container-interop-implementation": "^1.2",
-                "psr/container-implementation": "^1.0"
-            },
-            "replace": {
-                "orno/di": "~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Container\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Phil Bennett",
-                    "email": "philipobenito@gmail.com",
-                    "homepage": "http://www.philipobenito.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A fast and intuitive dependency injection container.",
-            "homepage": "https://github.com/thephpleague/container",
-            "keywords": [
-                "container",
-                "dependency",
-                "di",
-                "injection",
-                "league",
-                "provider",
-                "service"
-            ],
-            "time": "2017-05-10T09:20:27+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
-            "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
-                "files": [
-                    "src/DeepCopy/deep_copy.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2018-06-11T23:09:50+00:00"
-        },
-        {
-            "name": "phar-io/manifest",
-            "version": "1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-phar": "*",
-                "phar-io/version": "^2.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2018-07-08T19:23:20+00:00"
-        },
-        {
-            "name": "phar-io/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/version.git",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Library for handling version information and constraints",
-            "time": "2018-07-08T19:19:57+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2017-09-11T18:02:19+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30T07:14:17+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2017-07-14T14:27:02+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2018-08-05T17:53:17+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "6.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
-                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.1",
-                "phpunit/php-file-iterator": "^2.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.1 || ^4.0",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "suggest": {
-                "ext-xdebug": "^2.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2018-10-31T16:06:48+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2018-09-13T20:33:42+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
-                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2018-02-01T13:07:23+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18",
-                "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2018-10-30T05:52:18+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "7.5.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2896657da5fb237bc316bdfc18c2650efeee0dc0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2896657da5fb237bc316bdfc18c2650efeee0dc0",
-                "reference": "2896657da5fb237bc316bdfc18c2650efeee0dc0",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.1",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "myclabs/deep-copy": "^1.7",
-                "phar-io/manifest": "^1.0.2",
-                "phar-io/version": "^2.0",
-                "php": "^7.1",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^6.0.7",
-                "phpunit/php-file-iterator": "^2.0.1",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.0",
-                "sebastian/comparator": "^3.0",
-                "sebastian/diff": "^3.0",
-                "sebastian/environment": "^4.0",
-                "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^2.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0",
-                "sebastian/version": "^2.0.1"
-            },
-            "conflict": {
-                "phpunit/phpunit-mock-objects": "*"
-            },
-            "require-dev": {
-                "ext-pdo": "*"
-            },
-            "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "7.5-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2019-02-07T14:15:04+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "time": "2017-02-14T16:28:37+00:00"
-        },
-        {
-            "name": "psr/http-message",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2016-08-06T14:39:51+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2018-11-20T15:27:04+00:00"
-        },
-        {
-            "name": "ralouphie/getallheaders",
-            "version": "2.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ralouphie/getallheaders.git",
-                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~3.7.0",
-                "satooshi/php-coveralls": ">=1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/getallheaders.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ralph Khattar",
-                    "email": "ralph.khattar@gmail.com"
-                }
-            ],
-            "description": "A polyfill for getallheaders.",
-            "time": "2016-02-11T07:05:27+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "3.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2018-07-12T15:12:46+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "3.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.5 || ^8.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff",
-                "udiff",
-                "unidiff",
-                "unified diff"
-            ],
-            "time": "2019-02-04T06:01:07+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "4.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6fda8ce1974b62b14935adc02a9ed38252eca656",
-                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.5"
-            },
-            "suggest": {
-                "ext-posix": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2019-02-01T05:27:49+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2017-04-03T13:19:02+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2017-04-27T15:39:26+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03T12:35:26+00:00"
-        },
-        {
-            "name": "sebastian/object-reflector",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29T09:07:27+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03T06:23:57+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2018-10-04T04:07:39+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
-        },
-        {
-            "name": "symfony/browser-kit",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "ee4462581eb54bf34b746e4a5d522a4f21620160"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ee4462581eb54bf34b746e4a5d522a4f21620160",
-                "reference": "ee4462581eb54bf34b746e4a5d522a4f21620160",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/dom-crawler": "~3.4|~4.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~3.4|~4.0",
-                "symfony/process": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\BrowserKit\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony BrowserKit Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-16T21:31:25+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
-                "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/contracts": "^1.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.4",
-                "symfony/process": "<3.3"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~3.4|~4.0",
-                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.4|~4.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-25T14:35:16+00:00"
-        },
-        {
-            "name": "symfony/contracts",
-            "version": "v1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/contracts.git",
-                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf",
-                "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "require-dev": {
-                "psr/cache": "^1.0",
-                "psr/container": "^1.0"
-            },
-            "suggest": {
-                "psr/cache": "When using the Cache contracts",
-                "psr/container": "When using the Service contracts",
-                "symfony/cache-contracts-implementation": "",
-                "symfony/service-contracts-implementation": "",
-                "symfony/translation-contracts-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\": ""
-                },
-                "exclude-from-classmap": [
-                    "**/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "A set of abstractions extracted out of the Symfony components",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "time": "2018-12-05T08:06:11+00:00"
-        },
-        {
-            "name": "symfony/css-selector",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/48eddf66950fa57996e1be4a55916d65c10c604a",
-                "reference": "48eddf66950fa57996e1be4a55916d65c10c604a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony CssSelector Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:31:39+00:00"
-        },
-        {
-            "name": "symfony/dom-crawler",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "d8476760b04cdf7b499c8718aa437c20a9155103"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d8476760b04cdf7b499c8718aa437c20a9155103",
-                "reference": "d8476760b04cdf7b499c8718aa437c20a9155103",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/css-selector": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DomCrawler\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DomCrawler Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1",
-                "reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/contracts": "^1.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.4"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/expression-language": "~3.4|~4.0",
-                "symfony/stopwatch": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7c16ebc2629827d4ec915a52ac809768d060a4ee"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7c16ebc2629827d4ec915a52ac809768d060a4ee",
-                "reference": "7c16ebc2629827d4ec915a52ac809768d060a4ee",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ef71816cbb264988bb57fe6a73f610888b9aa70c",
-                "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "time": "2018-08-06T14:22:27+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
-                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-09-21T13:07:52+00:00"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/6c05edb11fbeff9e2b324b4270ecb17911a8b7ad",
-                "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-24T22:05:03+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v4.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "d461670ee145092b7e2a56c1da7118f19cadadb0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/d461670ee145092b7e2a56c1da7118f19cadadb0",
-                "reference": "d461670ee145092b7e2a56c1da7118f19cadadb0",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2019-01-16T20:35:37+00:00"
-        },
-        {
-            "name": "theseer/tokenizer",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07T12:08:54+00:00"
-        },
-        {
-            "name": "vlucas/phpdotenv",
-            "version": "v2.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-ctype": "^1.9"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dotenv\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Vance Lucas",
-                    "email": "vance@vancelucas.com",
-                    "homepage": "http://www.vancelucas.com"
-                }
-            ],
-            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
-            "keywords": [
-                "dotenv",
-                "env",
-                "environment"
-            ],
-            "time": "2019-01-29T11:11:52+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2018-12-25T11:19:39+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": true,
-    "prefer-lowest": false,
-    "platform": {
-        "php": "~7.1.3||~7.2.0"
-    },
-    "platform-dev": []
-}

From b0ac70bee1d364ab693433c16250ef48186b0f5d Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Wed, 13 Feb 2019 19:04:42 -0600
Subject: [PATCH 0399/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Catalog/Api/Data/MassActionInterface.php  | 135 ++++++++++
 .../Product/Action/Attribute/Save.php         | 135 +++-------
 .../Model/Attribute/Backend/Consumer.php      | 254 ++++++++++++++++++
 app/code/Magento/Catalog/Model/MassAction.php | 174 ++++++++++++
 .../Magento/Catalog/etc/communication.xml     |  12 +
 app/code/Magento/Catalog/etc/di.xml           |   1 +
 app/code/Magento/Catalog/etc/queue.xml        |  12 +
 .../Magento/Catalog/etc/queue_consumer.xml    |  10 +
 .../Magento/Catalog/etc/queue_publisher.xml   |  12 +
 .../Magento/Catalog/etc/queue_topology.xml    |  12 +
 .../Reflection/DataObjectProcessor.php        |   4 +-
 11 files changed, 658 insertions(+), 103 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Api/Data/MassActionInterface.php
 create mode 100644 app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
 create mode 100644 app/code/Magento/Catalog/Model/MassAction.php
 create mode 100644 app/code/Magento/Catalog/etc/communication.xml
 create mode 100644 app/code/Magento/Catalog/etc/queue.xml
 create mode 100644 app/code/Magento/Catalog/etc/queue_consumer.xml
 create mode 100644 app/code/Magento/Catalog/etc/queue_publisher.xml
 create mode 100644 app/code/Magento/Catalog/etc/queue_topology.xml

diff --git a/app/code/Magento/Catalog/Api/Data/MassActionInterface.php b/app/code/Magento/Catalog/Api/Data/MassActionInterface.php
new file mode 100644
index 0000000000000..3f47242e3aa61
--- /dev/null
+++ b/app/code/Magento/Catalog/Api/Data/MassActionInterface.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Api\Data;
+
+/**
+ * MassAction interface.
+ * @api
+ * @since 101.1.0
+ */
+interface MassActionInterface
+{
+
+    /**
+     * Set data value.
+     *
+     * @param string[] $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setInventory($data);
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getInventory():array;
+
+    /**
+     * Set data value.
+     *
+     * @param string[] $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setAttributes($data);
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getAttributes():array;
+
+    /**
+     * Set data value.
+     *
+     * @param string[] $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setWebsiteRemove($data);
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getWebsiteRemove():array;
+
+    /**
+     * Set data value.
+     *
+     * @param string[] $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setWebsiteAdd($data);
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getWebsiteAdd():array;
+
+    /**
+     * Set data value.
+     *
+     * @param integer $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setStoreId($data);
+
+    /**
+     * Get data value.
+     *
+     * @return integer
+     * @since 101.1.0
+     */
+    public function getStoreId();
+
+    /**
+     * Set data value.
+     *
+     * @param integer[] $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setProductIds(array $data);
+
+    /**
+     * Get data value.
+     *
+     * @return integer[]
+     * @since 101.1.0
+     */
+    public function getProductIds():array;
+
+    /**
+     * Set data value.
+     *
+     * @param integer $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setWebsiteId($data);
+
+    /**
+     * Get data value.
+     *
+     * @return integer
+     * @since 101.1.0
+     */
+    public function getWebsiteId();
+}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 0730e7a7c5dc1..69969231490b7 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -6,8 +6,12 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
+use Magento\Catalog\Api\Data\MassActionInterfaceFactory;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action;
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Save
@@ -49,6 +53,16 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      */
     protected $dataObjectHelper;
 
+    /**
+     * @var PublisherInterface
+     */
+    private $messagePublisher;
+    /**
+     * @var MassActionInterfaceFactory|null
+     */
+    private $massActionFactory;
+
+
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
@@ -58,6 +72,8 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * @param \Magento\Catalog\Helper\Product $catalogProduct
      * @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param PublisherInterface|null $publisher
+     * @param MassActionInterfaceFactory|null $massAction
      */
     public function __construct(
         Action\Context $context,
@@ -67,7 +83,9 @@ public function __construct(
         \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
         \Magento\Catalog\Helper\Product $catalogProduct,
         \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory,
-        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        PublisherInterface $publisher = null,
+        MassActionInterfaceFactory $massAction = null
     ) {
         $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
         $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
@@ -76,6 +94,8 @@ public function __construct(
         $this->stockItemFactory = $stockItemFactory;
         parent::__construct($context, $attributeHelper);
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->messagePublisher = $publisher ?: ObjectManager::getInstance()->get(PublisherInterface::class);
+        $this->massActionFactory = $massAction ?: ObjectManager::getInstance()->get(MassActionInterfaceFactory::class);
     }
 
     /**
@@ -99,112 +119,25 @@ public function execute()
         $websiteAddData = $this->getRequest()->getParam('add_website_ids', []);
 
         /* Prepare inventory data item options (use config settings) */
-        $options = $this->_objectManager->get(\Magento\CatalogInventory\Api\StockConfigurationInterface::class)
-            ->getConfigItemOptions();
+        $options = $this->_objectManager->get(StockConfigurationInterface::class)->getConfigItemOptions();
         foreach ($options as $option) {
             if (isset($inventoryData[$option]) && !isset($inventoryData['use_config_' . $option])) {
                 $inventoryData['use_config_' . $option] = 0;
             }
         }
 
-        try {
-            $storeId = $this->attributeHelper->getSelectedStoreId();
-            if ($attributesData) {
-                $dateFormat = $this->_objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
-                    ->getDateFormat(\IntlDateFormatter::SHORT);
-
-                foreach ($attributesData as $attributeCode => $value) {
-                    $attribute = $this->_objectManager->get(\Magento\Eav\Model\Config::class)
-                        ->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
-                    if (!$attribute->getAttributeId()) {
-                        unset($attributesData[$attributeCode]);
-                        continue;
-                    }
-                    if ($attribute->getBackendType() == 'datetime') {
-                        if (!empty($value)) {
-                            $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
-                            $filterInternal = new \Zend_Filter_NormalizedToLocalized(
-                                ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
-                            );
-                            $value = $filterInternal->filter($filterInput->filter($value));
-                        } else {
-                            $value = null;
-                        }
-                        $attributesData[$attributeCode] = $value;
-                    } elseif ($attribute->getFrontendInput() == 'multiselect') {
-                        // Check if 'Change' checkbox has been checked by admin for this attribute
-                        $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
-                        if (!$isChanged) {
-                            unset($attributesData[$attributeCode]);
-                            continue;
-                        }
-                        if (is_array($value)) {
-                            $value = implode(',', $value);
-                        }
-                        $attributesData[$attributeCode] = $value;
-                    }
-                }
-
-                $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class)
-                    ->updateAttributes($this->attributeHelper->getProductIds(), $attributesData, $storeId);
-            }
-
-            if ($inventoryData) {
-                // TODO why use ObjectManager?
-                /** @var \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry */
-                $stockRegistry = $this->_objectManager
-                    ->create(\Magento\CatalogInventory\Api\StockRegistryInterface::class);
-                /** @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository */
-                $stockItemRepository = $this->_objectManager
-                    ->create(\Magento\CatalogInventory\Api\StockItemRepositoryInterface::class);
-                foreach ($this->attributeHelper->getProductIds() as $productId) {
-                    $stockItemDo = $stockRegistry->getStockItem(
-                        $productId,
-                        $this->attributeHelper->getStoreWebsiteId($storeId)
-                    );
-                    if (!$stockItemDo->getProductId()) {
-                        $inventoryData['product_id'] = $productId;
-                    }
-
-                    $stockItemId = $stockItemDo->getId();
-                    $this->dataObjectHelper->populateWithArray(
-                        $stockItemDo,
-                        $inventoryData,
-                        \Magento\CatalogInventory\Api\Data\StockItemInterface::class
-                    );
-                    $stockItemDo->setItemId($stockItemId);
-                    $stockItemRepository->save($stockItemDo);
-                }
-                $this->_stockIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
-            }
+        $massAction = $this->massActionFactory->create();
+        $massAction->setInventory($inventoryData);
+        $massAction->setAttributes($attributesData);
+        $massAction->setWebsiteRemove($websiteRemoveData);
+        $massAction->setWebsiteAdd($websiteAddData);
+        $massAction->setStoreId($this->attributeHelper->getSelectedStoreId());
+        $massAction->setProductIds($this->attributeHelper->getProductIds());
+        $massAction->setWebsiteId($this->attributeHelper->getStoreWebsiteId($massAction->getStoreId()));
 
-            if ($websiteAddData || $websiteRemoveData) {
-                /* @var $actionModel \Magento\Catalog\Model\Product\Action */
-                $actionModel = $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class);
-                $productIds = $this->attributeHelper->getProductIds();
-
-                if ($websiteRemoveData) {
-                    $actionModel->updateWebsites($productIds, $websiteRemoveData, 'remove');
-                }
-                if ($websiteAddData) {
-                    $actionModel->updateWebsites($productIds, $websiteAddData, 'add');
-                }
-
-                $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
-            }
-
-            $this->messageManager->addSuccessMessage(
-                __('A total of %1 record(s) were updated.', count($this->attributeHelper->getProductIds()))
-            );
-
-            $this->_productFlatIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
-
-            if ($this->_catalogProduct->isDataForPriceIndexerWasChanged($attributesData)
-                || !empty($websiteRemoveData)
-                || !empty($websiteAddData)
-            ) {
-                $this->_productPriceIndexerProcessor->reindexList($this->attributeHelper->getProductIds());
-            }
+        try {
+            $this->messagePublisher->publish('product_action_attribute.update', $massAction);
+            $this->messageManager->addSuccessMessage(__('Message is added to queue, wait'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
@@ -215,6 +148,6 @@ public function execute()
         }
 
         return $this->resultRedirectFactory->create()
-            ->setPath('catalog/product/', ['store' => $this->attributeHelper->getSelectedStoreId()]);
+            ->setPath('catalog/product/', ['store' => $massAction->getStoreId()]);
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
new file mode 100644
index 0000000000000..029223972780a
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Attribute\Backend;
+
+use Magento\Catalog\Api\Data\MassActionInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Notification\NotifierInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Consumer for export message.
+ */
+class Consumer
+{
+    /**
+     * @var NotifierInterface
+     */
+    private $notifier;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+     */
+    protected $_productFlatIndexerProcessor;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
+     */
+    protected $_productPriceIndexerProcessor;
+
+    /**
+     * Catalog product
+     *
+     * @var \Magento\Catalog\Helper\Product
+     */
+    protected $_catalogProduct;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory
+     */
+    protected $stockItemFactory;
+
+    /**
+     * Stock Indexer
+     *
+     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
+     */
+    protected $_stockIndexerProcessor;
+
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper
+     */
+    protected $dataObjectHelper;
+
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface
+     */
+    private $_eventManager;
+
+    /**
+     * @var ObjectManager
+     */
+    private $_objectManager;
+
+    /**
+     * @param \Magento\Catalog\Helper\Product $catalogProduct
+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
+     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
+     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
+     * @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
+     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param NotifierInterface $notifier
+     */
+    public function __construct(
+        \Magento\Catalog\Helper\Product $catalogProduct,
+        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
+        \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
+        \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
+        \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory,
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        NotifierInterface $notifier
+    ) {
+        $this->_catalogProduct = $catalogProduct;
+        $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
+        $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
+        $this->_stockIndexerProcessor = $stockIndexerProcessor;
+        $this->stockItemFactory = $stockItemFactory;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->notifier = $notifier;
+        $this->_eventManager = $eventManager;
+        $this->_objectManager = ObjectManager::getInstance();
+    }
+
+    public function process(MassActionInterface $data): void
+    {
+        try {
+            if ($data->getAttributes()) {
+                $attributesData = $this->getAttributesData($data, $data->getAttributes());
+            }
+
+            if ($data->getInventory()) {
+                $this->saveInventory($data, $data->getInventory());
+            }
+
+            if ($data->getWebsiteAdd() || $data->getWebsiteRemove()) {
+                $this->updateWebsiteInProducts($data, $data->getWebsiteRemove(), $data->getWebsiteAdd());
+            }
+
+            $this->reindex($data, $attributesData, $data->getWebsiteRemove(), $data->getWebsiteAdd());
+
+            $this->notifier->addNotice(
+                __('Product attributes updated'),
+                __('A total of %1 record(s) were updated.', count($data->getProductIds()))
+            );
+        } catch (LocalizedException $exception) {
+            $this->notifier->addCritical(
+                __('Error during process occurred'),
+                __('Error during process occurred. Please check logs for detail')
+            );
+            $this->logger->critical('Something went wrong while process. ' . $exception->getMessage());
+        }
+    }
+
+    /**
+     * @param MassActionInterface $data
+     * @param $attributesData
+     * @return mixed
+     */
+    private function getAttributesData(MassActionInterface $data, $attributesData)
+    {
+        $dateFormat = $this->_objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
+            ->getDateFormat(\IntlDateFormatter::SHORT);
+
+        foreach ($attributesData as $attributeCode => $value) {
+            $attribute = $this->_objectManager->get(\Magento\Eav\Model\Config::class)
+                ->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+            if (!$attribute->getAttributeId()) {
+                unset($attributesData[$attributeCode]);
+                continue;
+            }
+            if ($attribute->getBackendType() == 'datetime') {
+                if (!empty($value)) {
+                    $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
+                    $filterInternal = new \Zend_Filter_NormalizedToLocalized(
+                        ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
+                    );
+                    $value = $filterInternal->filter($filterInput->filter($value));
+                } else {
+                    $value = null;
+                }
+                $attributesData[$attributeCode] = $value;
+            } elseif ($attribute->getFrontendInput() == 'multiselect') {
+                // Check if 'Change' checkbox has been checked by admin for this attribute
+                $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
+                if (!$isChanged) {
+                    unset($attributesData[$attributeCode]);
+                    continue;
+                }
+                if (is_array($value)) {
+                    $value = implode(',', $value);
+                }
+                $attributesData[$attributeCode] = $value;
+            }
+        }
+
+        $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class)
+            ->updateAttributes($data->getProductIds(), $attributesData, $data->getStoreId());
+        return $attributesData;
+    }
+
+    /**
+     * @param MassActionInterface $data
+     * @param $inventoryData
+     */
+    private function saveInventory(MassActionInterface $data, $inventoryData): void
+    {
+        // TODO why use ObjectManager?
+        /** @var \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry */
+        $stockRegistry = $this->_objectManager
+            ->create(\Magento\CatalogInventory\Api\StockRegistryInterface::class);
+        /** @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository */
+        $stockItemRepository = $this->_objectManager
+            ->create(\Magento\CatalogInventory\Api\StockItemRepositoryInterface::class);
+        foreach ($data->getProductIds() as $productId) {
+            $stockItemDo = $stockRegistry->getStockItem(
+                $productId,
+                $data->getWebsiteId()
+            );
+            if (!$stockItemDo->getProductId()) {
+                $inventoryData['product_id'] = $productId;
+            }
+
+            $stockItemId = $stockItemDo->getId();
+            $this->dataObjectHelper->populateWithArray(
+                $stockItemDo,
+                $inventoryData,
+                \Magento\CatalogInventory\Api\Data\StockItemInterface::class
+            );
+            $stockItemDo->setItemId($stockItemId);
+            $stockItemRepository->save($stockItemDo);
+        }
+        $this->_stockIndexerProcessor->reindexList($data->getProductIds());
+    }
+
+    /**
+     * @param MassActionInterface $data
+     * @param $websiteRemoveData
+     * @param $websiteAddData
+     */
+    private function updateWebsiteInProducts(MassActionInterface $data, $websiteRemoveData, $websiteAddData): void
+    {
+        /* @var $actionModel \Magento\Catalog\Model\Product\Action */
+        $actionModel = $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class);
+        $productIds = $data->getProductIds();
+
+        if ($websiteRemoveData) {
+            $actionModel->updateWebsites($productIds, $websiteRemoveData, 'remove');
+        }
+        if ($websiteAddData) {
+            $actionModel->updateWebsites($productIds, $websiteAddData, 'add');
+        }
+
+        $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
+    }
+
+    /**
+     * @param MassActionInterface $data
+     * @param $attributesData
+     * @param $websiteRemoveData
+     * @param $websiteAddData
+     */
+    private function reindex(MassActionInterface $data, $attributesData, $websiteRemoveData, $websiteAddData): void
+    {
+        $this->_productFlatIndexerProcessor->reindexList($data->getProductIds());
+
+        if ($this->_catalogProduct->isDataForPriceIndexerWasChanged($attributesData)
+            || !empty($websiteRemoveData)
+            || !empty($websiteAddData)
+        ) {
+            $this->_productPriceIndexerProcessor->reindexList($data->getProductIds());
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Model/MassAction.php b/app/code/Magento/Catalog/Model/MassAction.php
new file mode 100644
index 0000000000000..35ed110f9c11a
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/MassAction.php
@@ -0,0 +1,174 @@
+<?php
+namespace Magento\Catalog\Model;
+
+class MassAction implements \Magento\Catalog\Api\Data\MassActionInterface
+{
+    private $inventory;
+    private $attributes;
+    private $websiteRemove;
+    private $websiteAdd;
+    private $storeId;
+    private $productIds;
+    private $websiteId;
+
+    /**
+     * Set data value.
+     *
+     * @param string $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setInventory($data)
+    {
+        $this->inventory = $data;
+    }
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getInventory():array
+    {
+        return $this->inventory;
+    }
+
+    /**
+     * Set data value.
+     *
+     * @param string $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setAttributes($data)
+    {
+        $this->attributes = $data;
+    }
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getAttributes():array
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * Set data value.
+     *
+     * @param string $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setWebsiteRemove($data)
+    {
+        $this->websiteRemove = $data;
+    }
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getWebsiteRemove():array
+    {
+        return $this->websiteRemove;
+    }
+
+    /**
+     * Set data value.
+     *
+     * @param string $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setWebsiteAdd($data)
+    {
+        $this->websiteAdd = $data;
+    }
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getWebsiteAdd():array
+    {
+        return $this->websiteAdd;
+    }
+
+    /**
+     * Set data value.
+     *
+     * @param string $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setStoreId($data)
+    {
+        $this->storeId = $data;
+    }
+
+    /**
+     * Get data value.
+     *
+     * @return string
+     * @since 101.1.0
+     */
+    public function getStoreId()
+    {
+        return $this->storeId;
+    }
+
+    /**
+     * Set data value.
+     *
+     * @param integer[] $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setProductIds(array $data)
+    {
+        $this->productIds = $data;
+    }
+
+    /**
+     * Get data value.
+     *
+     * @return integer[]
+     * @since 101.1.0
+     */
+    public function getProductIds():array
+    {
+        return $this->productIds;
+    }
+
+    /**
+     * Set data value.
+     *
+     * @param string $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setWebsiteId($data)
+    {
+        $this->websiteId = $data;
+    }
+
+    /**
+     * Get data value.
+     *
+     * @return string
+     * @since 101.1.0
+     */
+    public function getWebsiteId()
+    {
+        return $this->websiteId;
+    }
+}
diff --git a/app/code/Magento/Catalog/etc/communication.xml b/app/code/Magento/Catalog/etc/communication.xml
new file mode 100644
index 0000000000000..b073725e934f0
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/communication.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:Communication/etc/communication.xsd">
+    <topic name="product_action_attribute.update" request="Magento\Catalog\Api\Data\MassActionInterface">
+        <handler name="product_action_attribute.update" type="Magento\Catalog\Model\Attribute\Backend\Consumer" method="process" />
+    </topic>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 7d2c3699ee2c2..49447447622f9 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -72,6 +72,7 @@
     <preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
     <preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
     <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
+    <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="\Magento\Catalog\Model\MassAction" />
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
diff --git a/app/code/Magento/Catalog/etc/queue.xml b/app/code/Magento/Catalog/etc/queue.xml
new file mode 100644
index 0000000000000..8aa7c7fe5e49e
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue.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-message-queue:etc/queue.xsd">
+    <broker topic="product_action_attribute.update" exchange="magento-db" type="db">
+        <queue name="product_action_attribute.update" consumer="product_action_attribute.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process"/>
+    </broker>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_consumer.xml b/app/code/Magento/Catalog/etc/queue_consumer.xml
new file mode 100644
index 0000000000000..0090866c0e490
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue_consumer.xml
@@ -0,0 +1,10 @@
+<?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-message-queue:etc/consumer.xsd">
+    <consumer name="product_action_attribute.update" queue="product_action_attribute.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process" />
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_publisher.xml b/app/code/Magento/Catalog/etc/queue_publisher.xml
new file mode 100644
index 0000000000000..c673a8321762a
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue_publisher.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-message-queue:etc/publisher.xsd">
+    <publisher topic="product_action_attribute.update">
+        <connection name="db" exchange="magento-db" />
+    </publisher>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_topology.xml b/app/code/Magento/Catalog/etc/queue_topology.xml
new file mode 100644
index 0000000000000..0097d770936a3
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/queue_topology.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-message-queue:etc/topology.xsd">
+    <exchange name="magento-db" type="topic" connection="db">
+        <binding id="updateBinding" topic="product_action_attribute.update" destinationType="queue" destination="product_action_attribute.update"/>
+    </exchange>
+</config>
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index 2f3caf08c534e..dfe0e5c9f30f3 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -115,11 +115,11 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
                 } elseif (is_array($value)) {
                     $valueResult = [];
                     $arrayElementType = substr($returnType, 0, -2);
-                    foreach ($value as $singleValue) {
+                    foreach ($value as $singleKey => $singleValue) {
                         if (is_object($singleValue) && !($singleValue instanceof Phrase)) {
                             $singleValue = $this->buildOutputDataArray($singleValue, $arrayElementType);
                         }
-                        $valueResult[] = $this->typeCaster->castValueToType($singleValue, $arrayElementType);
+                        $valueResult[$singleKey] = $this->typeCaster->castValueToType($singleValue, $arrayElementType);
                     }
                     $value = $valueResult;
                 } else {

From 12d5481f89d8f4cb835258fbc1a29244fc1f6bac Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Tue, 19 Feb 2019 15:52:32 -0600
Subject: [PATCH 0400/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Product/Action/Attribute/Save.php         | 106 +++----
 .../Model/Attribute/Backend/Consumer.php      | 119 ++++----
 .../Product/Action/Attribute/SaveTest.php     | 258 ------------------
 .../Unit/Model/Attribute/Backend/SaveTest.php | 150 ++++++++++
 .../PublisherConsumerController.php           |  24 +-
 .../Product/Action/AttributeTest.php          |  63 ++++-
 6 files changed, 315 insertions(+), 405 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
 create mode 100644 app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/SaveTest.php

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 69969231490b7..eb75b8f7a701d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
+use Magento\Catalog\Api\Data\MassActionInterface;
 use Magento\Catalog\Api\Data\MassActionInterfaceFactory;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
@@ -15,96 +16,48 @@
 
 /**
  * Class Save
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface
 {
-    /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
-     */
-    protected $_productFlatIndexerProcessor;
-
-    /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
-     */
-    protected $_productPriceIndexerProcessor;
-
-    /**
-     * Catalog product
-     *
-     * @var \Magento\Catalog\Helper\Product
-     */
-    protected $_catalogProduct;
-
-    /**
-     * @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory
-     */
-    protected $stockItemFactory;
-
-    /**
-     * Stock Indexer
-     *
-     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-     */
-    protected $_stockIndexerProcessor;
-
-    /**
-     * @var \Magento\Framework\Api\DataObjectHelper
-     */
-    protected $dataObjectHelper;
-
     /**
      * @var PublisherInterface
      */
     private $messagePublisher;
+
     /**
      * @var MassActionInterfaceFactory|null
      */
     private $massActionFactory;
 
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
-     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
-     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
-     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
-     * @param \Magento\Catalog\Helper\Product $catalogProduct
-     * @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
-     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param StockConfigurationInterface|null $stockConfiguration
      * @param PublisherInterface|null $publisher
      * @param MassActionInterfaceFactory|null $massAction
      */
     public function __construct(
         Action\Context $context,
         \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
-        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
-        \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
-        \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
-        \Magento\Catalog\Helper\Product $catalogProduct,
-        \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory,
-        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        StockConfigurationInterface $stockConfiguration = null,
         PublisherInterface $publisher = null,
         MassActionInterfaceFactory $massAction = null
     ) {
-        $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
-        $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
-        $this->_stockIndexerProcessor = $stockIndexerProcessor;
-        $this->_catalogProduct = $catalogProduct;
-        $this->stockItemFactory = $stockItemFactory;
         parent::__construct($context, $attributeHelper);
-        $this->dataObjectHelper = $dataObjectHelper;
         $this->messagePublisher = $publisher ?: ObjectManager::getInstance()->get(PublisherInterface::class);
         $this->massActionFactory = $massAction ?: ObjectManager::getInstance()->get(MassActionInterfaceFactory::class);
+        $this->stockConfiguration = $stockConfiguration;
     }
 
     /**
      * Update product attributes
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function execute()
     {
@@ -114,30 +67,27 @@ public function execute()
 
         /* Collect Data */
         $inventoryData = $this->getRequest()->getParam('inventory', []);
+        $inventoryData = $this->addConfigSettings($inventoryData);
         $attributesData = $this->getRequest()->getParam('attributes', []);
         $websiteRemoveData = $this->getRequest()->getParam('remove_website_ids', []);
         $websiteAddData = $this->getRequest()->getParam('add_website_ids', []);
+        $storeId = $this->attributeHelper->getSelectedStoreId();
+        $productIds = $this->attributeHelper->getProductIds();
+        $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
 
-        /* Prepare inventory data item options (use config settings) */
-        $options = $this->_objectManager->get(StockConfigurationInterface::class)->getConfigItemOptions();
-        foreach ($options as $option) {
-            if (isset($inventoryData[$option]) && !isset($inventoryData['use_config_' . $option])) {
-                $inventoryData['use_config_' . $option] = 0;
-            }
-        }
-
+        /* Create DTO for queue */
         $massAction = $this->massActionFactory->create();
         $massAction->setInventory($inventoryData);
         $massAction->setAttributes($attributesData);
         $massAction->setWebsiteRemove($websiteRemoveData);
         $massAction->setWebsiteAdd($websiteAddData);
-        $massAction->setStoreId($this->attributeHelper->getSelectedStoreId());
-        $massAction->setProductIds($this->attributeHelper->getProductIds());
-        $massAction->setWebsiteId($this->attributeHelper->getStoreWebsiteId($massAction->getStoreId()));
+        $massAction->setStoreId($storeId);
+        $massAction->setProductIds($productIds);
+        $massAction->setWebsiteId($websiteId);
 
         try {
             $this->messagePublisher->publish('product_action_attribute.update', $massAction);
-            $this->messageManager->addSuccessMessage(__('Message is added to queue, wait'));
+            $this->messageManager->addSuccessMessage(__('Message is added to queue'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
@@ -147,7 +97,23 @@ public function execute()
             );
         }
 
-        return $this->resultRedirectFactory->create()
-            ->setPath('catalog/product/', ['store' => $massAction->getStoreId()]);
+        return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['store' => $storeId]);
+    }
+
+    /**
+     * Prepare inventory data item options (use config settings)
+     * @param $inventoryData
+     * @return mixed
+     */
+    private function addConfigSettings($inventoryData)
+    {
+        $options = $this->stockConfiguration->getConfigItemOptions();
+        foreach ($options as $option) {
+            $useConfig = 'use_config_' . $option;
+            if (isset($inventoryData[$option]) && !isset($inventoryData[$useConfig])) {
+                $inventoryData[$useConfig] = 0;
+            }
+        }
+        return $inventoryData;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index 029223972780a..1bba257ff9864 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -30,19 +30,19 @@ class Consumer
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
      */
-    protected $_productFlatIndexerProcessor;
+    protected $productFlatIndexerProcessor;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
      */
-    protected $_productPriceIndexerProcessor;
+    protected $productPriceIndexerProcessor;
 
     /**
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
      */
-    protected $_catalogProduct;
+    protected $catalogProduct;
 
     /**
      * @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory
@@ -54,7 +54,7 @@ class Consumer
      *
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
      */
-    protected $_stockIndexerProcessor;
+    protected $stockIndexerProcessor;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
@@ -64,12 +64,24 @@ class Consumer
     /**
      * @var \Magento\Framework\Event\ManagerInterface
      */
-    private $_eventManager;
+    private $eventManager;
 
     /**
      * @var ObjectManager
      */
-    private $_objectManager;
+    private $objectManager;
+    /**
+     * @var \Magento\Catalog\Model\Product\Action
+     */
+    private $productAction;
+    /**
+     * @var \Magento\CatalogInventory\Api\StockRegistryInterface
+     */
+    private $stockRegistry;
+    /**
+     * @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface
+     */
+    private $stockItemRepository;
 
     /**
      * @param \Magento\Catalog\Helper\Product $catalogProduct
@@ -79,6 +91,9 @@ class Consumer
      * @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param \Magento\Catalog\Model\Product\Action $action
+     * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistryFactory
+     * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepositoryFactory
      * @param NotifierInterface $notifier
      */
     public function __construct(
@@ -89,35 +104,42 @@ public function __construct(
         \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Event\ManagerInterface $eventManager,
+        \Magento\Catalog\Model\Product\Action $action,
+        \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistryFactory,
+        \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepositoryFactory,
         NotifierInterface $notifier
     ) {
-        $this->_catalogProduct = $catalogProduct;
-        $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
-        $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
-        $this->_stockIndexerProcessor = $stockIndexerProcessor;
+        $this->catalogProduct = $catalogProduct;
+        $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
+        $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
+        $this->stockIndexerProcessor = $stockIndexerProcessor;
         $this->stockItemFactory = $stockItemFactory;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->notifier = $notifier;
-        $this->_eventManager = $eventManager;
-        $this->_objectManager = ObjectManager::getInstance();
+        $this->eventManager = $eventManager;
+        $this->objectManager = ObjectManager::getInstance();
+        $this->productAction = $action;
+        $this->stockRegistry = $stockRegistryFactory;
+        $this->stockItemRepository = $stockItemRepositoryFactory->create();
     }
 
     public function process(MassActionInterface $data): void
     {
         try {
-            if ($data->getAttributes()) {
-                $attributesData = $this->getAttributesData($data, $data->getAttributes());
-            }
-
             if ($data->getInventory()) {
-                $this->saveInventory($data, $data->getInventory());
+                $this->updateInventoryInProducts($data->getProductIds(), $data->getWebsiteId(), $data->getInventory());
             }
 
             if ($data->getWebsiteAdd() || $data->getWebsiteRemove()) {
-                $this->updateWebsiteInProducts($data, $data->getWebsiteRemove(), $data->getWebsiteAdd());
+                $this->updateWebsiteInProducts($data->getProductIds(), $data->getWebsiteRemove(), $data->getWebsiteAdd());
+            }
+
+            if ($data->getAttributes()) {
+                $attributesData = $this->getAttributesData($data->getProductIds(), $data->getStoreId(), $data->getAttributes());
+                $this->reindex($data->getProductIds(), $attributesData, $data->getWebsiteRemove(), $data->getWebsiteAdd());
             }
 
-            $this->reindex($data, $attributesData, $data->getWebsiteRemove(), $data->getWebsiteAdd());
+            $this->productFlatIndexerProcessor->reindexList($data->getProductIds());
 
             $this->notifier->addNotice(
                 __('Product attributes updated'),
@@ -133,17 +155,18 @@ public function process(MassActionInterface $data): void
     }
 
     /**
-     * @param MassActionInterface $data
+     * @param $productIds
+     * @param $storeId
      * @param $attributesData
      * @return mixed
      */
-    private function getAttributesData(MassActionInterface $data, $attributesData)
+    private function getAttributesData($productIds, $storeId, $attributesData)
     {
-        $dateFormat = $this->_objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
+        $dateFormat = $this->objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
             ->getDateFormat(\IntlDateFormatter::SHORT);
 
         foreach ($attributesData as $attributeCode => $value) {
-            $attribute = $this->_objectManager->get(\Magento\Eav\Model\Config::class)
+            $attribute = $this->objectManager->get(\Magento\Eav\Model\Config::class)
                 ->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
             if (!$attribute->getAttributeId()) {
                 unset($attributesData[$attributeCode]);
@@ -174,29 +197,19 @@ private function getAttributesData(MassActionInterface $data, $attributesData)
             }
         }
 
-        $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class)
-            ->updateAttributes($data->getProductIds(), $attributesData, $data->getStoreId());
+        $this->productAction->updateAttributes($productIds, $attributesData, $storeId);
         return $attributesData;
     }
 
     /**
-     * @param MassActionInterface $data
+     * @param $productIds
+     * @param $websiteId
      * @param $inventoryData
      */
-    private function saveInventory(MassActionInterface $data, $inventoryData): void
+    private function updateInventoryInProducts($productIds, $websiteId, $inventoryData): void
     {
-        // TODO why use ObjectManager?
-        /** @var \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry */
-        $stockRegistry = $this->_objectManager
-            ->create(\Magento\CatalogInventory\Api\StockRegistryInterface::class);
-        /** @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository */
-        $stockItemRepository = $this->_objectManager
-            ->create(\Magento\CatalogInventory\Api\StockItemRepositoryInterface::class);
-        foreach ($data->getProductIds() as $productId) {
-            $stockItemDo = $stockRegistry->getStockItem(
-                $productId,
-                $data->getWebsiteId()
-            );
+        foreach ($productIds as $productId) {
+            $stockItemDo = $this->stockRegistry->getStockItem($productId, $websiteId);
             if (!$stockItemDo->getProductId()) {
                 $inventoryData['product_id'] = $productId;
             }
@@ -208,47 +221,41 @@ private function saveInventory(MassActionInterface $data, $inventoryData): void
                 \Magento\CatalogInventory\Api\Data\StockItemInterface::class
             );
             $stockItemDo->setItemId($stockItemId);
-            $stockItemRepository->save($stockItemDo);
+            $this->stockItemRepository->save($stockItemDo);
         }
-        $this->_stockIndexerProcessor->reindexList($data->getProductIds());
+        $this->stockIndexerProcessor->reindexList($productIds);
     }
 
     /**
-     * @param MassActionInterface $data
+     * @param $productIds
      * @param $websiteRemoveData
      * @param $websiteAddData
      */
-    private function updateWebsiteInProducts(MassActionInterface $data, $websiteRemoveData, $websiteAddData): void
+    private function updateWebsiteInProducts($productIds, $websiteRemoveData, $websiteAddData): void
     {
-        /* @var $actionModel \Magento\Catalog\Model\Product\Action */
-        $actionModel = $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class);
-        $productIds = $data->getProductIds();
-
         if ($websiteRemoveData) {
-            $actionModel->updateWebsites($productIds, $websiteRemoveData, 'remove');
+            $this->productAction->updateWebsites($productIds, $websiteRemoveData, 'remove');
         }
         if ($websiteAddData) {
-            $actionModel->updateWebsites($productIds, $websiteAddData, 'add');
+            $this->productAction->updateWebsites($productIds, $websiteAddData, 'add');
         }
 
-        $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
+        $this->eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
     }
 
     /**
-     * @param MassActionInterface $data
+     * @param $productIds
      * @param $attributesData
      * @param $websiteRemoveData
      * @param $websiteAddData
      */
-    private function reindex(MassActionInterface $data, $attributesData, $websiteRemoveData, $websiteAddData): void
+    private function reindex($productIds, $attributesData, $websiteRemoveData, $websiteAddData): void
     {
-        $this->_productFlatIndexerProcessor->reindexList($data->getProductIds());
-
-        if ($this->_catalogProduct->isDataForPriceIndexerWasChanged($attributesData)
+        if ($this->catalogProduct->isDataForPriceIndexerWasChanged($attributesData)
             || !empty($websiteRemoveData)
             || !empty($websiteAddData)
         ) {
-            $this->_productPriceIndexerProcessor->reindexList($data->getProductIds());
+            $this->productPriceIndexerProcessor->reindexList($productIds);
         }
     }
 }
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
deleted file mode 100644
index de44af7f58afc..0000000000000
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Action\Attribute;
-
-/**
- * @SuppressWarnings(PHPMD.TooManyFields)
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class SaveTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save */
-    protected $object;
-
-    /** @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute|\PHPUnit_Framework_MockObject_MockObject */
-    protected $attributeHelper;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $dataObjectHelperMock;
-
-    /** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stockIndexerProcessor;
-
-    /** @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
-    protected $context;
-
-    /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */
-    protected $request;
-
-    /** @var \Magento\Framework\App\Response\Http|\PHPUnit_Framework_MockObject_MockObject */
-    protected $response;
-
-    /** @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $objectManager;
-
-    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $eventManager;
-
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $url;
-
-    /** @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $redirect;
-
-    /** @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject */
-    protected $actionFlag;
-
-    /** @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $view;
-
-    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $messageManager;
-
-    /** @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
-    protected $session;
-
-    /** @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $authorization;
-
-    /** @var \Magento\Backend\Model\Auth|\PHPUnit_Framework_MockObject_MockObject */
-    protected $auth;
-
-    /** @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $helper;
-
-    /** @var \Magento\Backend\Model\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $backendUrl;
-
-    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
-    protected $formKeyValidator;
-
-    /** @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $localeResolver;
-
-    /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
-    protected $product;
-
-    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stockItemService;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $stockItem;
-
-    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stockConfig;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $stockItemRepository;
-
-    /**
-     * @var  \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirectFactory;
-
-    protected function setUp()
-    {
-        $this->attributeHelper = $this->createPartialMock(
-            \Magento\Catalog\Helper\Product\Edit\Action\Attribute::class,
-            ['getProductIds', 'getSelectedStoreId', 'getStoreWebsiteId']
-        );
-
-        $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->stockIndexerProcessor = $this->createPartialMock(
-            \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class,
-            ['reindexList']
-        );
-
-        $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultRedirectFactory = $this->getMockBuilder(\Magento\Backend\Model\View\Result\RedirectFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->resultRedirectFactory->expects($this->atLeastOnce())
-            ->method('create')
-            ->willReturn($resultRedirect);
-
-        $this->prepareContext();
-
-        $this->object = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
-            \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::class,
-            [
-                'context' => $this->context,
-                'attributeHelper' => $this->attributeHelper,
-                'stockIndexerProcessor' => $this->stockIndexerProcessor,
-                'dataObjectHelper' => $this->dataObjectHelperMock,
-            ]
-        );
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    protected function prepareContext()
-    {
-        $this->stockItemRepository = $this->getMockBuilder(
-            \Magento\CatalogInventory\Api\StockItemRepositoryInterface::class
-        )->disableOriginalConstructor()->getMock();
-
-        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-            ->disableOriginalConstructor()->getMock();
-        $this->response = $this->createMock(\Magento\Framework\App\Response\Http::class);
-        $this->objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-        $this->eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-        $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
-        $this->redirect = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
-        $this->actionFlag = $this->createMock(\Magento\Framework\App\ActionFlag::class);
-        $this->view = $this->createMock(\Magento\Framework\App\ViewInterface::class);
-        $this->messageManager = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
-        $this->session = $this->createMock(\Magento\Backend\Model\Session::class);
-        $this->authorization = $this->createMock(\Magento\Framework\AuthorizationInterface::class);
-        $this->auth = $this->createMock(\Magento\Backend\Model\Auth::class);
-        $this->helper = $this->createMock(\Magento\Backend\Helper\Data::class);
-        $this->backendUrl = $this->createMock(\Magento\Backend\Model\UrlInterface::class);
-        $this->formKeyValidator = $this->createMock(\Magento\Framework\Data\Form\FormKey\Validator::class);
-        $this->localeResolver = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
-
-        $this->context = $this->context = $this->createPartialMock(\Magento\Backend\App\Action\Context::class, [
-                'getRequest',
-                'getResponse',
-                'getObjectManager',
-                'getEventManager',
-                'getUrl',
-                'getRedirect',
-                'getActionFlag',
-                'getView',
-                'getMessageManager',
-                'getSession',
-                'getAuthorization',
-                'getAuth',
-                'getHelper',
-                'getBackendUrl',
-                'getFormKeyValidator',
-                'getLocaleResolver',
-                'getResultRedirectFactory'
-            ]);
-        $this->context->expects($this->any())->method('getRequest')->willReturn($this->request);
-        $this->context->expects($this->any())->method('getResponse')->willReturn($this->response);
-        $this->context->expects($this->any())->method('getObjectManager')->willReturn($this->objectManager);
-        $this->context->expects($this->any())->method('getEventManager')->willReturn($this->eventManager);
-        $this->context->expects($this->any())->method('getUrl')->willReturn($this->url);
-        $this->context->expects($this->any())->method('getRedirect')->willReturn($this->redirect);
-        $this->context->expects($this->any())->method('getActionFlag')->willReturn($this->actionFlag);
-        $this->context->expects($this->any())->method('getView')->willReturn($this->view);
-        $this->context->expects($this->any())->method('getMessageManager')->willReturn($this->messageManager);
-        $this->context->expects($this->any())->method('getSession')->willReturn($this->session);
-        $this->context->expects($this->any())->method('getAuthorization')->willReturn($this->authorization);
-        $this->context->expects($this->any())->method('getAuth')->willReturn($this->auth);
-        $this->context->expects($this->any())->method('getHelper')->willReturn($this->helper);
-        $this->context->expects($this->any())->method('getBackendUrl')->willReturn($this->backendUrl);
-        $this->context->expects($this->any())->method('getFormKeyValidator')->willReturn($this->formKeyValidator);
-        $this->context->expects($this->any())->method('getLocaleResolver')->willReturn($this->localeResolver);
-        $this->context->expects($this->any())
-            ->method('getResultRedirectFactory')
-            ->willReturn($this->resultRedirectFactory);
-
-        $this->product = $this->createPartialMock(
-            \Magento\Catalog\Model\Product::class,
-            ['isProductsHasSku', '__wakeup']
-        );
-
-        $this->stockItemService = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockRegistryInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getStockItem', 'saveStockItem'])
-            ->getMockForAbstractClass();
-        $this->stockItem = $this->getMockBuilder(\Magento\CatalogInventory\Api\Data\StockItemInterface::class)
-            ->setMethods(['getId', 'getProductId'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->stockConfig = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockConfigurationInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->objectManager->expects($this->any())->method('create')->will($this->returnValueMap([
-            [\Magento\Catalog\Model\Product::class, [], $this->product],
-            [\Magento\CatalogInventory\Api\StockRegistryInterface::class, [], $this->stockItemService],
-            [\Magento\CatalogInventory\Api\StockItemRepositoryInterface::class, [], $this->stockItemRepository],
-        ]));
-
-        $this->objectManager->expects($this->any())->method('get')->will($this->returnValueMap([
-            [\Magento\CatalogInventory\Api\StockConfigurationInterface::class, $this->stockConfig],
-        ]));
-    }
-
-    public function testExecuteThatProductIdsAreObtainedFromAttributeHelper()
-    {
-        $this->attributeHelper->expects($this->any())->method('getProductIds')->will($this->returnValue([5]));
-        $this->attributeHelper->expects($this->any())->method('getSelectedStoreId')->will($this->returnValue([1]));
-        $this->attributeHelper->expects($this->any())->method('getStoreWebsiteId')->will($this->returnValue(1));
-        $this->stockConfig->expects($this->any())->method('getConfigItemOptions')->will($this->returnValue([]));
-        $this->dataObjectHelperMock->expects($this->any())
-            ->method('populateWithArray')
-            ->with($this->stockItem, $this->anything(), \Magento\CatalogInventory\Api\Data\StockItemInterface::class)
-            ->willReturnSelf();
-        $this->product->expects($this->any())->method('isProductsHasSku')->with([5])->will($this->returnValue(true));
-        $this->stockItemService->expects($this->any())->method('getStockItem')->with(5, 1)
-            ->will($this->returnValue($this->stockItem));
-        $this->stockIndexerProcessor->expects($this->any())->method('reindexList')->with([5]);
-
-        $this->request->expects($this->any())->method('getParam')->will($this->returnValueMap([
-            ['inventory', [], [7]],
-        ]));
-
-        $this->messageManager->expects($this->never())->method('addErrorMessage');
-        $this->messageManager->expects($this->never())->method('addExceptionMessage');
-
-        $this->object->execute();
-    }
-}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/SaveTest.php
new file mode 100644
index 0000000000000..26e84df443ef8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/SaveTest.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Unit\Model\Attribute\Backend\Consumer;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ConsumerTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Catalog\Model\Attribute\Backend\Consumer */
+    protected $object;
+
+    /** @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute|\PHPUnit_Framework_MockObject_MockObject */
+    protected $attributeHelper;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $dataObjectHelperMock;
+
+    /** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor|\PHPUnit_Framework_MockObject_MockObject */
+    protected $stockIndexerProcessor;
+
+    /** @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
+    protected $context;
+
+    /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */
+    protected $request;
+
+    /** @var \Magento\Framework\App\Response\Http|\PHPUnit_Framework_MockObject_MockObject */
+    protected $response;
+
+    /** @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $objectManager;
+
+    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $eventManager;
+
+    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $url;
+
+    /** @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $redirect;
+
+    /** @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject */
+    protected $actionFlag;
+
+    /** @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $view;
+
+    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $messageManager;
+
+    /** @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
+    protected $session;
+
+    /** @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $authorization;
+
+    /** @var \Magento\Backend\Model\Auth|\PHPUnit_Framework_MockObject_MockObject */
+    protected $auth;
+
+    /** @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    protected $helper;
+
+    /** @var \Magento\Backend\Model\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $backendUrl;
+
+    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
+    protected $formKeyValidator;
+
+    /** @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $localeResolver;
+
+    /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
+    protected $product;
+
+    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $stockItemService;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $stockItem;
+
+    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $stockConfig;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $stockItemRepository;
+
+    /**
+     * @var  \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirectFactory;
+
+    protected function setUp()
+    {
+        $this->attributeHelper = $this->createPartialMock(
+            \Magento\Catalog\Helper\Product\Edit\Action\Attribute::class,
+            ['getProductIds', 'getSelectedStoreId', 'getStoreWebsiteId']
+        );
+
+        $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->stockIndexerProcessor = $this->createPartialMock(
+            \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class,
+            ['reindexList']
+        );
+
+        $this->object = (new ObjectManager($this))->getObject(
+            \Magento\Catalog\Model\Attribute\Backend\Consumer::class,
+            [
+                'stockIndexerProcessor' => $this->stockIndexerProcessor,
+                'dataObjectHelper' => $this->dataObjectHelperMock,
+            ]
+        );
+    }
+
+    public function testExecuteThatProductIdsAreObtainedFromAttributeHelper()
+    {
+        $this->attributeHelper->method('getProductIds')->will($this->returnValue([5]));
+        $this->attributeHelper->method('getSelectedStoreId')->will($this->returnValue([1]));
+        $this->attributeHelper->method('getStoreWebsiteId')->will($this->returnValue(1));
+
+        $this->stockConfig->expects($this->any())->method('getConfigItemOptions')->will($this->returnValue([]));
+        $this->dataObjectHelperMock->expects($this->any())
+            ->method('populateWithArray')
+            ->with($this->stockItem, $this->anything(), \Magento\CatalogInventory\Api\Data\StockItemInterface::class)
+            ->willReturnSelf();
+        $this->product->expects($this->any())->method('isProductsHasSku')->with([5])->will($this->returnValue(true));
+        $this->stockItemService->expects($this->any())->method('getStockItem')->with(5, 1)
+            ->will($this->returnValue($this->stockItem));
+        $this->stockIndexerProcessor->expects($this->any())->method('reindexList')->with([5]);
+
+        $this->request->expects($this->any())->method('getParam')->will($this->returnValueMap([
+            ['inventory', [], [7]],
+        ]));
+
+        $this->messageManager->expects($this->never())->method('addErrorMessage');
+        $this->messageManager->expects($this->never())->method('addExceptionMessage');
+
+        $this->object->process();
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
index 9ca351aa1cf98..7748e43bbd621 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
@@ -95,17 +95,9 @@ public function initialize()
             $this->amqpHelper->deleteConnection($connectionName);
         }
         $this->amqpHelper->clearQueue("async.operations.all");
-        foreach ($this->consumers as $consumer) {
-            foreach ($this->getConsumerProcessIds($consumer) as $consumerProcessId) {
-                exec("kill {$consumerProcessId}");
-            }
-        }
-        foreach ($this->consumers as $consumer) {
-            if (!$this->getConsumerProcessIds($consumer)) {
-                exec("{$this->getConsumerStartCommand($consumer, true)} > /dev/null &");
-            }
-            sleep(5);
-        }
+
+        $this->stopConsumers();
+        $this->startConsumers();
 
         if (file_exists($this->logFilePath)) {
             // try to remove before failing the test
@@ -230,4 +222,14 @@ public function getPublisher()
     {
         return $this->publisher;
     }
+
+    public function startConsumers(): void
+    {
+        foreach ($this->consumers as $consumer) {
+            if (!$this->getConsumerProcessIds($consumer)) {
+                exec("{$this->getConsumerStartCommand($consumer, true)} > /dev/null &");
+            }
+            sleep(5);
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
index a2967878402d0..0fe618b2db304 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
@@ -5,13 +5,49 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action;
 
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\MessageQueue\PublisherConsumerController;
 
 /**
  * @magentoAppArea adminhtml
  */
 class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /** @var PublisherConsumerController */
+    private $publisherConsumerController;
+    private $consumers = ['product_action_attribute.update'];
+
+    protected function setUp()
+    {
+        $this->publisherConsumerController = Bootstrap::getObjectManager()->create(PublisherConsumerController::class, [
+            'consumers' => $this->consumers,
+            'logFilePath' => TESTS_TEMP_DIR . "/MessageQueueTestLog.txt",
+            'maxMessages' => null,
+            'appInitParams' => Bootstrap::getInstance()->getAppInitParams()
+        ]);
+
+        try {
+            $this->publisherConsumerController->startConsumers();
+        } catch (\Magento\TestFramework\MessageQueue\EnvironmentPreconditionException $e) {
+            $this->markTestSkipped($e->getMessage());
+        } catch (\Magento\TestFramework\MessageQueue\PreconditionFailedException $e) {
+            $this->fail(
+                $e->getMessage()
+            );
+        }
+
+        parent::setUp();
+    }
+
+    protected function tearDown()
+    {
+        $this->publisherConsumerController->stopConsumers();
+        parent::tearDown();
+    }
+
     /**
      * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save::execute
      *
@@ -20,7 +56,7 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
      */
     public function testSaveActionRedirectsSuccessfully()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var $session \Magento\Backend\Model\Session */
         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
@@ -59,13 +95,14 @@ public function testSaveActionRedirectsSuccessfully()
      */
     public function testSaveActionChangeVisibility($attributes)
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ProductRepository::class
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var ProductRepository $repository */
+        $repository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
         );
         $product = $repository->get('simple');
         $product->setOrigData();
-        $product->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE);
+        $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
         $product->save();
 
         /** @var $session \Magento\Backend\Model\Session */
@@ -75,15 +112,21 @@ public function testSaveActionChangeVisibility($attributes)
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
+
         /** @var \Magento\Catalog\Model\Category $category */
-        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $categoryFactory = Bootstrap::getObjectManager()->get(
             \Magento\Catalog\Model\CategoryFactory::class
         );
         /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */
-        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $listProduct = Bootstrap::getObjectManager()->get(
             \Magento\Catalog\Block\Product\ListProduct::class
         );
 
+        $this->publisherConsumerController->waitForAsynchronousResult(function() use($repository)  {
+            return $repository->get('simple', false, null, true)->getVisibility() !=  Visibility::VISIBILITY_NOT_VISIBLE;
+            sleep(3);
+        }, []);
+
         $category = $categoryFactory->create()->load(2);
         $layer = $listProduct->getLayer();
         $layer->setCurrentCategory($category);
@@ -105,7 +148,7 @@ public function testSaveActionChangeVisibility($attributes)
      */
     public function testValidateActionWithMassUpdate($attributes)
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var $session \Magento\Backend\Model\Session */
         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
@@ -156,8 +199,8 @@ public function validateActionDataProvider()
     public function saveActionVisibilityAttrDataProvider()
     {
         return [
-            ['arguments' => ['visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH]],
-            ['arguments' => ['visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG]]
+            ['arguments' => ['visibility' => Visibility::VISIBILITY_BOTH]],
+            ['arguments' => ['visibility' => Visibility::VISIBILITY_IN_CATALOG]]
         ];
     }
 }

From 60b48a6d2efad7fb2999856e3f8fa41ef01a0fff Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Tue, 19 Feb 2019 17:27:04 -0600
Subject: [PATCH 0401/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Model/Attribute/Backend/Consumer.php      | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index 1bba257ff9864..f9b8b44b14281 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -8,9 +8,11 @@
 namespace Magento\Catalog\Model\Attribute\Backend;
 
 use Magento\Catalog\Api\Data\MassActionInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Notification\NotifierInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  * Consumer for export message.
@@ -70,16 +72,19 @@ class Consumer
      * @var ObjectManager
      */
     private $objectManager;
+
     /**
      * @var \Magento\Catalog\Model\Product\Action
      */
     private $productAction;
+
     /**
-     * @var \Magento\CatalogInventory\Api\StockRegistryInterface
+     * @var \Magento\CatalogInventory\Api\StockRegistryInterfaceFactory
      */
     private $stockRegistry;
+
     /**
-     * @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface
+     * @var \Magento\CatalogInventory\Api\StockItemRepositoryInterfaceFactory
      */
     private $stockItemRepository;
 
@@ -92,8 +97,8 @@ class Consumer
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Product\Action $action
-     * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistryFactory
-     * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepositoryFactory
+     * @param \Magento\CatalogInventory\Api\StockRegistryInterfaceFactory $stockRegistryFactory
+     * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterfaceFactory $stockItemRepositoryFactory
      * @param NotifierInterface $notifier
      */
     public function __construct(
@@ -105,8 +110,8 @@ public function __construct(
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Product\Action $action,
-        \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistryFactory,
-        \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepositoryFactory,
+        \Magento\CatalogInventory\Api\StockRegistryInterfaceFactory $stockRegistryFactory,
+        \Magento\CatalogInventory\Api\StockItemRepositoryInterfaceFactory $stockItemRepositoryFactory,
         NotifierInterface $notifier
     ) {
         $this->catalogProduct = $catalogProduct;
@@ -119,7 +124,7 @@ public function __construct(
         $this->eventManager = $eventManager;
         $this->objectManager = ObjectManager::getInstance();
         $this->productAction = $action;
-        $this->stockRegistry = $stockRegistryFactory;
+        $this->stockRegistry = $stockRegistryFactory->create();
         $this->stockItemRepository = $stockItemRepositoryFactory->create();
     }
 
@@ -162,12 +167,11 @@ public function process(MassActionInterface $data): void
      */
     private function getAttributesData($productIds, $storeId, $attributesData)
     {
-        $dateFormat = $this->objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
-            ->getDateFormat(\IntlDateFormatter::SHORT);
+        $dateFormat = $this->objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
+        $config = $this->objectManager->get(\Magento\Eav\Model\Config::class);
 
         foreach ($attributesData as $attributeCode => $value) {
-            $attribute = $this->objectManager->get(\Magento\Eav\Model\Config::class)
-                ->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+            $attribute = $config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
             if (!$attribute->getAttributeId()) {
                 unset($attributesData[$attributeCode]);
                 continue;
@@ -215,11 +219,7 @@ private function updateInventoryInProducts($productIds, $websiteId, $inventoryDa
             }
 
             $stockItemId = $stockItemDo->getId();
-            $this->dataObjectHelper->populateWithArray(
-                $stockItemDo,
-                $inventoryData,
-                \Magento\CatalogInventory\Api\Data\StockItemInterface::class
-            );
+            $this->dataObjectHelper->populateWithArray($stockItemDo, $inventoryData, StockItemInterface::class);
             $stockItemDo->setItemId($stockItemId);
             $this->stockItemRepository->save($stockItemDo);
         }

From e0415bf6d4c37e7599712525735132bca144e1ee Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Wed, 20 Feb 2019 08:22:59 -0600
Subject: [PATCH 0402/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Magento/Framework/Reflection/DataObjectProcessor.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index dfe0e5c9f30f3..2f3caf08c534e 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -115,11 +115,11 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
                 } elseif (is_array($value)) {
                     $valueResult = [];
                     $arrayElementType = substr($returnType, 0, -2);
-                    foreach ($value as $singleKey => $singleValue) {
+                    foreach ($value as $singleValue) {
                         if (is_object($singleValue) && !($singleValue instanceof Phrase)) {
                             $singleValue = $this->buildOutputDataArray($singleValue, $arrayElementType);
                         }
-                        $valueResult[$singleKey] = $this->typeCaster->castValueToType($singleValue, $arrayElementType);
+                        $valueResult[] = $this->typeCaster->castValueToType($singleValue, $arrayElementType);
                     }
                     $value = $valueResult;
                 } else {

From feb01364e746919f4bd0121f330c231b0b560d6d Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Wed, 20 Feb 2019 11:12:50 -0600
Subject: [PATCH 0403/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Unit/Model/Attribute/Backend/SaveTest.php | 150 ------------------
 1 file changed, 150 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/SaveTest.php

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/SaveTest.php
deleted file mode 100644
index 26e84df443ef8..0000000000000
--- a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/SaveTest.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Test\Unit\Model\Attribute\Backend\Consumer;
-
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
-/**
- * @SuppressWarnings(PHPMD.TooManyFields)
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ConsumerTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\Catalog\Model\Attribute\Backend\Consumer */
-    protected $object;
-
-    /** @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute|\PHPUnit_Framework_MockObject_MockObject */
-    protected $attributeHelper;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $dataObjectHelperMock;
-
-    /** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stockIndexerProcessor;
-
-    /** @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
-    protected $context;
-
-    /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */
-    protected $request;
-
-    /** @var \Magento\Framework\App\Response\Http|\PHPUnit_Framework_MockObject_MockObject */
-    protected $response;
-
-    /** @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $objectManager;
-
-    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $eventManager;
-
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $url;
-
-    /** @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $redirect;
-
-    /** @var \Magento\Framework\App\ActionFlag|\PHPUnit_Framework_MockObject_MockObject */
-    protected $actionFlag;
-
-    /** @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $view;
-
-    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $messageManager;
-
-    /** @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
-    protected $session;
-
-    /** @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $authorization;
-
-    /** @var \Magento\Backend\Model\Auth|\PHPUnit_Framework_MockObject_MockObject */
-    protected $auth;
-
-    /** @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $helper;
-
-    /** @var \Magento\Backend\Model\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $backendUrl;
-
-    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
-    protected $formKeyValidator;
-
-    /** @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $localeResolver;
-
-    /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
-    protected $product;
-
-    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stockItemService;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $stockItem;
-
-    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $stockConfig;
-
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $stockItemRepository;
-
-    /**
-     * @var  \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resultRedirectFactory;
-
-    protected function setUp()
-    {
-        $this->attributeHelper = $this->createPartialMock(
-            \Magento\Catalog\Helper\Product\Edit\Action\Attribute::class,
-            ['getProductIds', 'getSelectedStoreId', 'getStoreWebsiteId']
-        );
-
-        $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->stockIndexerProcessor = $this->createPartialMock(
-            \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class,
-            ['reindexList']
-        );
-
-        $this->object = (new ObjectManager($this))->getObject(
-            \Magento\Catalog\Model\Attribute\Backend\Consumer::class,
-            [
-                'stockIndexerProcessor' => $this->stockIndexerProcessor,
-                'dataObjectHelper' => $this->dataObjectHelperMock,
-            ]
-        );
-    }
-
-    public function testExecuteThatProductIdsAreObtainedFromAttributeHelper()
-    {
-        $this->attributeHelper->method('getProductIds')->will($this->returnValue([5]));
-        $this->attributeHelper->method('getSelectedStoreId')->will($this->returnValue([1]));
-        $this->attributeHelper->method('getStoreWebsiteId')->will($this->returnValue(1));
-
-        $this->stockConfig->expects($this->any())->method('getConfigItemOptions')->will($this->returnValue([]));
-        $this->dataObjectHelperMock->expects($this->any())
-            ->method('populateWithArray')
-            ->with($this->stockItem, $this->anything(), \Magento\CatalogInventory\Api\Data\StockItemInterface::class)
-            ->willReturnSelf();
-        $this->product->expects($this->any())->method('isProductsHasSku')->with([5])->will($this->returnValue(true));
-        $this->stockItemService->expects($this->any())->method('getStockItem')->with(5, 1)
-            ->will($this->returnValue($this->stockItem));
-        $this->stockIndexerProcessor->expects($this->any())->method('reindexList')->with([5]);
-
-        $this->request->expects($this->any())->method('getParam')->will($this->returnValueMap([
-            ['inventory', [], [7]],
-        ]));
-
-        $this->messageManager->expects($this->never())->method('addErrorMessage');
-        $this->messageManager->expects($this->never())->method('addExceptionMessage');
-
-        $this->object->process();
-    }
-}

From 0e88105706c797560f66da4af8c4d5bfc547ff62 Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Wed, 20 Feb 2019 17:15:17 -0600
Subject: [PATCH 0404/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Catalog/Api/Data/MassActionInterface.php  | 21 ++++++++++--
 .../Product/Action/Attribute/Save.php         |  9 ++---
 .../Model/Attribute/Backend/Consumer.php      | 33 +++++++++---------
 app/code/Magento/Catalog/Model/MassAction.php | 34 ++++++++++++++++---
 4 files changed, 69 insertions(+), 28 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/Data/MassActionInterface.php b/app/code/Magento/Catalog/Api/Data/MassActionInterface.php
index 3f47242e3aa61..c03a73df5e92d 100644
--- a/app/code/Magento/Catalog/Api/Data/MassActionInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/MassActionInterface.php
@@ -38,7 +38,7 @@ public function getInventory():array;
      * @return void
      * @since 101.1.0
      */
-    public function setAttributes($data);
+    public function setAttributeKeys($data);
 
     /**
      * Get data value.
@@ -46,7 +46,24 @@ public function setAttributes($data);
      * @return string[]
      * @since 101.1.0
      */
-    public function getAttributes():array;
+    public function getAttributeKeys():array;
+
+    /**
+     * Set data value.
+     *
+     * @param string[] $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setAttributeValues($data);
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getAttributeValues():array;
 
     /**
      * Set data value.
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index eb75b8f7a701d..331b3ed07831f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -6,10 +6,9 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
-use Magento\Catalog\Api\Data\MassActionInterface;
 use Magento\Catalog\Api\Data\MassActionInterfaceFactory;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Framework\MessageQueue\PublisherInterface;
 use Magento\Framework\App\ObjectManager;
@@ -51,7 +50,8 @@ public function __construct(
         parent::__construct($context, $attributeHelper);
         $this->messagePublisher = $publisher ?: ObjectManager::getInstance()->get(PublisherInterface::class);
         $this->massActionFactory = $massAction ?: ObjectManager::getInstance()->get(MassActionInterfaceFactory::class);
-        $this->stockConfiguration = $stockConfiguration;
+        $this->stockConfiguration = $stockConfiguration
+            ?: ObjectManager::getInstance()->get(StockConfigurationInterface::class);
     }
 
     /**
@@ -78,7 +78,8 @@ public function execute()
         /* Create DTO for queue */
         $massAction = $this->massActionFactory->create();
         $massAction->setInventory($inventoryData);
-        $massAction->setAttributes($attributesData);
+        $massAction->setAttributeValues(array_values($attributesData));
+        $massAction->setAttributeKeys(array_keys($attributesData));
         $massAction->setWebsiteRemove($websiteRemoveData);
         $massAction->setWebsiteAdd($websiteAddData);
         $massAction->setStoreId($storeId);
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index f9b8b44b14281..f340cb49ee099 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -32,36 +32,31 @@ class Consumer
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
      */
-    protected $productFlatIndexerProcessor;
+    private $productFlatIndexerProcessor;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
      */
-    protected $productPriceIndexerProcessor;
+    private $productPriceIndexerProcessor;
 
     /**
      * Catalog product
      *
      * @var \Magento\Catalog\Helper\Product
      */
-    protected $catalogProduct;
-
-    /**
-     * @var \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory
-     */
-    protected $stockItemFactory;
+    private $catalogProduct;
 
     /**
      * Stock Indexer
      *
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
      */
-    protected $stockIndexerProcessor;
+    private $stockIndexerProcessor;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper
      */
-    protected $dataObjectHelper;
+    private $dataObjectHelper;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface
@@ -93,7 +88,6 @@ class Consumer
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
      * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
-     * @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Product\Action $action
@@ -106,7 +100,6 @@ public function __construct(
         \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
         \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
-        \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Product\Action $action,
@@ -118,7 +111,6 @@ public function __construct(
         $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
         $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
         $this->stockIndexerProcessor = $stockIndexerProcessor;
-        $this->stockItemFactory = $stockItemFactory;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->notifier = $notifier;
         $this->eventManager = $eventManager;
@@ -139,8 +131,13 @@ public function process(MassActionInterface $data): void
                 $this->updateWebsiteInProducts($data->getProductIds(), $data->getWebsiteRemove(), $data->getWebsiteAdd());
             }
 
-            if ($data->getAttributes()) {
-                $attributesData = $this->getAttributesData($data->getProductIds(), $data->getStoreId(), $data->getAttributes());
+            if ($data->getAttributeValues()) {
+                $attributesData = $this->getAttributesData(
+                    $data->getProductIds(),
+                    $data->getStoreId(),
+                    $data->getAttributeValues(),
+                    $data->getAttributeKeys()
+                );
                 $this->reindex($data->getProductIds(), $attributesData, $data->getWebsiteRemove(), $data->getWebsiteAdd());
             }
 
@@ -162,11 +159,13 @@ public function process(MassActionInterface $data): void
     /**
      * @param $productIds
      * @param $storeId
-     * @param $attributesData
+     * @param $attributeValuesData
+     * @param $attributeKeysData
      * @return mixed
      */
-    private function getAttributesData($productIds, $storeId, $attributesData)
+    private function getAttributesData($productIds, $storeId, $attributeValuesData, $attributeKeysData)
     {
+        $attributesData = array_combine($attributeKeysData, $attributeValuesData);
         $dateFormat = $this->objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
         $config = $this->objectManager->get(\Magento\Eav\Model\Config::class);
 
diff --git a/app/code/Magento/Catalog/Model/MassAction.php b/app/code/Magento/Catalog/Model/MassAction.php
index 35ed110f9c11a..0f09ff8d7699c 100644
--- a/app/code/Magento/Catalog/Model/MassAction.php
+++ b/app/code/Magento/Catalog/Model/MassAction.php
@@ -4,12 +4,13 @@
 class MassAction implements \Magento\Catalog\Api\Data\MassActionInterface
 {
     private $inventory;
-    private $attributes;
+    private $attributeKeys;
     private $websiteRemove;
     private $websiteAdd;
     private $storeId;
     private $productIds;
     private $websiteId;
+    private $attributeValues;
 
     /**
      * Set data value.
@@ -41,9 +42,9 @@ public function getInventory():array
      * @return void
      * @since 101.1.0
      */
-    public function setAttributes($data)
+    public function setAttributeKeys($data)
     {
-        $this->attributes = $data;
+        $this->attributeKeys = $data;
     }
 
     /**
@@ -52,9 +53,32 @@ public function setAttributes($data)
      * @return string[]
      * @since 101.1.0
      */
-    public function getAttributes():array
+    public function getAttributeKeys():array
     {
-        return $this->attributes;
+        return $this->attributeKeys;
+    }
+
+    /**
+     * Set data value.
+     *
+     * @param string $data
+     * @return void
+     * @since 101.1.0
+     */
+    public function setAttributeValues($data)
+    {
+        $this->attributeValues = $data;
+    }
+
+    /**
+     * Get data value.
+     *
+     * @return string[]
+     * @since 101.1.0
+     */
+    public function getAttributeValues():array
+    {
+        return $this->attributeValues;
     }
 
     /**

From aa7ba8e74dbcce18cf0e8ee5eda0daff2e6754a6 Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Thu, 21 Feb 2019 12:48:17 -0600
Subject: [PATCH 0405/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml  | 2 +-
 .../Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml    | 2 +-
 .../Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml | 2 +-
 .../Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml | 2 +-
 .../Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
index d7607b4b269e8..1e31a9cf0eb23 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -54,7 +54,7 @@
         <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"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
 
         <!--Verify product name, sku and updated price-->
         <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct1.sku$$)}}"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
index c0eebd1512d6d..9961de9ce0171 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -58,7 +58,7 @@
         <click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="toggleToChangePrice"/>
         <fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$$createProductOne.price$$0" stepKey="fillAttributeNameField"/>
         <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
 
         <!-- Assert on storefront default view -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
index 845c47c0e4c20..305e0966a1f4f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -52,7 +52,7 @@
         <click selector="{{AdminEditProductAttributesSection.ChangeAttributeDescriptionToggle}}" stepKey="toggleToChangeDescription"/>
         <fillField selector="{{AdminEditProductAttributesSection.AttributeDescription}}" userInput="Updated $$createProductOne.custom_attributes[description]$$" stepKey="fillAttributeDescriptionField"/>
         <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
 
         <!-- Assert on storefront default view -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
index 593df1c5bc6e1..28285449d7e0d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
@@ -67,7 +67,7 @@
         <waitForAjaxLoad stepKey="waitForLoadWebSiteTab"/>
         <click selector="{{AdminUpdateAttributesWebsiteSection.addProductToWebsite}}" stepKey="checkAddProductToWebsiteCheckbox"/>
         <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 1 record(s) were updated." stepKey="seeSaveSuccess"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue." stepKey="seeSaveSuccess"/>
 
         <!--Got to Store front product page and check url-->
         <amOnPage url="{{StorefrontProductPage.url($$createProduct.sku$$-new)}}" stepKey="navigateToSimpleProductPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
index af12f49bf86ea..2137e4d1fe3dd 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
@@ -57,7 +57,7 @@
         <click selector="{{AdminUpdateAttributesSection.toggleDescription}}" stepKey="clickToggleDescription"/>
         <fillField selector="{{AdminUpdateAttributesSection.description}}" userInput="MFTF automation!" stepKey="fillDescription"/>
         <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 3 record(s) were updated." stepKey="seeSaveSuccess"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSaveSuccess"/>
 
         <!-- Check storefront for description -->
         <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoProduct1"/>

From a3af5e908b7b100969f639bf9356181b32f8c934 Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Fri, 22 Feb 2019 13:19:47 -0600
Subject: [PATCH 0406/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml    | 6 ++++++
 .../AdminMassUpdateProductAttributesGlobalScopeTest.xml   | 6 ++++++
 ...AdminMassUpdateProductAttributesStoreViewScopeTest.xml | 6 ++++++
 .../Test/AdminUrlForProductRewrittenCorrectlyTest.xml     | 8 +++++++-
 .../Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml | 6 ++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
index 1e31a9cf0eb23..4d581bae700d7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -56,6 +56,12 @@
         <waitForPageLoad stepKey="waitForUpdatedProductToSave" />
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
 
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
+
         <!--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/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
index 9961de9ce0171..8a44c8093ca5e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -60,6 +60,12 @@
         <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
 
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
+
         <!-- Assert on storefront default view -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameDefault">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
index 305e0966a1f4f..bee13bec370da 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -54,6 +54,12 @@
         <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
 
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
+
         <!-- Assert on storefront default view -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault">
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
index 28285449d7e0d..30a4290d882fb 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
@@ -67,7 +67,13 @@
         <waitForAjaxLoad stepKey="waitForLoadWebSiteTab"/>
         <click selector="{{AdminUpdateAttributesWebsiteSection.addProductToWebsite}}" stepKey="checkAddProductToWebsiteCheckbox"/>
         <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue." stepKey="seeSaveSuccess"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSaveSuccess"/>
+
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
 
         <!--Got to Store front product page and check url-->
         <amOnPage url="{{StorefrontProductPage.url($$createProduct.sku$$-new)}}" stepKey="navigateToSimpleProductPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
index 2137e4d1fe3dd..39aa516077c56 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
@@ -59,6 +59,12 @@
         <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSaveSuccess"/>
 
+        <!-- Run cron twice -->
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitFormToReload1"/>
+
         <!-- Check storefront for description -->
         <amOnPage url="$$createProduct1.sku$$.html" stepKey="gotoProduct1"/>
         <waitForPageLoad stepKey="wait3"/>

From f07763abe228f55b61275adaaad518f6fb77f923 Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Wed, 27 Feb 2019 23:57:02 -0600
Subject: [PATCH 0407/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Magento/Catalog/Model/Attribute/Backend/Consumer.php  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index f340cb49ee099..3bcc91315022b 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -13,6 +13,7 @@
 use Magento\Framework\Notification\NotifierInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Consumer for export message.
@@ -25,7 +26,7 @@ class Consumer
     private $notifier;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     private $logger;
 
@@ -94,6 +95,7 @@ class Consumer
      * @param \Magento\CatalogInventory\Api\StockRegistryInterfaceFactory $stockRegistryFactory
      * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterfaceFactory $stockItemRepositoryFactory
      * @param NotifierInterface $notifier
+     * @param LoggerInterface $logger
      */
     public function __construct(
         \Magento\Catalog\Helper\Product $catalogProduct,
@@ -105,7 +107,8 @@ public function __construct(
         \Magento\Catalog\Model\Product\Action $action,
         \Magento\CatalogInventory\Api\StockRegistryInterfaceFactory $stockRegistryFactory,
         \Magento\CatalogInventory\Api\StockItemRepositoryInterfaceFactory $stockItemRepositoryFactory,
-        NotifierInterface $notifier
+        NotifierInterface $notifier,
+        LoggerInterface $logger
     ) {
         $this->catalogProduct = $catalogProduct;
         $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
@@ -118,6 +121,7 @@ public function __construct(
         $this->productAction = $action;
         $this->stockRegistry = $stockRegistryFactory->create();
         $this->stockItemRepository = $stockItemRepositoryFactory->create();
+        $this->logger = $logger;
     }
 
     public function process(MassActionInterface $data): void

From 7f780ff05597cc4b3e4b5ea212828a8271221b48 Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Thu, 28 Feb 2019 20:24:37 -0600
Subject: [PATCH 0408/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Product/Action/Attribute/Save.php         | 131 ++++++++-----
 .../Model/Attribute/Backend/Consumer.php      | 181 +++++++++---------
 .../Magento/Catalog/etc/communication.xml     |   2 +-
 app/code/Magento/Catalog/etc/queue.xml        |   2 +-
 .../Magento/Catalog/etc/queue_consumer.xml    |   2 +-
 5 files changed, 175 insertions(+), 143 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 331b3ed07831f..e91e0ce70f8fd 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -6,12 +6,8 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
-use Magento\Catalog\Api\Data\MassActionInterfaceFactory;
-use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
-use Magento\Framework\MessageQueue\PublisherInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Save
@@ -19,39 +15,54 @@
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface
 {
     /**
-     * @var PublisherInterface
+     * @var \Magento\Framework\Bulk\BulkManagementInterface
      */
-    private $messagePublisher;
+    private $bulkManagement;
 
     /**
-     * @var MassActionInterfaceFactory|null
+     * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
      */
-    private $massActionFactory;
+    private $operationFactory;
 
     /**
-     * @var StockConfigurationInterface
+     * @var \Magento\Framework\DataObject\IdentityGeneratorInterface
      */
-    private $stockConfiguration;
+    private $identityService;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var \Magento\Authorization\Model\UserContextInterface
+     */
+    private $userContext;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
-     * @param StockConfigurationInterface|null $stockConfiguration
-     * @param PublisherInterface|null $publisher
-     * @param MassActionInterfaceFactory|null $massAction
+     * @param \Magento\Framework\Bulk\BulkManagementInterface $bulkManagement
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory
+     * @param \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     * @param \Magento\Authorization\Model\UserContextInterface $userContext
      */
     public function __construct(
         Action\Context $context,
         \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
-        StockConfigurationInterface $stockConfiguration = null,
-        PublisherInterface $publisher = null,
-        MassActionInterfaceFactory $massAction = null
+        \Magento\Framework\Bulk\BulkManagementInterface $bulkManagement,
+        \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory,
+        \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService,
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
+        \Magento\Authorization\Model\UserContextInterface $userContext
     ) {
         parent::__construct($context, $attributeHelper);
-        $this->messagePublisher = $publisher ?: ObjectManager::getInstance()->get(PublisherInterface::class);
-        $this->massActionFactory = $massAction ?: ObjectManager::getInstance()->get(MassActionInterfaceFactory::class);
-        $this->stockConfiguration = $stockConfiguration
-            ?: ObjectManager::getInstance()->get(StockConfigurationInterface::class);
+        $this->bulkManagement = $bulkManagement;
+        $this->operationFactory = $operartionFactory;
+        $this->identityService = $identityService;
+        $this->serializer = $serializer;
+        $this->userContext = $userContext;
     }
 
     /**
@@ -66,28 +77,18 @@ public function execute()
         }
 
         /* Collect Data */
-        $inventoryData = $this->getRequest()->getParam('inventory', []);
-        $inventoryData = $this->addConfigSettings($inventoryData);
         $attributesData = $this->getRequest()->getParam('attributes', []);
+
         $websiteRemoveData = $this->getRequest()->getParam('remove_website_ids', []);
         $websiteAddData = $this->getRequest()->getParam('add_website_ids', []);
+
         $storeId = $this->attributeHelper->getSelectedStoreId();
-        $productIds = $this->attributeHelper->getProductIds();
         $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
 
-        /* Create DTO for queue */
-        $massAction = $this->massActionFactory->create();
-        $massAction->setInventory($inventoryData);
-        $massAction->setAttributeValues(array_values($attributesData));
-        $massAction->setAttributeKeys(array_keys($attributesData));
-        $massAction->setWebsiteRemove($websiteRemoveData);
-        $massAction->setWebsiteAdd($websiteAddData);
-        $massAction->setStoreId($storeId);
-        $massAction->setProductIds($productIds);
-        $massAction->setWebsiteId($websiteId);
+        $productIds = $this->attributeHelper->getProductIds();
 
         try {
-            $this->messagePublisher->publish('product_action_attribute.update', $massAction);
+            $this->publish('product_action_attribute.update', $attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds);
             $this->messageManager->addSuccessMessage(__('Message is added to queue'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
@@ -98,23 +99,63 @@ public function execute()
             );
         }
 
-        return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['store' => $storeId]);
+        return $this->resultRedirectFactory->create()->setPath(
+            'catalog/product/',
+            ['store' => $storeId]
+        );
     }
 
     /**
-     * Prepare inventory data item options (use config settings)
-     * @param $inventoryData
-     * @return mixed
+     * Schedule new bulk.
+     *
+     * @param $queue
+     * @param $attributesData
+     * @param $websiteRemoveData
+     * @param $websiteAddData
+     * @param $storeId
+     * @param $websiteId
+     * @param $productIds
+     * @return void
      */
-    private function addConfigSettings($inventoryData)
+    private function publish($queue, $attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds):void
     {
-        $options = $this->stockConfiguration->getConfigItemOptions();
-        foreach ($options as $option) {
-            $useConfig = 'use_config_' . $option;
-            if (isset($inventoryData[$option]) && !isset($inventoryData[$useConfig])) {
-                $inventoryData[$useConfig] = 0;
+        $operationCount = count($productIds);
+        if ($operationCount > 0) {
+            $bulkUuid = $this->identityService->generateId();
+            $bulkDescription = __('Assign custom prices to selected products');
+            $operations = [];
+            foreach ($productIds as $productId) {
+                $dataToEncode = [
+                    'meta_information' => 'ID:' . $productId,
+                    'product_id' => $productId,
+                    'store_id' => $storeId,
+                    'website_id' => $websiteId,
+                    'website_assign' => $websiteAddData,
+                    'website_detach' => $websiteRemoveData,
+                    'attributes' => $attributesData
+                ];
+                $data = [
+                    'data' => [
+                        'bulk_uuid' => $bulkUuid,
+                        'topic_name' => $queue,
+                        'serialized_data' => $this->serializer->serialize($dataToEncode),
+                        'status' => \Magento\Framework\Bulk\OperationInterface::STATUS_TYPE_OPEN,
+                    ]
+                ];
+
+                /** @var \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation */
+                $operation = $this->operationFactory->create($data);
+                $operations[] = $operation;
+            }
+            $userId = $this->userContext->getUserId();
+            $result = $this->bulkManagement->scheduleBulk($bulkUuid, $operations, $bulkDescription, $userId);
+            if (!$result) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('Something went wrong while processing the request.')
+                );
             }
         }
-        return $inventoryData;
     }
+
 }
+
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index 3bcc91315022b..2e9bbc18be4da 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -7,13 +7,12 @@
 
 namespace Magento\Catalog\Model\Attribute\Backend;
 
-use Magento\Catalog\Api\Data\MassActionInterface;
-use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Notification\NotifierInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Psr\Log\LoggerInterface;
+use Magento\Framework\Bulk\OperationInterface;
 
 /**
  * Consumer for export message.
@@ -21,12 +20,12 @@
 class Consumer
 {
     /**
-     * @var NotifierInterface
+     * @var \Magento\Framework\Notification\NotifierInterface
      */
     private $notifier;
 
     /**
-     * @var LoggerInterface
+     * @var \Psr\Log\LoggerInterface
      */
     private $logger;
 
@@ -41,24 +40,10 @@ class Consumer
     private $productPriceIndexerProcessor;
 
     /**
-     * Catalog product
-     *
      * @var \Magento\Catalog\Helper\Product
      */
     private $catalogProduct;
 
-    /**
-     * Stock Indexer
-     *
-     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
-     */
-    private $stockIndexerProcessor;
-
-    /**
-     * @var \Magento\Framework\Api\DataObjectHelper
-     */
-    private $dataObjectHelper;
-
     /**
      * @var \Magento\Framework\Event\ManagerInterface
      */
@@ -75,101 +60,102 @@ class Consumer
     private $productAction;
 
     /**
-     * @var \Magento\CatalogInventory\Api\StockRegistryInterfaceFactory
+     * @var \Magento\Framework\Serialize\SerializerInterface
      */
-    private $stockRegistry;
+    private $serializer;
 
     /**
-     * @var \Magento\CatalogInventory\Api\StockItemRepositoryInterfaceFactory
+     * @var \Magento\Framework\Bulk\OperationManagementInterface
      */
-    private $stockItemRepository;
+    private $operationManagement;
 
     /**
      * @param \Magento\Catalog\Helper\Product $catalogProduct
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
-     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
-     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param \Magento\Framework\Bulk\OperationManagementInterface $operationManagement
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Product\Action $action
-     * @param \Magento\CatalogInventory\Api\StockRegistryInterfaceFactory $stockRegistryFactory
-     * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterfaceFactory $stockItemRepositoryFactory
-     * @param NotifierInterface $notifier
-     * @param LoggerInterface $logger
+     * @param \Magento\Framework\Notification\NotifierInterface $notifier
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
      */
     public function __construct(
         \Magento\Catalog\Helper\Product $catalogProduct,
         \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
-        \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
-        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        \Magento\Framework\Bulk\OperationManagementInterface $operationManagement,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Product\Action $action,
-        \Magento\CatalogInventory\Api\StockRegistryInterfaceFactory $stockRegistryFactory,
-        \Magento\CatalogInventory\Api\StockItemRepositoryInterfaceFactory $stockItemRepositoryFactory,
-        NotifierInterface $notifier,
-        LoggerInterface $logger
+        \Magento\Framework\Notification\NotifierInterface $notifier,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Serialize\SerializerInterface $serializer
     ) {
         $this->catalogProduct = $catalogProduct;
         $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
         $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
-        $this->stockIndexerProcessor = $stockIndexerProcessor;
-        $this->dataObjectHelper = $dataObjectHelper;
         $this->notifier = $notifier;
         $this->eventManager = $eventManager;
         $this->objectManager = ObjectManager::getInstance();
         $this->productAction = $action;
-        $this->stockRegistry = $stockRegistryFactory->create();
-        $this->stockItemRepository = $stockItemRepositoryFactory->create();
         $this->logger = $logger;
+        $this->serializer = $serializer;
+        $this->operationManagement = $operationManagement;
     }
 
-    public function process(MassActionInterface $data): void
+    /**
+     * Processing batch of operations for update tier prices.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationListInterface $operationList
+     * @return void
+     * @throws \InvalidArgumentException
+     */
+    public function process(\Magento\AsynchronousOperations\Api\Data\OperationListInterface $operationList)
     {
         try {
-            if ($data->getInventory()) {
-                $this->updateInventoryInProducts($data->getProductIds(), $data->getWebsiteId(), $data->getInventory());
-            }
+            foreach ($operationList->getItems() as  $operation) {
+                $serializedData = $operation->getSerializedData();
+                $data = $this->serializer->unserialize($serializedData);
 
-            if ($data->getWebsiteAdd() || $data->getWebsiteRemove()) {
-                $this->updateWebsiteInProducts($data->getProductIds(), $data->getWebsiteRemove(), $data->getWebsiteAdd());
+                $this->execute($data);
             }
-
-            if ($data->getAttributeValues()) {
-                $attributesData = $this->getAttributesData(
-                    $data->getProductIds(),
-                    $data->getStoreId(),
-                    $data->getAttributeValues(),
-                    $data->getAttributeKeys()
-                );
-                $this->reindex($data->getProductIds(), $attributesData, $data->getWebsiteRemove(), $data->getWebsiteAdd());
-            }
-
-            $this->productFlatIndexerProcessor->reindexList($data->getProductIds());
-
-            $this->notifier->addNotice(
-                __('Product attributes updated'),
-                __('A total of %1 record(s) were updated.', count($data->getProductIds()))
-            );
-        } catch (LocalizedException $exception) {
-            $this->notifier->addCritical(
-                __('Error during process occurred'),
-                __('Error during process occurred. Please check logs for detail')
-            );
-            $this->logger->critical('Something went wrong while process. ' . $exception->getMessage());
+        } catch (NoSuchEntityException $e) {
+            $this->logger->critical($e->getMessage());
+            $status = ($e instanceof TemporaryStateExceptionInterface)
+                ? OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+                : OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = $e->getMessage();
+        } catch (LocalizedException $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = $e->getMessage();
+        } catch (\Exception $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = __('Sorry, something went wrong during product prices update. Please see log for details.');
         }
+
+        //update operation status based on result performing operation(it was successfully executed or exception occurs
+        $this->operationManagement->changeOperationStatus(
+            $operation->getId(),
+            $status,
+            $errorCode,
+            $message,
+            $serializedData
+        );
     }
 
     /**
      * @param $productIds
      * @param $storeId
-     * @param $attributeValuesData
-     * @param $attributeKeysData
+     * @param $attributesData
      * @return mixed
      */
-    private function getAttributesData($productIds, $storeId, $attributeValuesData, $attributeKeysData)
+    private function getAttributesData($productIds, $storeId, $attributesData)
     {
-        $attributesData = array_combine($attributeKeysData, $attributeValuesData);
         $dateFormat = $this->objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
         $config = $this->objectManager->get(\Magento\Eav\Model\Config::class);
 
@@ -208,27 +194,6 @@ private function getAttributesData($productIds, $storeId, $attributeValuesData,
         return $attributesData;
     }
 
-    /**
-     * @param $productIds
-     * @param $websiteId
-     * @param $inventoryData
-     */
-    private function updateInventoryInProducts($productIds, $websiteId, $inventoryData): void
-    {
-        foreach ($productIds as $productId) {
-            $stockItemDo = $this->stockRegistry->getStockItem($productId, $websiteId);
-            if (!$stockItemDo->getProductId()) {
-                $inventoryData['product_id'] = $productId;
-            }
-
-            $stockItemId = $stockItemDo->getId();
-            $this->dataObjectHelper->populateWithArray($stockItemDo, $inventoryData, StockItemInterface::class);
-            $stockItemDo->setItemId($stockItemId);
-            $this->stockItemRepository->save($stockItemDo);
-        }
-        $this->stockIndexerProcessor->reindexList($productIds);
-    }
-
     /**
      * @param $productIds
      * @param $websiteRemoveData
@@ -261,4 +226,30 @@ private function reindex($productIds, $attributesData, $websiteRemoveData, $webs
             $this->productPriceIndexerProcessor->reindexList($productIds);
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * @param $data
+     */
+    private function execute($data): void
+    {
+        if ($data['website_assign'] || $data['website_detach']) {
+            $this->updateWebsiteInProducts([$data['product_id']], $data['website_detach'], $data['website_assign']);
+        }
+
+        if ($data['attributes']) {
+            $attributesData = $this->getAttributesData(
+                [$data['product_id']],
+                $data['store_id'],
+                $data['attributes']
+            );
+            $this->reindex([$data['product_id']], $attributesData, $data['website_detach'], $data['website_assign']);
+        }
+
+        $this->productFlatIndexerProcessor->reindexList([$data['product_id']]);
+
+        $this->notifier->addNotice(
+            __('Product attributes updated'),
+            __('A total of %1 record(s) were updated.', count([$data['product_id']]))
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/etc/communication.xml b/app/code/Magento/Catalog/etc/communication.xml
index b073725e934f0..9871ba8e58b9f 100644
--- a/app/code/Magento/Catalog/etc/communication.xml
+++ b/app/code/Magento/Catalog/etc/communication.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
-    <topic name="product_action_attribute.update" request="Magento\Catalog\Api\Data\MassActionInterface">
+    <topic name="product_action_attribute.update" request="Magento\AsynchronousOperations\Api\Data\OperationInterface">
         <handler name="product_action_attribute.update" type="Magento\Catalog\Model\Attribute\Backend\Consumer" method="process" />
     </topic>
 </config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue.xml b/app/code/Magento/Catalog/etc/queue.xml
index 8aa7c7fe5e49e..40d9cd1a378b0 100644
--- a/app/code/Magento/Catalog/etc/queue.xml
+++ b/app/code/Magento/Catalog/etc/queue.xml
@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
     <broker topic="product_action_attribute.update" exchange="magento-db" type="db">
-        <queue name="product_action_attribute.update" consumer="product_action_attribute.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process"/>
+        <queue name="product_action_attribute.update" consumer="product_action_attribute.update" consumerInstance="Magento\Framework\MessageQueue\BatchConsume" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process"/>
     </broker>
 </config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_consumer.xml b/app/code/Magento/Catalog/etc/queue_consumer.xml
index 0090866c0e490..4be387211df04 100644
--- a/app/code/Magento/Catalog/etc/queue_consumer.xml
+++ b/app/code/Magento/Catalog/etc/queue_consumer.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
-    <consumer name="product_action_attribute.update" queue="product_action_attribute.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process" />
+    <consumer name="product_action_attribute.update" queue="product_action_attribute.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process" />
 </config>
\ No newline at end of file

From 315e78525c84267269fd8bb9a736623acc33a119 Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Mon, 4 Mar 2019 10:51:50 -0600
Subject: [PATCH 0409/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Catalog/Api/Data/MassActionInterface.php  | 152 --------------
 .../Product/Action/Attribute/Save.php         | 149 +++++++++----
 .../Model/Attribute/Backend/Consumer.php      | 175 ++++------------
 .../Backend/ConsumerWebsiteAssign.php         | 161 ++++++++++++++
 app/code/Magento/Catalog/Model/MassAction.php | 198 ------------------
 .../Magento/Catalog/Model/Product/Action.php  |   2 +
 .../Magento/Catalog/etc/communication.xml     |   3 +
 app/code/Magento/Catalog/etc/queue.xml        |   5 +-
 .../Magento/Catalog/etc/queue_consumer.xml    |   3 +-
 .../Magento/Catalog/etc/queue_publisher.xml   |   3 +
 .../Magento/Catalog/etc/queue_topology.xml    |   1 +
 11 files changed, 318 insertions(+), 534 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/Api/Data/MassActionInterface.php
 create mode 100644 app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
 delete mode 100644 app/code/Magento/Catalog/Model/MassAction.php

diff --git a/app/code/Magento/Catalog/Api/Data/MassActionInterface.php b/app/code/Magento/Catalog/Api/Data/MassActionInterface.php
deleted file mode 100644
index c03a73df5e92d..0000000000000
--- a/app/code/Magento/Catalog/Api/Data/MassActionInterface.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Catalog\Api\Data;
-
-/**
- * MassAction interface.
- * @api
- * @since 101.1.0
- */
-interface MassActionInterface
-{
-
-    /**
-     * Set data value.
-     *
-     * @param string[] $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setInventory($data);
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getInventory():array;
-
-    /**
-     * Set data value.
-     *
-     * @param string[] $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setAttributeKeys($data);
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getAttributeKeys():array;
-
-    /**
-     * Set data value.
-     *
-     * @param string[] $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setAttributeValues($data);
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getAttributeValues():array;
-
-    /**
-     * Set data value.
-     *
-     * @param string[] $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setWebsiteRemove($data);
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getWebsiteRemove():array;
-
-    /**
-     * Set data value.
-     *
-     * @param string[] $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setWebsiteAdd($data);
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getWebsiteAdd():array;
-
-    /**
-     * Set data value.
-     *
-     * @param integer $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setStoreId($data);
-
-    /**
-     * Get data value.
-     *
-     * @return integer
-     * @since 101.1.0
-     */
-    public function getStoreId();
-
-    /**
-     * Set data value.
-     *
-     * @param integer[] $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setProductIds(array $data);
-
-    /**
-     * Get data value.
-     *
-     * @return integer[]
-     * @since 101.1.0
-     */
-    public function getProductIds():array;
-
-    /**
-     * Set data value.
-     *
-     * @param integer $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setWebsiteId($data);
-
-    /**
-     * Get data value.
-     *
-     * @return integer
-     * @since 101.1.0
-     */
-    public function getWebsiteId();
-}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index e91e0ce70f8fd..324f3aba14c7a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -6,8 +6,11 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Save
@@ -39,6 +42,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      */
     private $userContext;
 
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
@@ -63,6 +71,7 @@ public function __construct(
         $this->identityService = $identityService;
         $this->serializer = $serializer;
         $this->userContext = $userContext;
+        $this->objectManager = ObjectManager::getInstance();
     }
 
     /**
@@ -78,17 +87,16 @@ public function execute()
 
         /* Collect Data */
         $attributesData = $this->getRequest()->getParam('attributes', []);
-
         $websiteRemoveData = $this->getRequest()->getParam('remove_website_ids', []);
         $websiteAddData = $this->getRequest()->getParam('add_website_ids', []);
-
         $storeId = $this->attributeHelper->getSelectedStoreId();
         $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
-
         $productIds = $this->attributeHelper->getProductIds();
 
+        $attributesData = $this->sanitizeProductAttributes($attributesData);
+
         try {
-            $this->publish('product_action_attribute.update', $attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds);
+            $this->publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds);
             $this->messageManager->addSuccessMessage(__('Message is added to queue'));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
@@ -99,16 +107,50 @@ public function execute()
             );
         }
 
-        return $this->resultRedirectFactory->create()->setPath(
-            'catalog/product/',
-            ['store' => $storeId]
-        );
+        return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['store' => $storeId]);
+    }
+
+    private function sanitizeProductAttributes($attributesData)
+    {
+        $dateFormat = $this->objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
+        $config = $this->objectManager->get(\Magento\Eav\Model\Config::class);
+
+        foreach ($attributesData as $attributeCode => $value) {
+            $attribute = $config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+            if (!$attribute->getAttributeId()) {
+                unset($attributesData[$attributeCode]);
+                continue;
+            }
+            if ($attribute->getBackendType() === 'datetime') {
+                if (!empty($value)) {
+                    $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
+                    $filterInternal = new \Zend_Filter_NormalizedToLocalized(
+                        ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
+                    );
+                    $value = $filterInternal->filter($filterInput->filter($value));
+                } else {
+                    $value = null;
+                }
+                $attributesData[$attributeCode] = $value;
+            } elseif ($attribute->getFrontendInput() === 'multiselect') {
+                // Check if 'Change' checkbox has been checked by admin for this attribute
+                $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
+                if (!$isChanged) {
+                    unset($attributesData[$attributeCode]);
+                    continue;
+                }
+                if (is_array($value)) {
+                    $value = implode(',', $value);
+                }
+                $attributesData[$attributeCode] = $value;
+            }
+        }
+        return $attributesData;
     }
 
     /**
      * Schedule new bulk.
      *
-     * @param $queue
      * @param $attributesData
      * @param $websiteRemoveData
      * @param $websiteAddData
@@ -117,45 +159,62 @@ public function execute()
      * @param $productIds
      * @return void
      */
-    private function publish($queue, $attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds):void
+    private function publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds):void
     {
-        $operationCount = count($productIds);
-        if ($operationCount > 0) {
-            $bulkUuid = $this->identityService->generateId();
-            $bulkDescription = __('Assign custom prices to selected products');
-            $operations = [];
-            foreach ($productIds as $productId) {
-                $dataToEncode = [
-                    'meta_information' => 'ID:' . $productId,
-                    'product_id' => $productId,
-                    'store_id' => $storeId,
-                    'website_id' => $websiteId,
-                    'website_assign' => $websiteAddData,
-                    'website_detach' => $websiteRemoveData,
-                    'attributes' => $attributesData
-                ];
-                $data = [
-                    'data' => [
-                        'bulk_uuid' => $bulkUuid,
-                        'topic_name' => $queue,
-                        'serialized_data' => $this->serializer->serialize($dataToEncode),
-                        'status' => \Magento\Framework\Bulk\OperationInterface::STATUS_TYPE_OPEN,
-                    ]
-                ];
-
-                /** @var \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation */
-                $operation = $this->operationFactory->create($data);
-                $operations[] = $operation;
-            }
-            $userId = $this->userContext->getUserId();
-            $result = $this->bulkManagement->scheduleBulk($bulkUuid, $operations, $bulkDescription, $userId);
-            if (!$result) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Something went wrong while processing the request.')
-                );
-            }
+        $bulkUuid = $this->identityService->generateId();
+        $bulkDescription = __('Update attributes to selected products');
+        $operations = [];
+        if ($websiteRemoveData || $websiteAddData) {
+            $dataToUpdate = [
+                'website_assign' => $websiteAddData,
+                'website_detach' => $websiteRemoveData
+            ];
+
+            $operations[] = $this->makeOperation('Update website assign', 'product_action_attribute.website.update', $dataToUpdate, $storeId, $websiteId, $productIds, $bulkUuid);
+        }
+
+        if ($attributesData) {
+            $operations[] = $this->makeOperation('Update product attributes', 'product_action_attribute.update', $attributesData, $storeId, $websiteId, $productIds, $bulkUuid);
+        }
+
+        $result = $this->bulkManagement->scheduleBulk($bulkUuid, $operations, $bulkDescription, $this->userContext->getUserId());
+        if (!$result) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Something went wrong while processing the request.')
+            );
         }
     }
 
+    /**
+     * @param $meta
+     * @param $queue
+     * @param $dataToUpdate
+     * @param $storeId
+     * @param $websiteId
+     * @param $productIds
+     * @param $bulkUuid
+     * @return OperationInterface
+     */
+    private function makeOperation($meta, $queue, $dataToUpdate, $storeId, $websiteId, $productIds, $bulkUuid): OperationInterface
+    {
+        $dataToEncode = [
+            'meta_information' => $meta,
+            'product_ids' => $productIds,
+            'store_id' => $storeId,
+            'website_id' => $websiteId,
+            'attributes' => $dataToUpdate
+        ];
+        $data = [
+            'data' => [
+                'bulk_uuid' => $bulkUuid,
+                'topic_name' => $queue,
+                'serialized_data' => $this->serializer->serialize($dataToEncode),
+                'status' => \Magento\Framework\Bulk\OperationInterface::STATUS_TYPE_OPEN,
+            ]
+        ];
+
+        return $this->operationFactory->create($data);
+    }
+
 }
 
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index 2e9bbc18be4da..7e6c68a1502e0 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -8,10 +8,9 @@
 namespace Magento\Catalog\Model\Attribute\Backend;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\EntityManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\TemporaryStateExceptionInterface;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\Bulk\OperationInterface;
 
 /**
@@ -19,11 +18,6 @@
  */
 class Consumer
 {
-    /**
-     * @var \Magento\Framework\Notification\NotifierInterface
-     */
-    private $notifier;
-
     /**
      * @var \Psr\Log\LoggerInterface
      */
@@ -44,16 +38,6 @@ class Consumer
      */
     private $catalogProduct;
 
-    /**
-     * @var \Magento\Framework\Event\ManagerInterface
-     */
-    private $eventManager;
-
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
     /**
      * @var \Magento\Catalog\Model\Product\Action
      */
@@ -68,56 +52,68 @@ class Consumer
      * @var \Magento\Framework\Bulk\OperationManagementInterface
      */
     private $operationManagement;
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
 
     /**
      * @param \Magento\Catalog\Helper\Product $catalogProduct
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
      * @param \Magento\Framework\Bulk\OperationManagementInterface $operationManagement
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Product\Action $action
-     * @param \Magento\Framework\Notification\NotifierInterface $notifier
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     * @param EntityManager $entityManager
      */
     public function __construct(
         \Magento\Catalog\Helper\Product $catalogProduct,
         \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
         \Magento\Framework\Bulk\OperationManagementInterface $operationManagement,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Product\Action $action,
-        \Magento\Framework\Notification\NotifierInterface $notifier,
         \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Serialize\SerializerInterface $serializer
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
+        EntityManager $entityManager
     ) {
         $this->catalogProduct = $catalogProduct;
         $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
         $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
-        $this->notifier = $notifier;
-        $this->eventManager = $eventManager;
-        $this->objectManager = ObjectManager::getInstance();
         $this->productAction = $action;
         $this->logger = $logger;
         $this->serializer = $serializer;
         $this->operationManagement = $operationManagement;
+        $this->entityManager = $entityManager;
     }
 
     /**
-     * Processing batch of operations for update tier prices.
-     *
-     * @param \Magento\AsynchronousOperations\Api\Data\OperationListInterface $operationList
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
      * @return void
-     * @throws \InvalidArgumentException
      */
-    public function process(\Magento\AsynchronousOperations\Api\Data\OperationListInterface $operationList)
+    public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
     {
         try {
-            foreach ($operationList->getItems() as  $operation) {
-                $serializedData = $operation->getSerializedData();
-                $data = $this->serializer->unserialize($serializedData);
+            $serializedData = $operation->getSerializedData();
+            $data = $this->serializer->unserialize($serializedData);
+            $this->execute($data);
 
-                $this->execute($data);
+        } catch (\Zend_Db_Adapter_Exception  $e) {
+            //here sample how to process exceptions if they occurred
+            $this->logger->critical($e->getMessage());
+            //you can add here your own type of exception when operation can be retried
+            if (
+                $e instanceof \Magento\Framework\DB\Adapter\LockWaitException
+                || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
+                || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
+            ) {
+                $status = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
+                $errorCode = $e->getCode();
+                $message = __($e->getMessage());
+            } else {
+                $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+                $errorCode = $e->getCode();
+                $message = __('Sorry, something went wrong during product prices update. Please see log for details.');
             }
         } catch (NoSuchEntityException $e) {
             $this->logger->critical($e->getMessage());
@@ -138,93 +134,11 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationListIn
             $message = __('Sorry, something went wrong during product prices update. Please see log for details.');
         }
 
-        //update operation status based on result performing operation(it was successfully executed or exception occurs
-        $this->operationManagement->changeOperationStatus(
-            $operation->getId(),
-            $status,
-            $errorCode,
-            $message,
-            $serializedData
-        );
-    }
+        $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
+            ->setErrorCode($errorCode ?? null)
+            ->setResultMessage($message ?? null);
 
-    /**
-     * @param $productIds
-     * @param $storeId
-     * @param $attributesData
-     * @return mixed
-     */
-    private function getAttributesData($productIds, $storeId, $attributesData)
-    {
-        $dateFormat = $this->objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
-        $config = $this->objectManager->get(\Magento\Eav\Model\Config::class);
-
-        foreach ($attributesData as $attributeCode => $value) {
-            $attribute = $config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
-            if (!$attribute->getAttributeId()) {
-                unset($attributesData[$attributeCode]);
-                continue;
-            }
-            if ($attribute->getBackendType() == 'datetime') {
-                if (!empty($value)) {
-                    $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
-                    $filterInternal = new \Zend_Filter_NormalizedToLocalized(
-                        ['date_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT]
-                    );
-                    $value = $filterInternal->filter($filterInput->filter($value));
-                } else {
-                    $value = null;
-                }
-                $attributesData[$attributeCode] = $value;
-            } elseif ($attribute->getFrontendInput() == 'multiselect') {
-                // Check if 'Change' checkbox has been checked by admin for this attribute
-                $isChanged = (bool)$this->getRequest()->getPost('toggle_' . $attributeCode);
-                if (!$isChanged) {
-                    unset($attributesData[$attributeCode]);
-                    continue;
-                }
-                if (is_array($value)) {
-                    $value = implode(',', $value);
-                }
-                $attributesData[$attributeCode] = $value;
-            }
-        }
-
-        $this->productAction->updateAttributes($productIds, $attributesData, $storeId);
-        return $attributesData;
-    }
-
-    /**
-     * @param $productIds
-     * @param $websiteRemoveData
-     * @param $websiteAddData
-     */
-    private function updateWebsiteInProducts($productIds, $websiteRemoveData, $websiteAddData): void
-    {
-        if ($websiteRemoveData) {
-            $this->productAction->updateWebsites($productIds, $websiteRemoveData, 'remove');
-        }
-        if ($websiteAddData) {
-            $this->productAction->updateWebsites($productIds, $websiteAddData, 'add');
-        }
-
-        $this->eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
-    }
-
-    /**
-     * @param $productIds
-     * @param $attributesData
-     * @param $websiteRemoveData
-     * @param $websiteAddData
-     */
-    private function reindex($productIds, $attributesData, $websiteRemoveData, $websiteAddData): void
-    {
-        if ($this->catalogProduct->isDataForPriceIndexerWasChanged($attributesData)
-            || !empty($websiteRemoveData)
-            || !empty($websiteAddData)
-        ) {
-            $this->productPriceIndexerProcessor->reindexList($productIds);
-        }
+        $this->entityManager->save($operation);
     }
 
     /**
@@ -232,24 +146,11 @@ private function reindex($productIds, $attributesData, $websiteRemoveData, $webs
      */
     private function execute($data): void
     {
-        if ($data['website_assign'] || $data['website_detach']) {
-            $this->updateWebsiteInProducts([$data['product_id']], $data['website_detach'], $data['website_assign']);
-        }
-
-        if ($data['attributes']) {
-            $attributesData = $this->getAttributesData(
-                [$data['product_id']],
-                $data['store_id'],
-                $data['attributes']
-            );
-            $this->reindex([$data['product_id']], $attributesData, $data['website_detach'], $data['website_assign']);
+        $this->productAction->updateAttributes($data['product_ids'], $data['attributes'], $data['store_id']);
+        if ($this->catalogProduct->isDataForPriceIndexerWasChanged($data['attributes'])) {
+            $this->productPriceIndexerProcessor->reindexList($data['product_ids']);
         }
 
-        $this->productFlatIndexerProcessor->reindexList([$data['product_id']]);
-
-        $this->notifier->addNotice(
-            __('Product attributes updated'),
-            __('A total of %1 record(s) were updated.', count([$data['product_id']]))
-        );
+        $this->productFlatIndexerProcessor->reindexList($data['product_ids']);
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
new file mode 100644
index 0000000000000..ce4113a03df59
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Attribute\Backend;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
+use Magento\Framework\Bulk\OperationInterface;
+use Magento\Framework\EntityManager\EntityManager;
+
+/**
+ * Consumer for export message.
+ */
+class ConsumerWebsiteAssign
+{
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+     */
+    private $productFlatIndexerProcessor;
+
+    /**
+     * @var \Magento\Catalog\Model\Product\Action
+     */
+    private $productAction;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var \Magento\Framework\Bulk\OperationManagementInterface
+     */
+    private $operationManagement;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
+     */
+    private $productPriceIndexerProcessor;
+
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
+     * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
+     * @param \Magento\Framework\Bulk\OperationManagementInterface $operationManagement
+     * @param \Magento\Catalog\Model\Product\Action $action
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializer
+     * @param EntityManager $entityManager
+     */
+    public function __construct(
+        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
+        \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
+        \Magento\Framework\Bulk\OperationManagementInterface $operationManagement,
+        \Magento\Catalog\Model\Product\Action $action,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Serialize\SerializerInterface $serializer,
+        EntityManager $entityManager
+    ) {
+        $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
+        $this->productAction = $action;
+        $this->logger = $logger;
+        $this->serializer = $serializer;
+        $this->operationManagement = $operationManagement;
+        $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
+     * @return void
+     */
+    public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
+    {
+        try {
+            $serializedData = $operation->getSerializedData();
+            $data = $this->serializer->unserialize($serializedData);
+            $this->execute($data);
+        } catch (\Zend_Db_Adapter_Exception  $e) {
+            //here sample how to process exceptions if they occurred
+            $this->logger->critical($e->getMessage());
+            //you can add here your own type of exception when operation can be retried
+            if (
+                $e instanceof \Magento\Framework\DB\Adapter\LockWaitException
+                || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
+                || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
+            ) {
+                $status = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
+                $errorCode = $e->getCode();
+                $message = __($e->getMessage());
+            } else {
+                $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+                $errorCode = $e->getCode();
+                $message = __('Sorry, something went wrong during product prices update. Please see log for details.');
+            }
+        } catch (NoSuchEntityException $e) {
+            $this->logger->critical($e->getMessage());
+            $status = ($e instanceof TemporaryStateExceptionInterface)
+                ? OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+                : OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = $e->getMessage();
+        } catch (LocalizedException $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = $e->getMessage();
+        } catch (\Exception $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = __('Sorry, something went wrong during product prices update. Please see log for details.');
+        }
+
+        $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
+            ->setErrorCode($errorCode ?? null)
+            ->setResultMessage($message ?? null);
+
+        $this->entityManager->save($operation);
+    }
+
+    /**
+     * @param $productIds
+     * @param $websiteRemoveData
+     * @param $websiteAddData
+     */
+    private function updateWebsiteInProducts($productIds, $websiteRemoveData, $websiteAddData): void
+    {
+        if ($websiteRemoveData) {
+            $this->productAction->updateWebsites($productIds, $websiteRemoveData, 'remove');
+        }
+        if ($websiteAddData) {
+            $this->productAction->updateWebsites($productIds, $websiteAddData, 'add');
+        }
+    }
+
+
+    /**
+     * @param $data
+     */
+    private function execute($data): void
+    {
+        $this->updateWebsiteInProducts($data['product_ids'], $data['attributes']['website_detach'], $data['attributes']['website_assign']);
+        $this->productPriceIndexerProcessor->reindexList($data['product_ids']);
+        $this->productFlatIndexerProcessor->reindexList($data['product_ids']);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/MassAction.php b/app/code/Magento/Catalog/Model/MassAction.php
deleted file mode 100644
index 0f09ff8d7699c..0000000000000
--- a/app/code/Magento/Catalog/Model/MassAction.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-namespace Magento\Catalog\Model;
-
-class MassAction implements \Magento\Catalog\Api\Data\MassActionInterface
-{
-    private $inventory;
-    private $attributeKeys;
-    private $websiteRemove;
-    private $websiteAdd;
-    private $storeId;
-    private $productIds;
-    private $websiteId;
-    private $attributeValues;
-
-    /**
-     * Set data value.
-     *
-     * @param string $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setInventory($data)
-    {
-        $this->inventory = $data;
-    }
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getInventory():array
-    {
-        return $this->inventory;
-    }
-
-    /**
-     * Set data value.
-     *
-     * @param string $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setAttributeKeys($data)
-    {
-        $this->attributeKeys = $data;
-    }
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getAttributeKeys():array
-    {
-        return $this->attributeKeys;
-    }
-
-    /**
-     * Set data value.
-     *
-     * @param string $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setAttributeValues($data)
-    {
-        $this->attributeValues = $data;
-    }
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getAttributeValues():array
-    {
-        return $this->attributeValues;
-    }
-
-    /**
-     * Set data value.
-     *
-     * @param string $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setWebsiteRemove($data)
-    {
-        $this->websiteRemove = $data;
-    }
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getWebsiteRemove():array
-    {
-        return $this->websiteRemove;
-    }
-
-    /**
-     * Set data value.
-     *
-     * @param string $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setWebsiteAdd($data)
-    {
-        $this->websiteAdd = $data;
-    }
-
-    /**
-     * Get data value.
-     *
-     * @return string[]
-     * @since 101.1.0
-     */
-    public function getWebsiteAdd():array
-    {
-        return $this->websiteAdd;
-    }
-
-    /**
-     * Set data value.
-     *
-     * @param string $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setStoreId($data)
-    {
-        $this->storeId = $data;
-    }
-
-    /**
-     * Get data value.
-     *
-     * @return string
-     * @since 101.1.0
-     */
-    public function getStoreId()
-    {
-        return $this->storeId;
-    }
-
-    /**
-     * Set data value.
-     *
-     * @param integer[] $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setProductIds(array $data)
-    {
-        $this->productIds = $data;
-    }
-
-    /**
-     * Get data value.
-     *
-     * @return integer[]
-     * @since 101.1.0
-     */
-    public function getProductIds():array
-    {
-        return $this->productIds;
-    }
-
-    /**
-     * Set data value.
-     *
-     * @param string $data
-     * @return void
-     * @since 101.1.0
-     */
-    public function setWebsiteId($data)
-    {
-        $this->websiteId = $data;
-    }
-
-    /**
-     * Get data value.
-     *
-     * @return string
-     * @since 101.1.0
-     */
-    public function getWebsiteId()
-    {
-        return $this->websiteId;
-    }
-}
diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php
index f78048424b42c..3863cf2457247 100644
--- a/app/code/Magento/Catalog/Model/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/Product/Action.php
@@ -168,5 +168,7 @@ public function updateWebsites($productIds, $websiteIds, $type)
         if (!$categoryIndexer->isScheduled()) {
             $categoryIndexer->reindexList(array_unique($productIds));
         }
+
+        $this->_eventManager->dispatch('catalog_product_to_website_change', ['products' => $productIds]);
     }
 }
diff --git a/app/code/Magento/Catalog/etc/communication.xml b/app/code/Magento/Catalog/etc/communication.xml
index 9871ba8e58b9f..1a957f6ac9fe5 100644
--- a/app/code/Magento/Catalog/etc/communication.xml
+++ b/app/code/Magento/Catalog/etc/communication.xml
@@ -9,4 +9,7 @@
     <topic name="product_action_attribute.update" request="Magento\AsynchronousOperations\Api\Data\OperationInterface">
         <handler name="product_action_attribute.update" type="Magento\Catalog\Model\Attribute\Backend\Consumer" method="process" />
     </topic>
+    <topic name="product_action_attribute.website.update" request="Magento\AsynchronousOperations\Api\Data\OperationInterface">
+        <handler name="product_action_attribute.website.update" type="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign" method="process" />
+    </topic>
 </config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue.xml b/app/code/Magento/Catalog/etc/queue.xml
index 40d9cd1a378b0..137f34a5c1e25 100644
--- a/app/code/Magento/Catalog/etc/queue.xml
+++ b/app/code/Magento/Catalog/etc/queue.xml
@@ -7,6 +7,9 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/queue.xsd">
     <broker topic="product_action_attribute.update" exchange="magento-db" type="db">
-        <queue name="product_action_attribute.update" consumer="product_action_attribute.update" consumerInstance="Magento\Framework\MessageQueue\BatchConsume" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process"/>
+        <queue name="product_action_attribute.update" consumer="product_action_attribute.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process"/>
+    </broker>
+    <broker topic="product_action_attribute.website.update" exchange="magento-db" type="db">
+        <queue name="product_action_attribute.website.update" consumer="product_action_attribute.website.update" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process"/>
     </broker>
 </config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_consumer.xml b/app/code/Magento/Catalog/etc/queue_consumer.xml
index 4be387211df04..d9e66ae69c10c 100644
--- a/app/code/Magento/Catalog/etc/queue_consumer.xml
+++ b/app/code/Magento/Catalog/etc/queue_consumer.xml
@@ -6,5 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
-    <consumer name="product_action_attribute.update" queue="product_action_attribute.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process" />
+    <consumer name="product_action_attribute.update" queue="product_action_attribute.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\Consumer::process" />
+    <consumer name="product_action_attribute.website.update" queue="product_action_attribute.website.update" connection="db" maxMessages="5000" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\Catalog\Model\Attribute\Backend\ConsumerWebsiteAssign::process" />
 </config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_publisher.xml b/app/code/Magento/Catalog/etc/queue_publisher.xml
index c673a8321762a..1606ea42ec0b3 100644
--- a/app/code/Magento/Catalog/etc/queue_publisher.xml
+++ b/app/code/Magento/Catalog/etc/queue_publisher.xml
@@ -9,4 +9,7 @@
     <publisher topic="product_action_attribute.update">
         <connection name="db" exchange="magento-db" />
     </publisher>
+    <publisher topic="product_action_attribute.website.update">
+        <connection name="db" exchange="magento-db" />
+    </publisher>
 </config>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/etc/queue_topology.xml b/app/code/Magento/Catalog/etc/queue_topology.xml
index 0097d770936a3..bdac891afbdb8 100644
--- a/app/code/Magento/Catalog/etc/queue_topology.xml
+++ b/app/code/Magento/Catalog/etc/queue_topology.xml
@@ -8,5 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
     <exchange name="magento-db" type="topic" connection="db">
         <binding id="updateBinding" topic="product_action_attribute.update" destinationType="queue" destination="product_action_attribute.update"/>
+        <binding id="updateBindingWebsite" topic="product_action_attribute.website.update" destinationType="queue" destination="product_action_attribute.website.update"/>
     </exchange>
 </config>
\ No newline at end of file

From 5fece499757fb44cc526fd2d5841475da0df322d Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Mon, 4 Mar 2019 19:43:10 -0600
Subject: [PATCH 0410/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Backend/ConsumerWebsiteAssign.php         |   1 -
 .../Plugin/MassUpdateProductAttribute.php     | 153 ++++++++++++++++++
 app/code/Magento/CatalogInventory/etc/di.xml  |   3 +
 3 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php

diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
index ce4113a03df59..f8cc3c04df605 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
@@ -148,7 +148,6 @@ private function updateWebsiteInProducts($productIds, $websiteRemoveData, $websi
         }
     }
 
-
     /**
      * @param $data
      */
diff --git a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
new file mode 100644
index 0000000000000..36958a37c6d1a
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogInventory\Plugin;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+
+class MassUpdateProductAttribute
+{
+    /**
+     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
+     */
+    private $stockIndexerProcessor;
+
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\StockRegistryInterface
+     */
+    private $stockRegistry;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface
+     */
+    private $stockItemRepository;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var \Magento\Backend\Model\Session
+     */
+    private $session;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\Redirect
+     */
+    private $redirectFactory;
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface
+     */
+    private $messageManager;
+
+    /**
+     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor
+     * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
+     * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository
+     * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param \Magento\Backend\Model\Session $session
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $redirectFactory
+     * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     */
+    public function __construct(
+        \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
+        \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository,
+        \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
+        \Magento\Framework\App\RequestInterface $request,
+        \Magento\Backend\Model\Session $session,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Backend\Model\View\Result\RedirectFactory $redirectFactory,
+        \Magento\Framework\Message\ManagerInterface $messageManager
+    ) {
+        $this->stockIndexerProcessor = $stockIndexerProcessor;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->stockRegistry = $stockRegistry;
+        $this->stockItemRepository = $stockItemRepository;
+        $this->stockConfiguration = $stockConfiguration;
+        $this->request = $request;
+        $this->session = $session;
+        $this->storeManager = $storeManager;
+        $this->redirectFactory = $redirectFactory;
+        $this->messageManager = $messageManager;
+    }
+
+    /**
+     * @param Save $subject
+     * @return \Magento\Framework\Controller\ResultInterface
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundExecute(Save $subject, callable $proceed)
+    {
+        try {
+            $inventoryData = $this->request->getParam('inventory', []);
+            $storeId = $this->request->getParam('store', \Magento\Store\Model\Store::DEFAULT_STORE_ID);
+            $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+            $productIds = $this->session->getData('product_ids');
+            $inventoryData = $this->addConfigSettings($inventoryData);
+            $this->updateInventoryInProducts($productIds, $websiteId, $inventoryData);
+
+            return $proceed();
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $this->messageManager->addErrorMessage($e->getMessage());
+        } catch (\Exception $e) {
+            $this->messageManager->addExceptionMessage(
+                $e,
+                __('Something went wrong while updating the product(s) attributes.')
+            );
+        }
+
+        return $this->redirectFactory->create()->setPath('catalog/product/', ['_current' => true]);
+    }
+
+    private function addConfigSettings($inventoryData)
+    {
+        $options = $this->stockConfiguration->getConfigItemOptions();
+        foreach ($options as $option) {
+            $useConfig = 'use_config_' . $option;
+            if (isset($inventoryData[$option]) && !isset($inventoryData[$useConfig])) {
+                $inventoryData[$useConfig] = 0;
+            }
+        }
+        return $inventoryData;
+    }
+
+    private function updateInventoryInProducts($productIds, $websiteId, $inventoryData): void
+    {
+        foreach ($productIds as $productId) {
+            $stockItemDo = $this->stockRegistry->getStockItem($productId, $websiteId);
+            if (!$stockItemDo->getProductId()) {
+                $inventoryData['product_id'] = $productId;
+            }
+            $stockItemId = $stockItemDo->getId();
+            $this->dataObjectHelper->populateWithArray($stockItemDo, $inventoryData, StockItemInterface::class);
+            $stockItemDo->setItemId($stockItemId);
+            $this->stockItemRepository->save($stockItemDo);
+        }
+        $this->stockIndexerProcessor->reindexList($productIds);
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/etc/di.xml b/app/code/Magento/CatalogInventory/etc/di.xml
index 8d57fab843f4c..4253dc09b4e29 100644
--- a/app/code/Magento/CatalogInventory/etc/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/di.xml
@@ -135,4 +135,7 @@
     <type name="Magento\CatalogInventory\Model\ResourceModel\Stock\Item">
         <plugin name="priceIndexUpdater" type="Magento\CatalogInventory\Model\Plugin\PriceIndexUpdater" />
     </type>
+    <type name="Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save">
+        <plugin name="massAction" type="Magento\CatalogInventory\Plugin\MassUpdateProductAttribute" />
+    </type>
 </config>

From 31fcfa50fbe3b6fccbbe18f57a25df425df47feb Mon Sep 17 00:00:00 2001
From: duhon <duhon@rambler.ru>
Date: Mon, 4 Mar 2019 20:09:58 -0600
Subject: [PATCH 0411/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Adminhtml/Product/Action/Attribute/Save.php      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 324f3aba14c7a..f0b19b2073cc3 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -177,11 +177,13 @@ private function publish($attributesData, $websiteRemoveData, $websiteAddData, $
             $operations[] = $this->makeOperation('Update product attributes', 'product_action_attribute.update', $attributesData, $storeId, $websiteId, $productIds, $bulkUuid);
         }
 
-        $result = $this->bulkManagement->scheduleBulk($bulkUuid, $operations, $bulkDescription, $this->userContext->getUserId());
-        if (!$result) {
-            throw new \Magento\Framework\Exception\LocalizedException(
-                __('Something went wrong while processing the request.')
-            );
+        if (!empty($operations)) {
+            $result = $this->bulkManagement->scheduleBulk($bulkUuid, $operations, $bulkDescription, $this->userContext->getUserId());
+            if (!$result) {
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    __('Something went wrong while processing the request.')
+                );
+            }
         }
     }
 

From 7a39087f0c0832f13cd50af18414a45229e59237 Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@adobe.com>
Date: Tue, 5 Mar 2019 18:58:28 -0600
Subject: [PATCH 0412/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 setup/performance-toolkit/benchmark.jmx | 837 ------------------------
 1 file changed, 837 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 765d0a616f77c..0e1860405e946 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -27267,843 +27267,6 @@ if (testLabel
             <stringProp name="ThreadGroup.delay"/>
         <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
         <hashTree>
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Product Grid Mass Actions" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${productGridMassActionPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Product Grid Mass Actions");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Get admin form key PostProcessor" enabled="true">
-        <stringProp name="script">
-        function getFormKeyFromResponse()
-        {
-            var url = prev.getUrlAsString(),
-            responseCode =  prev.getResponseCode(),
-            formKey = null;
-            searchPattern = /var FORM_KEY = '(.+)'/;
-            if (responseCode == "200" &amp;&amp; url) {
-                response = prev.getResponseDataAsString();
-                formKey = response  &amp;&amp; response.match(searchPattern) ? response.match(searchPattern)[1] : null;
-            }
-            return formKey;
-        }
-
-        formKey = vars.get("form_key_storage");
-
-	   currentFormKey = getFormKeyFromResponse();
-
-	   if (currentFormKey != null &amp;&amp; currentFormKey != formKey) {
-		  vars.put("form_key_storage", currentFormKey);
-	   }
-        </stringProp>
-        <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin/handle_admin_form_key.jmx</stringProp></JSR223PostProcessor>
-        <hashTree/>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set admin form key PreProcessor" enabled="true">
-            <stringProp name="script">
-                formKey =  vars.get("form_key_storage");
-                if (formKey
-                    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-                    &amp;&amp; sampler.getMethod() == "POST")
-                    {
-                        arguments = sampler.getArguments();
-                        for (i=0; i&lt;arguments.getArgumentCount(); i++)
-                        {
-                            argument = arguments.getArgument(i);
-                            if (argument.getName() == 'form_key' &amp;&amp; argument.getValue() != formKey) {
-                            log.info("admin form key updated: " + argument.getValue() + " =&gt; " + formKey);
-                            argument.setValue(formKey);
-                        }
-                    }
-                }
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        </JSR223PreProcessor>
-        <hashTree/>
-    
-    <CookieManager guiclass="CookiePanel" testclass="CookieManager" testname="HTTP Cookie Manager" enabled="true">
-      <collectionProp name="CookieManager.cookies"/>
-      <boolProp name="CookieManager.clearEachIteration">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/http_cookie_manager_without_clear_each_iteration.jmx</stringProp></CookieManager>
-    <hashTree/>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Admin Login" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Admin Login Lock" enabled="true">
-        <stringProp name="CriticalSectionController.lockName">get-admin-email</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
-    <hashTree>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Get Admin Email" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/get_admin_email.jmx</stringProp>
-      <stringProp name="BeanShellSampler.query">
-adminUserList = props.get("adminUserList");
-adminUserListIterator = props.get("adminUserListIterator");
-adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-
-if (adminUsersDistribution == 1) {
-    adminUser = adminUserList.poll();
-} else {
-    if (!adminUserListIterator.hasNext()) {
-        adminUserListIterator = adminUserList.descendingIterator();
-    }
-
-    adminUser = adminUserListIterator.next();
-}
-
-if (adminUser == null) {
-  SampleResult.setResponseMessage("adminUser list is empty");
-  SampleResult.setResponseData("adminUser list is empty","UTF-8");
-  IsSuccess=false;
-  SampleResult.setSuccessful(false);
-  SampleResult.setStopThread(true);
-}
-vars.put("admin_user", adminUser);
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    </BeanShellSampler>
-    <hashTree/>
-  </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert login form shown" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1397214398">Welcome</stringProp>
-          <stringProp name="-515240035">&lt;title&gt;Magento Admin&lt;/title&gt;</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-      <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-        <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-        <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-        <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-        <stringProp name="RegexExtractor.template">$1$</stringProp>
-        <stringProp name="RegexExtractor.default"/>
-        <stringProp name="RegexExtractor.match_number">1</stringProp>
-      </RegexExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert form_key extracted" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="2845929">^.+$</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_form_key</stringProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Login Submit Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="dummy" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">dummy</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="login[password]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_password}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[password]</stringProp>
-          </elementProp>
-          <elementProp name="login[username]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_user}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">login[username]</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/dashboard/</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <stringProp name="HTTPSampler.implementation">Java</stringProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_login_submit_form.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-        <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract form key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">admin_form_key</stringProp>
-            <stringProp name="RegexExtractor.regex">&lt;input name="form_key" type="hidden" value="([^'"]+)" /&gt;</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">1</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_login/admin_retrieve_form_key.jmx</stringProp></RegexExtractor>
-        <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Simple Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
-    <hashTree>
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Pages Count" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">product_listing</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="search" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">search</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">20</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[current]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[current]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">entity_id</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[field]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">asc</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[direction]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/get_product_pages_count.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-        <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-        <stringProp name="EXPECTED_VALUE">0</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">true</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total records" enabled="true">
-        <stringProp name="VAR">products_number</stringProp>
-        <stringProp name="JSONPATH">$.totalRecords</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Calculate pages count" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
-var productsTotal = Integer.parseInt(vars.get("products_number"));
-var pageCountProducts = Math.round(productsTotal/productsPageSize);
-
-vars.put("pages_count_product", String.valueOf(pageCountProducts));</stringProp>
-      </BeanShellPostProcessor>
-      <hashTree/>
-    </hashTree>
-  
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Arguments" enabled="true">
-      <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-Random random = new Random();
-if (${seedForRandom} &gt; 0) {
-random.setSeed(${seedForRandom});
-}
-var productsPageSize = Integer.parseInt(vars.get("products_page_size"));
-var totalNumberOfPages = Integer.parseInt(vars.get("pages_count_product"));
-
-// Randomly select a page.
-var randomProductsPage = random.nextInt(totalNumberOfPages) + 1;
-
-// Get the first and last product id on that page.
-var lastProductIdOnPage = randomProductsPage * productsPageSize;
-var firstProductIdOnPage = lastProductIdOnPage - productsPageSize + 1;
-
-var randomProductId1 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
-var randomProductId2 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
-var randomProductId3 = Math.floor(random.nextInt(productsPageSize)) + firstProductIdOnPage;
-
-vars.put("page_number", String.valueOf(randomProductsPage));
-vars.put("productId1", String.valueOf(randomProductId1));
-vars.put("productId2", String.valueOf(randomProductId2));
-vars.put("productId3", String.valueOf(randomProductId3));
-
-var randomQuantity = random.nextInt(1000) + 1;
-var randomPrice = random.nextInt(500) + 10;
-var randomVisibility = random.nextInt(4) + 1;
-
-vars.put("quantity", String.valueOf(randomQuantity));
-vars.put("price", String.valueOf(randomPrice));
-vars.put("visibility", String.valueOf(randomVisibility));
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Select Products and Update Attributes mass action" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">product_listing</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="search" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">search</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${products_page_size}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="paging[current]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${page_number}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">paging[current]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[field]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">entity_id</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[field]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="sorting[direction]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">asc</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">sorting[direction]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_grid.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1637639774">totalRecords</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Display Update Attributes" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="selected[0]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${productId1}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">selected[0]</stringProp>
-          </elementProp>
-          <elementProp name="selected[1]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${productId2}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">selected[1]</stringProp>
-          </elementProp>
-          <elementProp name="selected[2]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${productId3}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">selected[2]</stringProp>
-            <stringProp name="Argument.desc">true</stringProp>
-          </elementProp>
-          <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${admin_form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-          <elementProp name="namespace" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">product_listing</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">namespace</stringProp>
-            <stringProp name="Argument.desc">false</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/edit</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/display_update_attributes.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1862384910">Update Attributes</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Validate Attributes" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="inventory[qty]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${quantity}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">inventory[qty]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="attributes[price]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${price}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[price]</stringProp>
-        </elementProp>
-        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${visibility}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[visibility]</stringProp>
-        </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/validate</stringProp>
-    <stringProp name="HTTPSampler.method">POST</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/admin_browse_products_grid/products_grid_mass_actions/change_attributes.jmx</stringProp></HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1853918323">{"error":false}</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
-  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Attributes" enabled="true">
-    <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-      <collectionProp name="Arguments.arguments">
-        <elementProp name="isAjax" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">true</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">isAjax</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="form_key" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${admin_form_key}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">form_key</stringProp>
-          <stringProp name="Argument.desc">false</stringProp>
-        </elementProp>
-        <elementProp name="product[product_has_weight]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[product_has_weight]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_message_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_message_available]</stringProp>
-        </elementProp>
-        <elementProp name="product[use_config_gift_wrapping_available]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">1</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">product[use_config_gift_wrapping_available]</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="inventory[qty]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${quantity}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">inventory[qty]</stringProp>
-        </elementProp>
-        <elementProp name="toggle_qty" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">on</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">toggle_price</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="attributes[price]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${price}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[price]</stringProp>
-        </elementProp>
-        <elementProp name="toggle_price" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">on</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">toggle_price</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-        <elementProp name="attributes[visibility]" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">${visibility}</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">attributes[visibility]</stringProp>
-        </elementProp>
-        <elementProp name="toggle_visibility" elementType="HTTPArgument">
-          <boolProp name="HTTPArgument.always_encode">true</boolProp>
-          <stringProp name="Argument.value">on</stringProp>
-          <stringProp name="Argument.metadata">=</stringProp>
-          <boolProp name="HTTPArgument.use_equals">true</boolProp>
-          <stringProp name="Argument.name">toggle_visibility</stringProp>
-          <stringProp name="Argument.desc">true</stringProp>
-        </elementProp>
-      </collectionProp>
-    </elementProp>
-    <stringProp name="HTTPSampler.domain"/>
-    <stringProp name="HTTPSampler.port"/>
-    <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-    <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-    <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-    <stringProp name="HTTPSampler.contentEncoding"/>
-    <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/product_action_attribute/save/store/0/active_tab/attributes</stringProp>
-    <stringProp name="HTTPSampler.method">POST</stringProp>
-    <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-    <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-    <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-    <boolProp name="HTTPSampler.DO_MULTIPART_POST">true</boolProp>
-    <boolProp name="HTTPSampler.monitor">false</boolProp>
-    <stringProp name="HTTPSampler.embedded_url_re"/>
-  </HTTPSamplerProxy>
-  <hashTree>
-    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-      <collectionProp name="Asserion.test_strings">
-        <stringProp name="1848809106">were updated.</stringProp>
-      </collectionProp>
-      <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-      <boolProp name="Assertion.assume_success">false</boolProp>
-      <intProp name="Assertion.test_type">2</intProp>
-    </ResponseAssertion>
-    <hashTree/>
-  </hashTree>
-</hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments"/>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/auth/logout/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/admin_logout.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-    
-    <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Return Admin to Pool" enabled="true">
-        <boolProp name="resetInterpreter">false</boolProp>
-        <stringProp name="parameters"/>
-        <stringProp name="filename"/>
-        <stringProp name="script">
-        adminUsersDistribution = Integer.parseInt(vars.get("admin_users_distribution_per_admin_pool"));
-        if (adminUsersDistribution == 1) {
-            adminUserList = props.get("adminUserList");
-            adminUserList.add(vars.get("admin_user"));
-        }
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/return_admin_email_to_pool.jmx</stringProp></BeanShellPostProcessor>
-    <hashTree/>
-  </hashTree>
-  </hashTree>
-
-  
     <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Import Products" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>

From 25ea720c478f7cc9475a05fe17242b9973920d54 Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Wed, 6 Mar 2019 17:05:27 -0600
Subject: [PATCH 0413/1055] MC-15289: Customer account group cannot be selected
 while creating a new customer in order

- Added functional test
---
 .../AdminChangeCustomerGroupInNewOrder.xml    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml
new file mode 100644
index 0000000000000..85ef563e10db7
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminChangeCustomerGroupInNewOrder.xml
@@ -0,0 +1,38 @@
+<?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="AdminChangeCustomerGroupInNewOrder">
+        <annotations>
+            <title value="Customer account group cannot be selected while creating a new customer in order"/>
+            <stories value="MC-15290: Customer account group cannot be selected while creating a new customer in order"/>
+            <description value="Customer account group cannot be selected while creating a new customer in order"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-15290"/>
+            <useCaseId value="MC-15289"/>
+            <group value="sales"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        
+        <actionGroup ref="navigateToNewOrderPageNewCustomerSingleStore" stepKey="openNewOrder"/>
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="Retailer" stepKey="selectCustomerGroup"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <grabValueFrom selector="{{AdminOrderFormAccountSection.group}}" stepKey="grabGroupValue"/>
+        <assertEquals stepKey="assertValueIsStillSelected">
+            <actualResult type="variable">$grabGroupValue</actualResult>
+            <expectedResult type="string">3</expectedResult>
+        </assertEquals>
+    </test>
+</tests>

From 5e4adb83c6ad5f1cfd41551cf3d55a4ffc22bb18 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Thu, 7 Mar 2019 00:28:00 +0100
Subject: [PATCH 0414/1055] GraphQL-432: Created separate class
 GetMaskedQuoteIdByReversedQuoteId and replaced method in one api-functional
 test

---
 .../GetMaskedQuoteIdByReversedQuoteId.php     | 58 +++++++++++++++++++
 .../Quote/SetShippingAddressOnCartTest.php    | 30 +++++-----
 2 files changed, 72 insertions(+), 16 deletions(-)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/GetMaskedQuoteIdByReversedQuoteId.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/GetMaskedQuoteIdByReversedQuoteId.php b/app/code/Magento/QuoteGraphQl/Model/GetMaskedQuoteIdByReversedQuoteId.php
new file mode 100644
index 0000000000000..60466170fc562
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/GetMaskedQuoteIdByReversedQuoteId.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model;
+
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\QuoteFactory;
+
+class GetMaskedQuoteIdByReversedQuoteId
+{
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @param QuoteFactory $quoteFactory
+     * @param QuoteResource $quoteResource
+     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId
+     */
+    public function __construct(
+        QuoteFactory $quoteFactory,
+        QuoteResource $quoteResource,
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedId
+    ) {
+        $this->quoteFactory = $quoteFactory;
+        $this->quoteResource = $quoteResource;
+        $this->quoteIdToMaskedId = $quoteIdToMaskedId;
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute(string $reversedQuoteId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
index 4916bb2aa78c3..9352111de8543 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
@@ -13,6 +13,7 @@
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\TestFramework\ObjectManager;
@@ -37,6 +38,11 @@ class SetShippingAddressOnCartTest extends GraphQlAbstract
      */
     private $quoteIdToMaskedId;
 
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var CustomerTokenServiceInterface
      */
@@ -47,16 +53,20 @@ protected function setUp()
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     *
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetNewShippingAddressByGuest()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -116,7 +126,7 @@ public function testSetNewShippingAddressByGuest()
      */
     public function testSetShippingAddressFromAddressBookByGuest()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -284,7 +294,7 @@ public function testSetNotExistedShippingAddressFromAddressBook()
      */
     public function testSetShippingAddressWithoutAddresses()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -361,7 +371,7 @@ public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
      */
     public function testSetMultipleNewShippingAddresses()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -512,18 +522,6 @@ private function getHeaderMap(string $username = 'customer@example.com', string
         return $headerMap;
     }
 
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $reversedQuoteId
      * @param int $customerId

From ab061382a5320bcc486b4a33aa50bad1aa930c70 Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@adobe.com>
Date: Wed, 6 Mar 2019 18:10:45 -0600
Subject: [PATCH 0415/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Product/Action/Attribute/Save.php         | 40 ++++++++++++++-----
 .../Model/Attribute/Backend/Consumer.php      |  6 +--
 .../Backend/ConsumerWebsiteAssign.php         |  6 +--
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index f0b19b2073cc3..5409991477539 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -161,20 +161,38 @@ private function sanitizeProductAttributes($attributesData)
      */
     private function publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds):void
     {
+        $productIdsChunks = array_chunk($productIds, 100);
         $bulkUuid = $this->identityService->generateId();
-        $bulkDescription = __('Update attributes to selected products');
+        $bulkDescription = __('Update attributes to ' . count($productIds) . ' selected products');
         $operations = [];
-        if ($websiteRemoveData || $websiteAddData) {
-            $dataToUpdate = [
-                'website_assign' => $websiteAddData,
-                'website_detach' => $websiteRemoveData
-            ];
-
-            $operations[] = $this->makeOperation('Update website assign', 'product_action_attribute.website.update', $dataToUpdate, $storeId, $websiteId, $productIds, $bulkUuid);
-        }
+        foreach($productIdsChunks as $productIdsChunk) {
+            if ($websiteRemoveData || $websiteAddData) {
+                $dataToUpdate = [
+                    'website_assign' => $websiteAddData,
+                    'website_detach' => $websiteRemoveData
+                ];
+                $operations[] = $this->makeOperation(
+                    'Update website assign',
+                    'product_action_attribute.website.update',
+                    $dataToUpdate,
+                    $storeId,
+                    $websiteId,
+                    $productIdsChunk,
+                    $bulkUuid
+                );
+            }
 
-        if ($attributesData) {
-            $operations[] = $this->makeOperation('Update product attributes', 'product_action_attribute.update', $attributesData, $storeId, $websiteId, $productIds, $bulkUuid);
+            if ($attributesData) {
+                $operations[] = $this->makeOperation(
+                    'Update product attributes',
+                    'product_action_attribute.update',
+                    $attributesData,
+                    $storeId,
+                    $websiteId,
+                    $productIdsChunk,
+                    $bulkUuid
+                );
+            }
         }
 
         if (!empty($operations)) {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index 7e6c68a1502e0..f9c90f82dacd4 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -99,9 +99,7 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             $this->execute($data);
 
         } catch (\Zend_Db_Adapter_Exception  $e) {
-            //here sample how to process exceptions if they occurred
             $this->logger->critical($e->getMessage());
-            //you can add here your own type of exception when operation can be retried
             if (
                 $e instanceof \Magento\Framework\DB\Adapter\LockWaitException
                 || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
@@ -113,7 +111,7 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             } else {
                 $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
                 $errorCode = $e->getCode();
-                $message = __('Sorry, something went wrong during product prices update. Please see log for details.');
+                $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
             }
         } catch (NoSuchEntityException $e) {
             $this->logger->critical($e->getMessage());
@@ -131,7 +129,7 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             $this->logger->critical($e->getMessage());
             $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
             $errorCode = $e->getCode();
-            $message = __('Sorry, something went wrong during product prices update. Please see log for details.');
+            $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
         }
 
         $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
index f8cc3c04df605..591c0892b4228 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
@@ -91,9 +91,7 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             $data = $this->serializer->unserialize($serializedData);
             $this->execute($data);
         } catch (\Zend_Db_Adapter_Exception  $e) {
-            //here sample how to process exceptions if they occurred
             $this->logger->critical($e->getMessage());
-            //you can add here your own type of exception when operation can be retried
             if (
                 $e instanceof \Magento\Framework\DB\Adapter\LockWaitException
                 || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
@@ -105,7 +103,7 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             } else {
                 $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
                 $errorCode = $e->getCode();
-                $message = __('Sorry, something went wrong during product prices update. Please see log for details.');
+                $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
             }
         } catch (NoSuchEntityException $e) {
             $this->logger->critical($e->getMessage());
@@ -123,7 +121,7 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             $this->logger->critical($e->getMessage());
             $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
             $errorCode = $e->getCode();
-            $message = __('Sorry, something went wrong during product prices update. Please see log for details.');
+            $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
         }
 
         $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)

From 13991bbefd2ad895c4d6047d8c0e4675130ca8f6 Mon Sep 17 00:00:00 2001
From: amol2jcommerce <amol@twojay.in>
Date: Thu, 7 Mar 2019 12:08:31 +0530
Subject: [PATCH 0416/1055] changes for advanced-Search-layout-not-proper-1

---
 .../Magento_Customer/web/css/source/_module.less | 16 ++++++++++++++++
 .../Magento_Customer/web/css/source/_module.less | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

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..0da95b0789674 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
@@ -388,6 +388,17 @@
             position: relative;
         }
     }
+
+    .form.search.advanced {
+        .field.price {
+            .with-addon {
+                .input-text {
+                    width: 100%;
+                    flex-basis: auto;
+                }
+            }
+        }
+    }
 }
 
 //
@@ -456,6 +467,11 @@
         width: 50%;
     }
 
+    .form.search.advanced {
+        float: none;
+        width: 50%;
+    }
+
     //
     //  My account
     //  ---------------------------------------------
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..555da7f7a2ebe 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
@@ -407,6 +407,11 @@
         width: 50%;
     }
 
+    .form.search.advanced {
+        float: none;
+        width: 50%;
+    }
+
     //  My account
     .account.page-layout-2columns-left {
         .sidebar-main,
@@ -589,4 +594,15 @@
             position: relative;
         }
     }
+
+    .form.search.advanced {
+        .field.price {
+            .with-addon {
+                .input-text {
+                    width: 100%;
+                    flex-basis: auto;
+                }
+            }
+        }
+    }
 }

From 1f0f7a1b920a1289bffa5c1ffa9a415c264bef61 Mon Sep 17 00:00:00 2001
From: amol2jcommerce <amol@twojay.in>
Date: Thu, 7 Mar 2019 13:13:51 +0530
Subject: [PATCH 0417/1055] changes for advanced-Search-layout-not-proper-1

---
 .../blank/Magento_Customer/web/css/source/_module.less    | 8 ++------
 .../luma/Magento_Customer/web/css/source/_module.less     | 8 ++------
 2 files changed, 4 insertions(+), 12 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 0da95b0789674..645c7cbc12d5d 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
@@ -462,13 +462,9 @@
     .form.password.reset,
     .form.send.confirmation,
     .form.password.forget,
-    .form.create.account {
-        min-width: 600px;
-        width: 50%;
-    }
-
+    .form.create.account,
     .form.search.advanced {
-        float: none;
+        min-width: 600px;
         width: 50%;
     }
 
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 555da7f7a2ebe..cc90f7542414b 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
@@ -402,13 +402,9 @@
     .form.password.reset,
     .form.send.confirmation,
     .form.password.forget,
-    .form.create.account {
-        min-width: 600px;
-        width: 50%;
-    }
-
+    .form.create.account,
     .form.search.advanced {
-        float: none;
+        min-width: 600px;
         width: 50%;
     }
 

From 0041ce985efd992e617aef63eb53b1587715902d Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 7 Mar 2019 10:52:36 +0200
Subject: [PATCH 0418/1055] Fix typo.

---
 app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
index 957b0f64532b8..c27717f4c7793 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php
@@ -10,7 +10,7 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 
 /**
- * Confirm subscritpion controller.
+ * Confirm subscription controller.
  */
 class Confirm extends \Magento\Newsletter\Controller\Subscriber implements HttpGetActionInterface
 {

From 5867a48a5e7ab3ac7e5bad35e98db1b2b4d8b35c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 14 Feb 2019 16:21:23 +0200
Subject: [PATCH 0419/1055] ENGCOM-4238: MFTF test fix.

---
 .../Customer/Test/Mftf/Data/AddressData.xml   | 17 -----------
 .../Customer/Test/Mftf/Data/CustomerData.xml  | 13 +++++++++
 ...rderWithAndWithoutFieldsValidationTest.xml | 29 ++++++++++++-------
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index 8fa058dc2b574..da36cf722325e 100755
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -51,23 +51,6 @@
         <data key="default_shipping">Yes</data>
         <requiredEntity type="region">RegionTX</requiredEntity>
     </entity>
-    <entity name="US_address_TX_Wrong_Validation" type="address">
-        <data key="firstname">LoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsum</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>
-        <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>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index b3c0d8d9e0047..670ca1cef027a 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -45,6 +45,19 @@
         <data key="website_id">0</data>
         <requiredEntity type="address">US_Address_TX</requiredEntity>
     </entity>
+    <entity name="Simple_US_Customer_Incorrect_Name" type="customer">
+        <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>
+        <data key="firstname">LoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsum</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</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>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
index 83c9072721836..d418751c736e1 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
@@ -49,12 +49,13 @@
         <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
 
         <!--Fill wrong customer address information-->
-        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
-            <argument name="customer" value="Simple_US_Customer"/>
-            <argument name="address" value="US_address_TX_Wrong_Validation"/>
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillWrongCustomerAddress" after="fillCustomerEmail">
+            <argument name="customer" value="Simple_US_Customer_Incorrect_Name"/>
+            <argument name="address" value="US_Address_TX"/>
         </actionGroup>
         <!-- Select shipping -->
-        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"
+                     after="fillWrongCustomerAddress"/>
 
         <!--Verify totals on Order page-->
         <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
@@ -63,17 +64,25 @@
         <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="scrollToOrderGrandTotal"/>
 
         <!--Submit Order and verify information-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="seeCorrectGrandTotal"/>
-        <see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}" userInput="Please enter less or equal than 255 symbols." stepKey="firstNameError" after="clickSubmitOrder"/>
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrderWrong"
+               after="seeCorrectGrandTotal"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}"
+             userInput="Please enter less or equal than 255 symbols." stepKey="firstNameError"
+             after="clickSubmitOrderWrong"/>
 
         <!--Fill correct customer address information-->
         <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="firstNameError">
             <argument name="customer" value="Simple_US_Customer"/>
-            <argument name="address" value="US_address_TX"/>
+            <argument name="address" value="US_Address_TX"/>
         </actionGroup>
+
+        <!-- Select shipping -->
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShipping" after="fillCustomerAddress"/>
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="selectShipping" after="clickShipping"/>
+
         <!--Submit Order and verify information-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="fillCustomerAddress"/>
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="selectShipping"/>
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
-        </test>
-    </tests>
\ No newline at end of file
+    </test>
+</tests>

From ae9084de11bf2a59d2540d2ba6769b9ef1d46b8d Mon Sep 17 00:00:00 2001
From: vgelani <vishalgelani99@gmail.com>
Date: Thu, 7 Mar 2019 17:18:28 +0530
Subject: [PATCH 0420/1055] Updated review text in admin menu

---
 app/code/Magento/Review/etc/acl.xml            | 4 ++--
 app/code/Magento/Review/etc/adminhtml/menu.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Review/etc/acl.xml b/app/code/Magento/Review/etc/acl.xml
index 09b80750da14d..6932f2535090c 100644
--- a/app/code/Magento/Review/etc/acl.xml
+++ b/app/code/Magento/Review/etc/acl.xml
@@ -16,8 +16,8 @@
                 </resource>
                 <resource id="Magento_Backend::marketing">
                     <resource id="Magento_Backend::marketing_user_content">
-                        <resource id="Magento_Review::reviews_all" title="Reviews" translate="title" sortOrder="10"/>
-                        <resource id="Magento_Review::pending" title="Pending Reviews" translate="title" sortOrder="20"/>
+                        <resource id="Magento_Review::pending" title="Pending Reviews" translate="title" sortOrder="10"/>
+                        <resource id="Magento_Review::reviews_all" title="All Reviews" translate="title" sortOrder="20"/>
                     </resource>
                 </resource>
             </resource>
diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index 0a2e49450e0cf..72499b416cd17 100644
--- a/app/code/Magento/Review/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
         <add id="Magento_Review::catalog_reviews_ratings_ratings" title="Rating" translate="title" module="Magento_Review" sortOrder="60" parent="Magento_Backend::stores_attributes" action="review/rating/" resource="Magento_Review::ratings"/>
-        <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="10" action="review/product/index" resource="Magento_Review::reviews_all"/>
-        <add id="Magento_Review::catalog_reviews_ratings_pending" title="Pending Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="20" action="review/product/pending" resource="Magento_Review::pending"/>
+        <add id="Magento_Review::catalog_reviews_ratings_pending" title="Pending Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="10" action="review/product/pending" resource="Magento_Review::pending"/>
+        <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="All Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="20" action="review/product/index" resource="Magento_Review::reviews_all"/>
         <add id="Magento_Review::report_review" title="Reviews" translate="title" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
         <add id="Magento_Review::report_review_customer" title="By Customers" translate="title" sortOrder="10" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/customer" resource="Magento_Reports::review_customer"/>
         <add id="Magento_Review::report_review_product" title="By Products" translate="title" sortOrder="20" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/product" resource="Magento_Reports::review_product"/>

From 9395e76f7a268c7c875140f184a9f7b24bdfe19b Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Thu, 7 Mar 2019 14:11:53 +0200
Subject: [PATCH 0421/1055] 420 - Test coverage: GetAvailablePaymentMethodsTest
 for Guest 1. Add
 Magento/Payment/_files/disable_all_active_payment_methods.php

---
 .../Guest/GetAvailablePaymentMethodsTest.php  |  2 +-
 .../disable_all_active_payment_methods.php    | 37 +++++++++++++++++++
 ...le_all_active_payment_methods_rollback.php | 33 +++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index 2f96ddc4e3824..09d5c419b5d68 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -86,7 +86,7 @@ public function testGetPaymentMethodsFromAnotherCustomerCart()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/Payment/_files/disable_all_payment_methods.php
+     * @magentoApiDataFixture Magento/Payment/_files/disable_all_active_payment_methods.php
      */
     public function testGetPaymentMethodsIfPaymentsAreNotSet()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
new file mode 100644
index 0000000000000..762ea672614a8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$processConfigData = function (Config $config, array $data) {
+    foreach ($data as $key => $value) {
+        $config->setDataByPath($key, $value);
+        $config->save();
+    }
+};
+
+$objectManager          = Bootstrap::getObjectManager();
+$paymentMethodList      = $objectManager->get(\Magento\Payment\Api\PaymentMethodListInterface::class);
+$rollbackConfigKey      = 'test/payment/disabled_payment_methods';
+$configData             = [];
+$disabledPaymentMethods = [];
+
+// Get all active Payment Methods
+foreach ($paymentMethodList->getActiveList(\Magento\Store\Model\Store::DEFAULT_STORE_ID) as $paymentMethod) {
+    $configData['payment/' . $paymentMethod->getCode() . '/active'] = 0;
+    $disabledPaymentMethods[] = $paymentMethod->getCode();
+}
+// Remember all manually disabled Payment Methods for rollback
+$configData[$rollbackConfigKey] = implode(',', $disabledPaymentMethods);
+
+/** @var Config $defConfig */
+$defConfig = $objectManager->create(Config::class);
+$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+
+$processConfigData($defConfig, $configData);
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
new file mode 100644
index 0000000000000..ee81af139f4b4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager     = Bootstrap::getObjectManager();
+$rollbackConfigKey = 'test/payment/disabled_payment_methods';
+
+$configWriter        = $objectManager->create(WriterInterface::class);
+$rollbackConfigValue = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
+    ->getStore(\Magento\Store\Model\Store::DEFAULT_STORE_ID)
+    ->getConfig($rollbackConfigKey);
+
+$disabledPaymentMethods = [];
+if (!empty($rollbackConfigValue)) {
+    $disabledPaymentMethods = explode(',', $rollbackConfigValue);
+}
+
+if (count($disabledPaymentMethods)) {
+    foreach ($disabledPaymentMethods as $keyToRemove) {
+        $configWriter->delete(sprintf('payment/%s/active', $keyToRemove));
+    }
+}
+$configWriter->delete($rollbackConfigKey);
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();

From 44e24e37e1678f072de4e075f47a21f0f1b93b46 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Thu, 7 Mar 2019 15:30:17 +0200
Subject: [PATCH 0422/1055] 419 - Test coverage: GetAvailablePaymentMethodsTest
 for Customer 1. Add - testGetPaymentMethodsFromCustomerCart -
 testGetPaymentMethodsFromAnotherCustomerCart -
 testGetPaymentMethodsOfNonExistentCart

---
 .../GetAvailablePaymentMethodsTest.php        | 65 +++++++++++++++----
 1 file changed, 54 insertions(+), 11 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index 5695aab6854d4..4cc72a8089b94 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -54,11 +54,59 @@ protected function setUp()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      */
-    public function testGetCartWithPaymentMethods()
+    public function testGetPaymentMethodsFromCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+        $response      = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
-        $query = <<<QUERY
+        self::assertArrayHasKey('cart', $response);
+        self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
+        self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);
+        self::assertGreaterThan(
+            0,
+            count($response['cart']['available_payment_methods']),
+            'There are no available payment methods for customer cart!'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     */
+    public function testGetPaymentMethodsFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+    }
+
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetPaymentMethodsOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartAvailablePaymentMethodsQuery(
+        string $maskedQuoteId
+    ) : string {
+        return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
     available_payment_methods {
@@ -68,11 +116,6 @@ public function testGetCartWithPaymentMethods()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-
-        self::assertArrayHasKey('cart', $response);
-        self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
-        self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);
     }
 
     /**
@@ -88,13 +131,13 @@ private function getHeaderMap(string $username = 'customer@example.com', string
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reservedOrderId
      * @return string
      */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }

From 8ab0ab3585c72037e06fbf6ca1c6cb4161e59a04 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Thu, 7 Mar 2019 15:33:51 +0200
Subject: [PATCH 0423/1055] 420 - Test coverage: GetAvailablePaymentMethodsTest
 for Guest 1. Fix typo errors

---
 .../Quote/Guest/GetAvailablePaymentMethodsTest.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index 09d5c419b5d68..ff2e79b61a3ab 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -49,7 +49,7 @@ protected function setUp()
      */
     public function testGetPaymentMethodsFromGuestCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
         $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
         $response      = $this->graphQlQuery($query);
 
@@ -75,7 +75,7 @@ public function testGetPaymentMethodsFromGuestCart()
      */
     public function testGetPaymentMethodsFromAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
         $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -90,7 +90,7 @@ public function testGetPaymentMethodsFromAnotherCustomerCart()
      */
     public function testGetPaymentMethodsIfPaymentsAreNotSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
         $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
         $response      = $this->graphQlQuery($query);
 
@@ -128,13 +128,13 @@ private function getCartAvailablePaymentMethodsQuery(
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reservedOrderId
      * @return string
      */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }

From 4c2f34126d16abc3aeb84696ac1e54e23ca2276a Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Thu, 7 Mar 2019 15:34:39 +0200
Subject: [PATCH 0424/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 .../Magento/Bundle/Model/Product/Price.php    |  6 ++-
 .../Bundle/Model/Product/PriceTest.php        | 51 ++++++++++++++++++-
 .../product_with_simple_tier_pricing.php      | 39 ++++++++++++++
 ...duct_with_simple_tier_pricing_rollback.php | 24 +++++++++
 4 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php

diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index 00b6b2d7a3f5a..c36adb7e418a0 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -454,7 +454,11 @@ public function getSelectionFinalTotalPrice(
         }
 
         if ($bundleProduct->getPriceType() == self::PRICE_TYPE_DYNAMIC) {
-            $price = $selectionProduct->getFinalPrice($takeTierPrice ? $selectionQty : 1);
+            $totalQty = $bundleQty * $selectionQty;
+            if (!$takeTierPrice || $totalQty === 0) {
+                $totalQty = 1;
+            }
+            $price = $selectionProduct->getFinalPrice($totalQty);
         } else {
             if ($selectionProduct->getSelectionPriceType()) {
                 // percent
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php
index 2a68ff48e5f9a..4a5757aae3134 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Bundle\Model\Product;
 
 /**
- * @magentoDataFixture Magento/Bundle/_files/product_with_tier_pricing.php
+ * Class to test bundle prices
  */
 class PriceTest extends \PHPUnit\Framework\TestCase
 {
@@ -22,6 +22,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @magentoDataFixture Magento/Bundle/_files/product_with_tier_pricing.php
+     */
     public function testGetTierPrice()
     {
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
@@ -37,4 +40,50 @@ public function testGetTierPrice()
         $this->assertEquals(20.0, $this->_model->getTierPrice(4, $product));
         $this->assertEquals(30.0, $this->_model->getTierPrice(5, $product));
     }
+
+    /**
+     * Test calculation final price for bundle product with tire price in simple product
+     *
+     * @param float $bundleQty
+     * @param float $selectionQty
+     * @param float $finalPrice
+     * @magentoDataFixture Magento/Bundle/_files/product_with_simple_tier_pricing.php
+     * @dataProvider getSelectionFinalTotalPriceWithSimpleTierPriceDataProvider
+     */
+    public function testGetSelectionFinalTotalPriceWithSimpleTierPrice(
+        float $bundleQty,
+        float $selectionQty,
+        float $finalPrice
+    ) {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $bundleProduct = $productRepository->get('bundle-product');
+        $simpleProduct = $productRepository->get('simple');
+        $simpleProduct->setCustomerGroupId(\Magento\Customer\Model\Group::CUST_GROUP_ALL);
+
+        $this->assertEquals(
+            $finalPrice,
+            $this->_model->getSelectionFinalTotalPrice(
+                $bundleProduct,
+                $simpleProduct,
+                $bundleQty,
+                $selectionQty,
+                false
+            ),
+            'Tier price calculation for Simple product is wrong'
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getSelectionFinalTotalPriceWithSimpleTierPriceDataProvider(): array
+    {
+        return [
+            [1, 1, 10],
+            [2, 1, 8],
+            [5, 1, 5],
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
new file mode 100644
index 0000000000000..0342694cead93
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$simpleProduct = $productRepository->get('simple');
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('bundle')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setPriceType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC)
+    ->setName('Bundle Product')
+    ->setSku('bundle-product')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setBundleOptionsData(
+        [
+            [
+                'title' => 'Bundle Product Items',
+                'default_title' => 'Bundle Product Items',
+                'type' => 'checkbox', 'required' => 1,
+                'delete' => '',
+            ],
+        ]
+    )
+    ->setBundleSelectionsData(
+        [[['product_id' => $simpleProduct->getId(), 'selection_qty' => 1, 'delete' => '']]]
+    );
+$product->save();
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
new file mode 100644
index 0000000000000..aa661c7412d42
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $product = $productRepository->get('bundle-product');
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 8786fbfa171adb26931d90e8f3d3790a5ddcb63c Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Thu, 7 Mar 2019 15:55:27 +0200
Subject: [PATCH 0425/1055] 419 - Test coverage: GetAvailablePaymentMethodsTest
 for Customer 1. Add testGetPaymentMethodsIfPaymentsAreNotSet and appropriate
 fixtures

---
 .../GetAvailablePaymentMethodsTest.php        | 12 ++++++
 .../disable_all_active_payment_methods.php    | 37 +++++++++++++++++++
 ...le_all_active_payment_methods_rollback.php | 33 +++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index 4cc72a8089b94..e5027119cbc6c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -85,6 +85,18 @@ public function testGetPaymentMethodsFromAnotherCustomerCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @magentoApiDataFixture Magento/Payment/_files/disable_all_active_payment_methods.php
+     */
+    public function testGetPaymentMethodsIfPaymentsAreNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+        $response      = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertEquals(0, count($response['cart']['available_payment_methods']));
+    }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
new file mode 100644
index 0000000000000..762ea672614a8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$processConfigData = function (Config $config, array $data) {
+    foreach ($data as $key => $value) {
+        $config->setDataByPath($key, $value);
+        $config->save();
+    }
+};
+
+$objectManager          = Bootstrap::getObjectManager();
+$paymentMethodList      = $objectManager->get(\Magento\Payment\Api\PaymentMethodListInterface::class);
+$rollbackConfigKey      = 'test/payment/disabled_payment_methods';
+$configData             = [];
+$disabledPaymentMethods = [];
+
+// Get all active Payment Methods
+foreach ($paymentMethodList->getActiveList(\Magento\Store\Model\Store::DEFAULT_STORE_ID) as $paymentMethod) {
+    $configData['payment/' . $paymentMethod->getCode() . '/active'] = 0;
+    $disabledPaymentMethods[] = $paymentMethod->getCode();
+}
+// Remember all manually disabled Payment Methods for rollback
+$configData[$rollbackConfigKey] = implode(',', $disabledPaymentMethods);
+
+/** @var Config $defConfig */
+$defConfig = $objectManager->create(Config::class);
+$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+
+$processConfigData($defConfig, $configData);
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
new file mode 100644
index 0000000000000..ee81af139f4b4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager     = Bootstrap::getObjectManager();
+$rollbackConfigKey = 'test/payment/disabled_payment_methods';
+
+$configWriter        = $objectManager->create(WriterInterface::class);
+$rollbackConfigValue = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
+    ->getStore(\Magento\Store\Model\Store::DEFAULT_STORE_ID)
+    ->getConfig($rollbackConfigKey);
+
+$disabledPaymentMethods = [];
+if (!empty($rollbackConfigValue)) {
+    $disabledPaymentMethods = explode(',', $rollbackConfigValue);
+}
+
+if (count($disabledPaymentMethods)) {
+    foreach ($disabledPaymentMethods as $keyToRemove) {
+        $configWriter->delete(sprintf('payment/%s/active', $keyToRemove));
+    }
+}
+$configWriter->delete($rollbackConfigKey);
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();

From 3cf122cc0f0882b55a7fa92c465fdc04238c585a Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Thu, 7 Mar 2019 16:13:02 +0200
Subject: [PATCH 0426/1055] MAGETWO-96416: Clicking on a Root Category causes
 all other Root Categories to be expanded to the top-level categories

---
 .../Catalog/Block/Adminhtml/Category/Tree.php | 32 +++++++++++++++++--
 .../Cms/Test/Mftf/Section/TinyMCESection.xml  |  1 +
 ...WYSIWYGWithCatalogCategoryLinkTypeTest.xml |  1 +
 ...oWYSIWYGWithCatalogProductLinkTypeTest.xml |  1 +
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 479e212924f23..83ec501592489 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -71,7 +71,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -80,7 +80,7 @@ protected function _construct()
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     protected function _prepareLayout()
     {
@@ -182,6 +182,8 @@ public function getSuggestedCategoriesJson($namePart)
     }
 
     /**
+     * Get add root button html
+     *
      * @return string
      */
     public function getAddRootButtonHtml()
@@ -190,6 +192,8 @@ public function getAddRootButtonHtml()
     }
 
     /**
+     * Get add sub button html
+     *
      * @return string
      */
     public function getAddSubButtonHtml()
@@ -198,6 +202,8 @@ public function getAddSubButtonHtml()
     }
 
     /**
+     * Get expand button html
+     *
      * @return string
      */
     public function getExpandButtonHtml()
@@ -206,6 +212,8 @@ public function getExpandButtonHtml()
     }
 
     /**
+     * Get collapse button html
+     *
      * @return string
      */
     public function getCollapseButtonHtml()
@@ -214,6 +222,8 @@ public function getCollapseButtonHtml()
     }
 
     /**
+     * Get store switcher
+     *
      * @return string
      */
     public function getStoreSwitcherHtml()
@@ -222,6 +232,8 @@ public function getStoreSwitcherHtml()
     }
 
     /**
+     * Get loader tree url
+     *
      * @param bool|null $expanded
      * @return string
      */
@@ -235,6 +247,8 @@ public function getLoadTreeUrl($expanded = null)
     }
 
     /**
+     * Get nodes url
+     *
      * @return string
      */
     public function getNodesUrl()
@@ -243,6 +257,8 @@ public function getNodesUrl()
     }
 
     /**
+     * Get switcher tree url
+     *
      * @return string
      */
     public function getSwitchTreeUrl()
@@ -254,6 +270,8 @@ public function getSwitchTreeUrl()
     }
 
     /**
+     * Get is was expanded
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -263,6 +281,8 @@ public function getIsWasExpanded()
     }
 
     /**
+     * Get move url
+     *
      * @return string
      */
     public function getMoveUrl()
@@ -271,6 +291,8 @@ public function getMoveUrl()
     }
 
     /**
+     * Get tree
+     *
      * @param mixed|null $parenNodeCategory
      * @return array
      */
@@ -282,6 +304,8 @@ public function getTree($parenNodeCategory = null)
     }
 
     /**
+     * Get tree json
+     *
      * @param mixed|null $parenNodeCategory
      * @return string
      */
@@ -390,6 +414,8 @@ public function buildNodeName($node)
     }
 
     /**
+     * Is category movable
+     *
      * @param Node|array $node
      * @return bool
      */
@@ -403,6 +429,8 @@ protected function _isCategoryMoveable($node)
     }
 
     /**
+     * Is parent selected category
+     *
      * @param Node|array $node
      * @return bool
      */
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index ff6167ffc10e0..4fb008eb422d3 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -109,6 +109,7 @@
         <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
         <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />
         <element name="ButtonToShow" type="multiselect" selector="select[name='parameters[show_buttons][]']"/>
+        <element name="ExpandRootCategory" type="text" selector="img.x-tree-elbow-end-plus"/>
         <!--Compare on Storefront-->
         <element name="ProductName" type="text" selector=".product.name.product-item-name" />
         <element name="CompareBtn" type="button" selector=".action.tocompare"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
index 5b3679bed77e0..89f0439bd65b4 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
@@ -46,6 +46,7 @@
         <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Category Link Block Template" stepKey="selectTemplate" />
         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectCategoryBtn" />
         <waitForLoadingMaskToDisappear stepKey="wait3"/>
+        <click selector="{{WidgetSection.ExpandRootCategory}}" stepKey="expandRootCategory" />
         <click userInput="$$createPreReqCategory.name$$" stepKey="selectPreCreateCategory" />
         <waitForElementNotVisible selector="{{WidgetSection.SelectCategoryTitle}}" stepKey="waitForSlideoutCloses1" />
         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
index 123d25f92b6b7..3b79770badca4 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
@@ -50,6 +50,7 @@
         <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Product Link Block Template" stepKey="selectTemplate" />
         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
         <waitForLoadingMaskToDisappear stepKey="wait4"/>
+        <click selector="{{WidgetSection.ExpandRootCategory}}" stepKey="expandRootCategory" />
         <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
         <waitForLoadingMaskToDisappear stepKey="waitLoadingMask" />
         <click selector="{{WidgetSection.PreCreateProduct('$$createPreReqProduct.name$$')}}" stepKey="selectPreProduct" />

From e80861cbb009a0ca3e7a69e6eaa19a527fe82b09 Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Thu, 7 Mar 2019 16:57:35 +0200
Subject: [PATCH 0427/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 .../Magento/Bundle/Model/Product/Price.php    | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index c36adb7e418a0..ccb68f227cf10 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -11,6 +11,8 @@
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 
 /**
+ * Bundle product type price model
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -180,9 +182,9 @@ protected function getBundleSelectionIds(\Magento\Catalog\Model\Product $product
     /**
      * Get product final price
      *
-     * @param   float                     $qty
-     * @param   \Magento\Catalog\Model\Product $product
-     * @return  float
+     * @param float $qty
+     * @param \Magento\Catalog\Model\Product $product
+     * @return float
      */
     public function getFinalPrice($qty, $product)
     {
@@ -207,9 +209,9 @@ public function getFinalPrice($qty, $product)
      * Returns final price of a child product
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @param float                      $productQty
+     * @param float $productQty
      * @param \Magento\Catalog\Model\Product $childProduct
-     * @param float                      $childProductQty
+     * @param float $childProductQty
      * @return float
      */
     public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)
@@ -220,10 +222,10 @@ public function getChildFinalPrice($product, $productQty, $childProduct, $childP
     /**
      * Retrieve Price considering tier price
      *
-     * @param  \Magento\Catalog\Model\Product $product
-     * @param  string|null                $which
-     * @param  bool|null                  $includeTax
-     * @param  bool                       $takeTierPrice
+     * @param \Magento\Catalog\Model\Product $product
+     * @param string|null $which
+     * @param bool|null $includeTax
+     * @param bool $takeTierPrice
      * @return float|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -402,8 +404,8 @@ public function getOptions($product)
      *
      * @param \Magento\Catalog\Model\Product $bundleProduct
      * @param \Magento\Catalog\Model\Product $selectionProduct
-     * @param float|null                 $selectionQty
-     * @param null|bool                  $multiplyQty      Whether to multiply selection's price by its quantity
+     * @param float|null $selectionQty
+     * @param null|bool $multiplyQty Whether to multiply selection's price by its quantity
      * @return float
      *
      * @see \Magento\Bundle\Model\Product\Price::getSelectionFinalTotalPrice()
@@ -418,7 +420,7 @@ public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQ
      *
      * @param \Magento\Catalog\Model\Product $bundleProduct
      * @param \Magento\Catalog\Model\Product $selectionProduct
-     * @param float                    $qty
+     * @param float $qty
      * @return float
      */
     public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qty = null)
@@ -430,12 +432,12 @@ public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qt
      * Calculate final price of selection
      * with take into account tier price
      *
-     * @param  \Magento\Catalog\Model\Product $bundleProduct
-     * @param  \Magento\Catalog\Model\Product $selectionProduct
-     * @param  float                    $bundleQty
-     * @param  float                    $selectionQty
-     * @param  bool                       $multiplyQty
-     * @param  bool                       $takeTierPrice
+     * @param \Magento\Catalog\Model\Product $bundleProduct
+     * @param \Magento\Catalog\Model\Product $selectionProduct
+     * @param float $bundleQty
+     * @param float $selectionQty
+     * @param bool $multiplyQty
+     * @param bool $takeTierPrice
      * @return float
      */
     public function getSelectionFinalTotalPrice(
@@ -489,10 +491,10 @@ public function getSelectionFinalTotalPrice(
     /**
      * Apply tier price for bundle
      *
-     * @param   \Magento\Catalog\Model\Product $product
-     * @param   float                    $qty
-     * @param   float                    $finalPrice
-     * @return  float
+     * @param \Magento\Catalog\Model\Product $product
+     * @param float $qty
+     * @param float $finalPrice
+     * @return float
      */
     protected function _applyTierPrice($product, $qty, $finalPrice)
     {
@@ -513,9 +515,9 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
     /**
      * Get product tier price by qty
      *
-     * @param   float                    $qty
-     * @param   \Magento\Catalog\Model\Product $product
-     * @return  float|array
+     * @param float $qty
+     * @param \Magento\Catalog\Model\Product $product
+     * @return float|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -609,11 +611,11 @@ public function getTierPrice($qty, $product)
     /**
      * Calculate and apply special price
      *
-     * @param float  $finalPrice
-     * @param float  $specialPrice
+     * @param float $finalPrice
+     * @param float $specialPrice
      * @param string $specialPriceFrom
      * @param string $specialPriceTo
-     * @param mixed  $store
+     * @param mixed $store
      * @return float
      */
     public function calculateSpecialPrice(
@@ -638,7 +640,7 @@ public function calculateSpecialPrice(
      *
      * @param /Magento/Catalog/Model/Product $bundleProduct
      * @param float|string $price
-     * @param int          $bundleQty
+     * @param int $bundleQty
      * @return float
      */
     public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)

From 9435b9388083c3288f4200e42c794ef1c5aa720b Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Thu, 7 Mar 2019 17:24:50 +0200
Subject: [PATCH 0428/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

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

diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index ccb68f227cf10..c1a995266e94e 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -429,8 +429,7 @@ public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qt
     }
 
     /**
-     * Calculate final price of selection
-     * with take into account tier price
+     * Calculate final price of selection with take into account tier price
      *
      * @param \Magento\Catalog\Model\Product $bundleProduct
      * @param \Magento\Catalog\Model\Product $selectionProduct

From 40f547bd13f4c6e93c934f1bb51c1b208aa8c608 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Thu, 7 Mar 2019 16:34:22 +0100
Subject: [PATCH 0429/1055] Test coverage optimisation

---
 .../SetOfflineShippingMethodsOnCartTest.php   | 88 +++++++------------
 1 file changed, 33 insertions(+), 55 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
index e65ac0275206b..8a6476329177d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
@@ -8,7 +8,7 @@
 namespace Magento\GraphQl\OfflineShipping;
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -19,6 +19,11 @@
  */
 class SetOfflineShippingOnCartTest extends GraphQlAbstract
 {
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
     /**
      * @var CustomerTokenServiceInterface
      */
@@ -29,11 +34,6 @@ class SetOfflineShippingOnCartTest extends GraphQlAbstract
      */
     private $quoteResource;
 
-    /**
-     * @var Quote
-     */
-    private $quote;
-
     /**
      * @var QuoteIdToMaskedQuoteIdInterface
      */
@@ -45,67 +45,44 @@ class SetOfflineShippingOnCartTest extends GraphQlAbstract
     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->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     */
-    public function testSetFlatrateOnCart()
-    {
-        $this->setShippingMethodAndCheckResponse(
-            'flatrate',
-            'flatrate',
-            '10',
-            'Flat Rate - Fixed'
-        );
-    }
-
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
      * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @dataProvider offlineShippingMethodDataProvider()
+     * @param string $carrier
+     * @param string $method
+     * @param float $amount
+     * @param string $label
      */
-    public function testSetTableRatesOnCart()
+    public function testSetOfflineShippingMethod(string $carrier, string $method, float $amount, string $label)
     {
         $this->setShippingMethodAndCheckResponse(
-            'tablerate',
-            'bestway',
-            '10',
-            'Best Way - Table Rate'
+            $carrier,
+            $method,
+            $amount,
+            $label
         );
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     */
-    public function testSetFreeShippingOnCart()
-    {
-        $this->setShippingMethodAndCheckResponse(
-            'freeshipping',
-            'freeshipping',
-            '0',
-            'Free Shipping - Free'
-        );
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * Data provider for base offline shipping methods
+     *
+     * @return array
      */
-    public function testSetUpsOnCart()
+    public function offlineShippingMethodDataProvider()
     {
-        $this->setShippingMethodAndCheckResponse(
-            'ups',
-            'GND',
-            '15.61',
-            'United Parcel Service - Ground'
-        );
+        return [
+            ['flatrate', 'flatrate', 10, 'Flat Rate - Fixed'],
+            ['tablerate', 'bestway', 10, 'Best Way - Table Rate'],
+            ['freeshipping', 'freeshipping', 0, 'Free Shipping - Free']
+        ];
     }
 
     /**
@@ -121,17 +98,18 @@ public function testSetUpsOnCart()
     private function setShippingMethodAndCheckResponse(
         string $shippingCarrierCode,
         string $shippingMethodCode,
-        string $shippingAmount,
+        float $shippingAmount,
         string $shippingLabel
     ) {
+        $quote = $this->quoteFactory->create();
         $this->quoteResource->load(
-            $this->quote,
+            $quote,
             'test_order_1',
             'reserved_order_id'
         );
-        $shippingAddress = $this->quote->getShippingAddress();
+        $shippingAddress = $quote->getShippingAddress();
         $shippingAddressId = $shippingAddress->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
 
         $query = $this->getQuery(
             $maskedQuoteId,

From 3ab52fff4ea2d3d027a51487c89a1ba1fb6a45ef Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Thu, 7 Mar 2019 11:24:08 -0600
Subject: [PATCH 0430/1055] MC-4455: Convert CreateDuplicateUrlProductEntity to
 MFTF

- Refactor to decompose an action group that isnt reusable
---
 .../ActionGroup/AdminProductActionGroup.xml   | 69 +++++++++++--------
 .../Test/AdminCreateDuplicateProductTest.xml  | 30 ++++++--
 2 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 709f74ede09aa..4b4633b374e60 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -20,7 +20,7 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeNewProductTitle"/>
     </actionGroup>
 
-    <!--Fill main fields in create product form-->
+    <!-- Fill main fields in create product form using a product entity -->
     <actionGroup name="fillMainProductForm">
         <arguments>
             <argument name="product" defaultValue="_defaultProduct"/>
@@ -34,6 +34,25 @@
         <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
     </actionGroup>
 
+    <!-- Fill main fields in create product form using strings for flexibility -->
+    <actionGroup name="FillMainProductFormByString">
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="productSku" type="string"/>
+            <argument name="productPrice" type="string"/>
+            <argument name="productQuantity" type="string"/>
+            <argument name="productStatus" type="string"/>
+            <argument name="productWeight" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{productName}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{productSku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{productPrice}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{productQuantity}}" stepKey="fillProductQty"/>
+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{productStatus}}" stepKey="selectStockStatus"/>
+        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{productWeight}}" stepKey="fillProductWeight"/>
+    </actionGroup>
+
     <!--Fill main fields in create product form with no weight, useful for virtual and downloadable products -->
     <actionGroup name="fillMainProductFormNoWeight">
         <arguments>
@@ -77,6 +96,11 @@
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
 
+    <!-- Save product but do not expect a success message -->
+    <actionGroup name="SaveProductFormNoSuccessCheck" extends="saveProductForm">
+        <remove keyForRemoval="seeSaveConfirmation"/>
+    </actionGroup>
+
     <!--Upload image for product-->
     <actionGroup name="addProductImage">
         <arguments>
@@ -387,6 +411,22 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
         <fillField userInput="{{product.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
     </actionGroup>
+
+    <actionGroup name="SetProductUrlKeyByString">
+        <arguments>
+            <argument name="urlKey" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+    </actionGroup>
+
+    <actionGroup name="SetCategoryByName">
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{categoryName}}]" stepKey="searchAndSelectCategory"/>
+    </actionGroup>
+
     <actionGroup name="expandAdminProductSection">
         <arguments>
             <argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
@@ -430,31 +470,4 @@
         <click selector="{{AdminAddUpSellProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
     </actionGroup>
-    <actionGroup name="adminFillAndSaveProductForm">
-        <arguments>
-            <argument name="product" defaultValue="defaultSimpleProduct"/>
-            <argument name="productName" type="string"/>
-            <argument name="productUrlKey" type="string"/>
-            <argument name="categoryName" type="string"/>
-        </arguments>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductIndexPage"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-        <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickOnAddNewProduct"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{productName}}" stepKey="fillProductName"/>
-        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
-        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{product.price}}" stepKey="fillProductPrice"/>
-        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{product.quantity}}" stepKey="fillProductQty"/>
-        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{product.status}}" stepKey="selectStockStatus"/>
-        <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="This item has weight" stepKey="selectWeight"/>
-        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{product.weight}}" stepKey="fillProductWeight"/>
-        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{categoryName}}]" stepKey="searchAndSelectCategory"/>
-        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="scrollToSectionHeader"/>
-        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
-        <fillField userInput="{{productUrlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-        <scrollToTopOfPage stepKey="scrollTopPageProduct"/>
-        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveProductButton" />
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-        <waitForPageLoad stepKey="waitForProductToSave"/>
-    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
index 68dfc44aa886a..575bb56912b25 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDuplicateProductTest.xml
@@ -18,28 +18,44 @@
         </annotations>
 
         <before>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
             <createData entity="SubCategory" stepKey="category"/>
             <createData entity="Two_nested_categories" stepKey="subCategory">
                 <requiredEntity createDataKey="category"/>
             </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
         </before>
+
         <after>
             <deleteData createDataKey="subCategory" stepKey="deleteSubCategory"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
-        <!-- Create Product using above created Subcategory Name and SubCategory UrlKey and Save the Product -->
-        <actionGroup ref="adminFillAndSaveProductForm" stepKey="createDuplicateProduct">
-            <argument name="product" value="defaultSimpleProduct"/>
+        <!-- Go to new simple product page -->
+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="goToCreateProductPage"/>
+
+        <!-- Fill the main fields in the form -->
+        <actionGroup ref="FillMainProductFormByString" stepKey="fillMainProductForm">
             <argument name="productName" value="$$subCategory.name$$"/>
-            <argument name="productUrlKey" value="$$subCategory.custom_attributes[url_key]$$"/>
+            <argument name="productSku" value="{{defaultSimpleProduct.sku}}"/>
+            <argument name="productPrice" value="{{defaultSimpleProduct.price}}"/>
+            <argument name="productQuantity" value="{{defaultSimpleProduct.quantity}}"/>
+            <argument name="productStatus" value="{{defaultSimpleProduct.status}}"/>
+            <argument name="productWeight" value="{{defaultSimpleProduct.weight}}"/>
+        </actionGroup>
+
+        <!-- Select the category that we created in the before block -->
+        <actionGroup ref="SetCategoryByName" stepKey="setCategory">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
 
-        <!--Assert Error Message -->
+        <!-- Set the url key to match the subcategory created in the before block -->
+        <actionGroup ref="SetProductUrlKeyByString" stepKey="fillUrlKey">
+            <argument name="urlKey" value="$$subCategory.custom_attributes[url_key]$$"/>
+        </actionGroup>
+
+        <!-- Save the product and expect to see an error message -->
+        <actionGroup ref="SaveProductFormNoSuccessCheck" stepKey="tryToSaveProduct"/>
         <see selector="{{AdminProductFormSection.successMessage}}"  userInput="The value specified in the URL Key field would generate a URL that already exists." stepKey="seeErrorMessage"/>
     </test>
 </tests>

From b4b44f30ff12d8134af27b16b36524f00d8c4cf0 Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Thu, 7 Mar 2019 12:21:52 -0600
Subject: [PATCH 0431/1055] MC-4343: Convert NavigateMenuTest to MFTF

---
 .../Test/Mftf/Test/AdminNavigateMenuTest.xml  | 1434 +++++++++++++++++
 1 file changed, 1434 insertions(+)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml
new file mode 100644
index 0000000000000..c4e8553e54535
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml
@@ -0,0 +1,1434 @@
+<?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="NavigateMenuTest1">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 1"/>
+            <description value="Admin should be able to navigate to System > Notifications"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14125"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/notification/" stepKey="goToNotificationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Notifications" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest2">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 2"/>
+            <description value="Admin should be able to navigate to Dashboard"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14116"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/dashboard/" stepKey="goToDashboardPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Dashboard" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest3">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 3"/>
+            <description value="Admin should be able to navigate to Content > Schedule"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14117"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/system_design/" stepKey="goToSchedulePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Store Design Schedule" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest4">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 4"/>
+            <description value="Admin should be able to navigate to Stores > All Stores"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14118"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/system_store/" stepKey="goToAllStoresPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Stores" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest5">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 5"/>
+            <description value="Admin should be able to navigate to Stores > Configuration"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14119"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/system_config/" stepKey="goToConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Configuration" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest6">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 6"/>
+            <description value="Admin should be able to navigate to System > Cache Management"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14120"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/cache/" stepKey="goToCacheManagementPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Cache Management" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest9">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 9"/>
+            <description value="Admin should be able to navigate to Catalog > Products"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14130"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/catalog/product/" stepKey="goToCatalogProductsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Products" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest10">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 10"/>
+            <description value="Admin should be able to navigate to Catalog > Categories"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14131"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/catalog/category/" stepKey="goToCategoriesPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Default Category (ID: 2)" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest11">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 11"/>
+            <description value="Admin should be able to navigate to Stores > Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14132"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/catalog/product_attribute/" stepKey="goToProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Product Attributes" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest12">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 12"/>
+            <description value="Admin should be able to navigate to Stores > Attribute Set"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14133"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/catalog/product_set/" stepKey="goToAttributeSetPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Attribute Sets" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest14">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 14"/>
+            <description value="Admin should be able to navigate to Marketing > Catalog Price Rule"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14134"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/catalog_rule/promo_catalog" stepKey="goToCatalogPriceRulePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Catalog Price Rule" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest15">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 15"/>
+            <description value="Admin should be able to navigate to Marketing > Search Terms"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14135"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/search/term/index/" stepKey="goToSearchTermsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Search Terms" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest16">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 16"/>
+            <description value="Admin should be able to navigate to Reports > Search Terms"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14136"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/search/term/report/" stepKey="goToSearchTermsReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Search Terms Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest17">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 17"/>
+            <description value="Admin should be able to navigate to Stores > Terms and Conditions"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14148"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/checkout/agreement/" stepKey="goToTermsAndConditionsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Terms and Conditions" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest18">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 18"/>
+            <description value="Admin should be able to navigate to Content > Pages"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14128"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/cms_page/" stepKey="goToContentPagesPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Pages" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest19">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 19"/>
+            <description value="Admin should be able to navigate to Content > Blocks"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14129"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/cms/block/" stepKey="goToContentBlocksPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Blocks" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest20">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 20"/>
+            <description value="Admin should be able to navigate to Stores > Currency Rates"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14150"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/system_currency/" stepKey="goToCurrencyRatesPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Currency Rates" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest21">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 21"/>
+            <description value="Admin should be able to navigate to Stores > Currency Symbols"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14151"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/system_currencysymbol/" stepKey="goToCurrencySymbolsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Currency Symbols" stepKey="assertPageTitle"/>
+    </test>
+
+    <test name="NavigateMenuTestAdvancedReporting">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test advanced reporting"/>
+            <description value="Admin should be able to navigate through advanced reporting admin menu to BI reports page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14152"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="admin/analytics/reports/show/" stepKey="goToAdvancedReportingPage"/>
+        <seeInCurrentUrl url="https://advancedreporting.rjmetrics.com/report" stepKey="seeInCurrentUrlAdvancedreporting"/>
+    </test>
+
+    <test name="NavigateMenuTest22">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 22"/>
+            <description value="Admin should be able to navigate to Customers > All Customers"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14113"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/customer/index/" stepKey="goToAllCustomerPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Customers" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest23">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 23"/>
+            <description value="Admin should be able to navigate to Customers > Now Online"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14114"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/customer/online/" stepKey="goToNowOnlinePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Customers Now Online" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest24">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 24"/>
+            <description value="Admin should be able to navigate to Customers > Customer Groups"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14115"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/customer/group/" stepKey="goToCustomerGroupsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Customer Groups" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest29">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 29"/>
+            <description value="Admin should be able to navigate to Marketing > Email Templates"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14173"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/email_template/" stepKey="goToPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Email Templates" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest35">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 35"/>
+            <description value="Admin should be able to navigate to System > Import "/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14156"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/import/" stepKey="goToImportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Import" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest36">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 36"/>
+            <description value="Admin should be able to navigate to System > Export"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14157"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/export/" stepKey="goToExportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Export" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest37">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 37"/>
+            <description value="Admin should be able to navigate to System > Index Management"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14127"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/indexer/indexer/list/" stepKey="goToIndexManagementPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Index Management" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest38">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 38"/>
+            <description value="Admin should be able to navigate to System > Integrations"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14149"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/integration/" stepKey="goToIntegrationsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Integrations" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest46">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 46"/>
+            <description value="Admin should be able to navigate to Marketing > Newsletter Template"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14188"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/newsletter/template/" stepKey="goToNewsletterTemplatePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Newsletter Templates" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest47">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 47"/>
+            <description value="Admin should be able to navigate to Marketing > Newsletter Queue"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14189"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/newsletter/queue/" stepKey="goToNewsletterQueuePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Newsletter Queue" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest48">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 48"/>
+            <description value="Admin should be able to navigate to Marketing > Newsletter Subscribers"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14190"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/newsletter/subscriber/" stepKey="goToNewsletterSubscribersPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Newsletter Subscribers" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest49">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 49"/>
+            <description value="Admin should be able to navigate to Reports > Newsletter Problem Reports"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14191"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/newsletter/problem/" stepKey="goToNewsletterProblemsReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Newsletter Problems Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest50">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 50"/>
+            <description value="Admin should be able to navigate to Reports > PayPal Settlement"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14193"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/paypal/paypal_reports/" stepKey="goToPayPalSettlementReportsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="PayPal Settlement Reports" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest51">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 51"/>
+            <description value="Admin should be able to navigate to Sales > Billing Agreements"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14194"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/paypal/billing_agreement/" stepKey="goToBillingAgreementsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Billing Agreements" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest52">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 52"/>
+            <description value="Admin should be able to navigate to System > Locked Users"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14121"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/locks/" stepKey="goToLockedUsersPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Locked Users" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest53">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 53"/>
+            <description value="Admin should be able to navigate to System > Manage Encryption Key"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14122"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/crypt_key/" stepKey="goToManageEncryptionKeyPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Encryption Key" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest55">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 55"/>
+            <description value="Admin should be able to navigate to Reports > Products in Cart"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14158"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_shopcart/product/" stepKey="goToReportShopcartProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Products in Carts" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest56">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 56"/>
+            <description value="Admin should be able to navigate to Reports > Abandoned Carts"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14159"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_shopcart/abandoned/" stepKey="goToAbandonedCartsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Abandoned Carts" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest57">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 57"/>
+            <description value="Admin should be able to navigate to Reports > Orders"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14160"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_sales/sales/" stepKey="goToOrdersReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Orders Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest58">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 58"/>
+            <description value="Admin should be able to navigate to Reports > Tax"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14161"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_sales/tax/" stepKey="goToTaxReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Tax Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest59">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 59"/>
+            <description value="Admin should be able to navigate to Reports > Invoiced"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14162"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_sales/invoiced/" stepKey="goToInvoiceReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Invoice Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest60">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 60"/>
+            <description value="Admin should be able to navigate to Reports > Coupons"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14163"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_sales/coupons/" stepKey="goToCouponsReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Coupons Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest61">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 61"/>
+            <description value="Admin should be able to navigate to Reports > Order Total"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14164"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_customer/totals/" stepKey="goToOrderTotalReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Order Total Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest62">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 62"/>
+            <description value="Admin should be able to navigate to Reports > Order Count"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14165"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_customer/orders/" stepKey="goToOrderCountReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Order Count Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest63">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 63"/>
+            <description value="Admin should be able to navigate to Reports > New"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14166"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_customer/accounts/" stepKey="goToNewAccountsReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="New Accounts Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest64">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 64"/>
+            <description value="Admin should be able to navigate to Reports > Views"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14167"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_product/viewed/" stepKey="goToProductViewsReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Product Views Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest65">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 65"/>
+            <description value="Admin should be able to navigate to Reports > Bestsellers"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14168"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_sales/bestsellers/" stepKey="goToBestsellersReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Bestsellers Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest66">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 66"/>
+            <description value="Admin should be able to navigate to Reports > Low Stock"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14169"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_product/lowstock/" stepKey="goToLowStockReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Low Stock Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest67">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 67"/>
+            <description value="Admin should be able to navigate to Reports > Ordered"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14170"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_product/sold/" stepKey="goToOrderedProductsReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Ordered Products Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest68">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 68"/>
+            <description value="Admin should be able to navigate to Reports > Downloads"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14171"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_product/downloads/" stepKey="goToDownloadsReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Downloads Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest69">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 69"/>
+            <description value="Admin should be able to navigate to Reports > Refresh Statistics"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14172"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_statistics/" stepKey="goToRefreshStatisticsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Refresh Statistics" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest70">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 70"/>
+            <description value="Admin should be able to navigate to Marketing > Reviews"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14196"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/review/product/index/" stepKey="goToReviewsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Reviews" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest71">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 71"/>
+            <description value="Admin should be able to navigate to Reports > By Customers"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14197"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_review/customer/" stepKey="goToCustomerReviewsReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Customer Reviews Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest72">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 72"/>
+            <description value="Admin should be able to navigate to Reports > By Products"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14198"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/reports/report_review/product/" stepKey="goToProductReviewsReportPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Product Reviews Report" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest73">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 73"/>
+            <description value="Admin should be able to navigate to Stores > Rating"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14199"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/review/rating/" stepKey="goToStoresRatingPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Ratings" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest77">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 77"/>
+            <description value="Admin should be able to navigate to Sales > Orders"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14137"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/sales/order/" stepKey="goToSalesOrdersPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Orders" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest78">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 78"/>
+            <description value="Admin should be able to navigate to Sales > Invoices"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14138"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/sales/invoice/" stepKey="goToSalesInvoicesPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Invoices" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest79">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 79"/>
+            <description value="Admin should be able to navigate to Sales > Shipments"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14139"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/sales/shipment/" stepKey="goToSalesShipmentsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Shipments" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest80">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 80"/>
+            <description value="Admin should be able to navigate to Sales > Credit Memos"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14140"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/sales/creditmemo/" stepKey="goToSalesCreditMemosPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Credit Memos" stepKey="assertPageTitle"/>
+    </test>
+
+    <test name="NavigateMenuTest81">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 81"/>
+            <description value="Admin should be able to navigate to Sales > Transactions"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14141"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/sales/transactions/" stepKey="goToSalesTransactionsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Transactions" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest82">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 82"/>
+            <description value="Admin should be able to navigate to Stores > Order Status"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14142"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/sales/order_status/" stepKey="goToStoresOrderStatusPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Order Status" stepKey="assertPageTitle"/>
+    </test>
+
+    <test name="NavigateMenuTest83">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 83"/>
+            <description value="Admin should be able to navigate to Marketing > Cart Price Rules"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14143"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/sales_rule/promo_quote/" stepKey="goToCartPriceRulesPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Cart Price Rules" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest85">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 85"/>
+            <description value="Admin should be able to navigate to Marketing > Site Map"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14204"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/sitemap/" stepKey="goToSiteMapPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Site Map" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest87">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 87"/>
+            <description value="Admin should be able to navigate to Stores > Tax Rules"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14175"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/tax/rule/" stepKey="goToStoresTaxRulesPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Tax Rules" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest88">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 88"/>
+            <description value="Admin should be able to navigate to Stores > Tax Zones and Rates"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14176"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/tax/rate/" stepKey="goToTaxZonesAndRatesPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Tax Zones and Rates" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest89">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 89"/>
+            <description value="Admin should be able to navigate to System > Import/Export Tax Rates"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14177"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/tax/rate/importExport/" stepKey="goToImportExportTaxRatesPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Import and Export Tax Rates" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest90">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 90"/>
+            <description value="Admin should be able to navigate to Content > Themes"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14112"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/system_design_theme/" stepKey="goToSystemDesignThemePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Themes" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest91">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 91"/>
+            <description value="Admin should be able to navigate to Marketing > URL Rewrites"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14202"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/url_rewrite/index/" stepKey="goToMarketingUrlRewritePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="URL Rewrites" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest92">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 92"/>
+            <description value="Admin should be able to navigate to System > All Users"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14123"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/user/" stepKey="goToSystemUsersPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Users" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest93">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 93"/>
+            <description value="Admin should be able to navigate to System > User Roles"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14124"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/user_role/" stepKey="goToSystemUserRolesPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Roles" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest94">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 94"/>
+            <description value="Admin should be able to navigate to System > Custom Variables"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14126"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/system_variable/" stepKey="goToSystemVariablePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Custom Variables" stepKey="assertPageTitle"/>
+    </test>
+    <test name="NavigateMenuTest96">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 96"/>
+            <description value="Admin should be able to navigate to Content > Widgets"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14147"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="/admin/admin/widget_instance/" stepKey="goToContentWidgetsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="Widgets" stepKey="assertPageTitle"/>
+    </test>
+</tests>

From 11c681ee7bb78d814bc4ec10ba649dc7d7320f22 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Thu, 7 Mar 2019 13:17:23 -0600
Subject: [PATCH 0432/1055] MC-15292: Disabled attribute for the table does not
 work with dependent tables

---
 .../without_setup_version/module.xml          | 10 +++++
 .../db_schema.xml                             | 11 ++++++
 .../without_setup_version/module.xml          | 10 +++++
 .../Setup/DeclarativeInstallerTest.php        | 39 +++++++++++++++++++
 .../Schema/Declaration/SchemaBuilder.php      |  7 ++++
 5 files changed, 77 insertions(+)
 create mode 100644 dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml
 create mode 100644 dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml
 create mode 100644 dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml

diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml
new file mode 100644
index 0000000000000..ed831eb6e9354
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/revisions/without_setup_version/module.xml
@@ -0,0 +1,10 @@
+<?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:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule1"/>
+</config>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml
new file mode 100644
index 0000000000000..c22c41b7a5c03
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/drop_table_with_external_dependency/db_schema.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="reference_table" disabled="true"/>
+</schema>
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml
new file mode 100644
index 0000000000000..27e21dc3fe898
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule3/revisions/without_setup_version/module.xml
@@ -0,0 +1,10 @@
+<?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:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule3"/>
+</config>
diff --git a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
index 6097348d4fabc..e8698965de007 100644
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php
@@ -249,6 +249,45 @@ public function testInstallationWithDroppingTables()
         self::assertEquals($this->getData(), $shardData);
     }
 
+    /**
+     * @moduleName Magento_TestSetupDeclarationModule1
+     * @moduleName Magento_TestSetupDeclarationModule3
+     */
+    public function testInstallationWithDroppingTablesFromSecondaryModule()
+    {
+        $modules = [
+            'Magento_TestSetupDeclarationModule1',
+            'Magento_TestSetupDeclarationModule3',
+        ];
+
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule3',
+            'drop_table_with_external_dependency',
+            'db_schema.xml',
+            'etc'
+        );
+
+        foreach ($modules as $moduleName) {
+            $this->moduleManager->updateRevision(
+                $moduleName,
+                'without_setup_version',
+                'module.xml',
+                'etc'
+            );
+        }
+
+        try {
+            $this->cliCommand->install($modules);
+        } catch (\Exception $e) {
+            $installException = $e->getPrevious();
+            self::assertSame(1, $installException->getCode());
+            self::assertContains(
+                'The reference table named "reference_table" is disabled',
+                $installException->getMessage()
+            );
+        }
+    }
+
     /**
      * @moduleName Magento_TestSetupDeclarationModule1
      * @dataProviderFromFile Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.php
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
index 34a99f26a4ef1..4c65d8a70bed5 100644
--- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Declaration/SchemaBuilder.php
@@ -350,6 +350,13 @@ private function processConstraints(array $tableData, string $resource, Schema $
             if ($constraintData['type'] === 'foreign') {
                 $constraintData['column'] = $this->getColumnByName($constraintData['column'], $table);
                 $referenceTableData = $this->tablesData[$constraintData['referenceTable']];
+
+                if ($this->isDisabled($referenceTableData)) {
+                    throw new \LogicException(
+                        sprintf('The reference table named "%s" is disabled', $referenceTableData['name'])
+                    );
+                }
+
                 //If we are referenced to the same table we need to specify it
                 //Get table name from resource connection regarding prefix settings
                 $refTableName = $this->resourceConnection->getTableName($referenceTableData['name']);

From 7c744a1c9963cded9d58f6e15b70427a209b1f84 Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Thu, 7 Mar 2019 13:34:35 -0600
Subject: [PATCH 0433/1055] MC-4343: Convert NavigateMenuTest to MFTF

---
 .../Test/Mftf/Test/AdminNavigateMenuTest.xml  | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml
index c4e8553e54535..37cec8e36bacb 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml
@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14125"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -37,6 +38,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14116"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -57,6 +59,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14117"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -77,6 +80,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14118"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -97,6 +101,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14119"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -117,6 +122,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14120"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -137,6 +143,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14130"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -157,6 +164,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14131"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -177,6 +185,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14132"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -197,6 +206,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14133"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -217,6 +227,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14134"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -237,6 +248,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14135"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -257,6 +269,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14136"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -277,6 +290,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14148"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -297,6 +311,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14128"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -317,6 +332,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14129"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -337,6 +353,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14150"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -357,6 +374,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14151"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -378,6 +396,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14152"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -398,6 +417,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14113"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -418,6 +438,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14114"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -438,6 +459,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14115"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -458,6 +480,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14173"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -478,6 +501,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14156"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -498,6 +522,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14157"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -518,6 +543,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14127"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -538,6 +564,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14149"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -558,6 +585,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14188"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -578,6 +606,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14189"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -598,6 +627,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14190"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -618,6 +648,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14191"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -638,6 +669,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14193"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -658,6 +690,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14194"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -678,6 +711,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14121"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -698,6 +732,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14122"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -718,6 +753,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14158"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -738,6 +774,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14159"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -758,6 +795,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14160"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -778,6 +816,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14161"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -798,6 +837,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14162"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -818,6 +858,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14163"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -838,6 +879,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14164"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -858,6 +900,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14165"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -878,6 +921,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14166"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -898,6 +942,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14167"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -918,6 +963,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14168"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -938,6 +984,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14169"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -958,6 +1005,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14170"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -978,6 +1026,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14171"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -998,6 +1047,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14172"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1018,6 +1068,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14196"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1038,6 +1089,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14197"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1058,6 +1110,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14198"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1078,6 +1131,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14199"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1098,6 +1152,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14137"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1118,6 +1173,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14138"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1138,6 +1194,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14139"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1158,6 +1215,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14140"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1179,6 +1237,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14141"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1199,6 +1258,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14142"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1220,6 +1280,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14143"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1240,6 +1301,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14204"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1260,6 +1322,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14175"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1280,6 +1343,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14176"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1300,6 +1364,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14177"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1320,6 +1385,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14112"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1340,6 +1406,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14202"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1360,6 +1427,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14123"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1380,6 +1448,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14124"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1400,6 +1469,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14126"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
@@ -1420,6 +1490,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14147"/>
             <group value="menu"/>
+            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>

From 068e76a2dc964efe3019cdd699774a0154ad3215 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Thu, 7 Mar 2019 13:53:58 -0600
Subject: [PATCH 0434/1055] MC-15293: Bundle product with special price not
 getting added to cart - reverted change of ENGCOM-3450 with commits:
 8f463db4808afc9f8f4908a4dee65f3abe981eba
 63c9ea46673e58f2712da5a768d0840ece184152
 77492c1c08695753b3a274b02552fab7be9c64c0
 d0ba9973dffac27560364906b22786d70410d69d
 0a12f2facafd2eaea06a208173cf1e564e107a19

---
 .../Model/Product/Attribute/Backend/Tierprice.php   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index e346c912dccaa..db967052cb7a5 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -165,19 +165,6 @@ protected function modifyPriceData($object, $data)
         /** @var \Magento\Catalog\Model\Product $object */
         $data = parent::modifyPriceData($object, $data);
         $price = $object->getPrice();
-
-        $specialPrice = $object->getSpecialPrice();
-        $specialPriceFromDate = $object->getSpecialFromDate();
-        $specialPriceToDate = $object->getSpecialToDate();
-        $today = time();
-
-        if ($specialPrice && ($object->getPrice() > $object->getFinalPrice())) {
-            if ($today >= strtotime($specialPriceFromDate) && $today <= strtotime($specialPriceToDate) ||
-                $today >= strtotime($specialPriceFromDate) && $specialPriceToDate === null) {
-                $price = $specialPrice;
-            }
-        }
-
         foreach ($data as $key => $tierPrice) {
             $percentageValue = $this->getPercentage($tierPrice);
             if ($percentageValue) {

From dc91429398946e3977039ce7ce732797dfd3e88b Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Thu, 7 Mar 2019 14:57:21 -0600
Subject: [PATCH 0435/1055] MC-15305: Unable to do a product search via graphql
 with elastic search

---
 .../FieldMapper/Product/FieldProvider/DynamicField.php        | 4 +++-
 app/code/Magento/Elasticsearch6/etc/di.xml                    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
index c7e2a4beabb5c..e30ecce247a2c 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
@@ -123,10 +123,12 @@ public function getFields(array $context = []): array
 
         $groups = $this->groupRepository->getList($searchCriteria)->getItems();
         $priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
+        $ctx = isset($context['websiteId']) ? ['websiteId' => $context['websiteId']] : [];
         foreach ($groups as $group) {
+            $ctx['customerGroupId'] = $group->getId();
             $groupPriceKey = $this->fieldNameResolver->getFieldName(
                 $priceAttribute,
-                ['customerGroupId' => $group->getId(), 'websiteId' => $context['websiteId']]
+                $ctx
             );
             $allAttributes[$groupPriceKey] = [
                 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),
diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 25eff42fd3442..df71f3c3158d3 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -158,7 +158,7 @@
     <type name="Magento\Search\Model\Search\PageSizeProvider">
         <arguments>
             <argument name="pageSizeBySearchEngine" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="number">2147483647</item>
+                <item name="elasticsearch6" xsi:type="number">10000</item>
             </argument>
         </arguments>
     </type>

From 2d1c89d755b6825d4dc1c0625a7b00d4b0496bb1 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Thu, 7 Mar 2019 15:41:37 -0600
Subject: [PATCH 0436/1055] MC-4868: Convert UpdateStoreGroupEntityTest to MFTF

---
 .../AdminCreateNewStoreGroupActionGroup.xml   | 47 ++++++++++++
 .../Section/AdminStoreGroupActionsSection.xml |  1 +
 .../Mftf/Section/AdminStoresGridSection.xml   |  4 +-
 ...pAcceptAlertAndVerifyStoreViewFormTest.xml | 76 +++++++++++++++++++
 ...teStoreGroupAndVerifyStoreViewFormTest.xml | 66 ++++++++++++++++
 5 files changed, 192 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
index 7f1a63d3db6f2..e9fe38bee790a 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
@@ -42,4 +42,51 @@
         <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage"/>
     </actionGroup>
+    <actionGroup name="AssertStoreGroupInGrid">
+        <arguments>
+            <argument name="storeGroupName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
+    </actionGroup>
+    <actionGroup name="AssertStoreGroupForm">
+        <arguments>
+            <argument name="website" type="string"/>
+            <argument name="storeGroupName" type="string"/>
+            <argument name="storeGroupCode" type="string"/>
+            <argument name="rootCategory" type="string"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitTillAdminSystemStoreGroupPage"/>
+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabStoreGroupIdFromCurrentUrl"/>
+        <seeInCurrentUrl url="system_store/editGroup/group_id/{$grabStoreGroupIdFromCurrentUrl}" stepKey="seeStoreGroupId"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website}}" stepKey="seeAssertWebsite"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupName"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="seeAssertStoreGroupCode"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="{{rootCategory}}" stepKey="seeAssertRootCategory"/>
+    </actionGroup>
+    <actionGroup name="CreateCustomStoreGroupAcceptWarningMessage">
+        <arguments>
+            <argument name="website" type="string"/>
+            <argument name="store" type="string"/>
+            <argument name="category" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickFirstRow"/>
+        <selectOption userInput="{{website}}" selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" stepKey="selectMainWebsite"/>
+        <fillField userInput="{{store}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
+        <fillField userInput="{{store}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
+        <selectOption userInput="{{category}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreCategory"/>
+        <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveButton" />
+        <waitForPageLoad stepKey="waitForWarningMessageToAppear"/>
+        <click selector="{{AdminStoreGroupActionsSection.okButton}}" stepKey="seeAssertAlertWarningMessage"/>
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGrpTextFieldToBeVisible"/>
+        <see userInput="You saved the store." stepKey="seeAssertSaveSuccessMessage"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
index f79ea080ed1ca..9ad0f40cc4d01 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
@@ -8,5 +8,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminStoreGroupActionsSection">
         <element name="saveButton" type="button" selector="#save" timeout="60" />
+        <element name="okButton" type="button" selector="//footer[@class='modal-footer']//button[@class='action-primary action-accept']/span" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index 592af42f2de30..0b6effc789722 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -20,8 +20,8 @@
         <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
-        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
+        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[{{rownum}}]" parameterized="true"/>
         <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
         <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
      </section>
-</sections>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
new file mode 100644
index 0000000000000..29b7d37de7c3d
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest">
+        <annotations>
+            <stories value="Update Store Group"/>
+            <title value="Update Store Group, Accept Alert and Verify Store View Form"/>
+            <description value="Test log in to Stores and Update Store Group Test"/>
+            <testCaseId value="MC-14296"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create root category-->
+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
+            <createData entity="SimpleRootSubCategory" stepKey="category">
+                <requiredEntity createDataKey="rootCategory"/>
+            </createData>
+            <!--Create website-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+            <!--Create custom store group-->
+            <actionGroup ref="CreateCustomStore" stepKey="updateCustomStoreGroup">
+                <argument name="website" value="{{_defaultWebsite.name}}"/>
+                <argument name="store" value="{{staticStoreGroup.name}}"/>
+                <argument name="rootCategory" value="Default Category"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete website-->
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+            <!--Delete root category-->
+            <deleteData stepKey="deleteRootCategory" createDataKey="rootCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open created Store group in grid-->
+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="openCreatedStoreGroupInGrid">
+            <argument name="storeGroupName" value="{{staticStoreGroup.name}}"/>
+        </actionGroup>
+        <click selector="{{AdminStoresGridSection.firstRow('1')}}" stepKey="clickFirstRow"/>
+        <waitForPageLoad stepKey="AdminSystemStoreGroupPageToOpen"/>
+        <!--Update created Store group as per requirement and accept alert message-->
+        <actionGroup ref="CreateCustomStoreGroupAcceptWarningMessage" stepKey="updateCustomStoreGroup">
+            <argument name="website" value="{{customWebsite.name}}"/>
+            <argument name="store" value="{{customStoreGroup.name}}"/>
+            <argument name="category" value="$$rootCategory.name$$"/>
+        </actionGroup>
+
+        <!--Search updated store group(from above step) in grid and verify AssertStoreGroupInGrid-->
+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeUpdatedStoreGroupInGrid">
+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+        </actionGroup>
+
+        <!--Verify updated website name and updated websitecode on website form (AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm)-->
+        <actionGroup ref="AssertStoreGroupForm" stepKey="seeUpdatedStoreGroupForm">
+            <argument name="website" value="{{customWebsite.name}}"/>
+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+            <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
new file mode 100644
index 0000000000000..783694b63bbd2
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUpdateStoreGroupAndVerifyStoreViewFormTest">
+        <annotations>
+            <stories value="Update Store Group"/>
+            <title value="Update Store Group and Verify Store View Form"/>
+            <description value="Test log in to Stores and Update Store Group Test"/>
+            <testCaseId value="MC-14295"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create custom store group-->
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewCustomStoreGroup">
+                <argument name="website" value="{{_defaultWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+                <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStoreGroup">
+                <argument name="storeGroupName" value="customStoreGroup.name"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteUpdatedStoreGroup">
+                <argument name="storeGroupName" value="SecondStoreGroupUnique.name"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open created Store group in grid-->
+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="openCreatedStoreGroupInGrid">
+            <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+        </actionGroup>
+        <click selector="{{AdminStoresGridSection.firstRow('1')}}" stepKey="clickFirstRow"/>
+        <waitForPageLoad stepKey="AdminSystemStoreGroupPageToOpen"/>
+        <!--Update created Store group as per requirement-->
+        <actionGroup ref="CreateCustomStore" stepKey="createNewCustomStoreGroup">
+            <argument name="website" value="{{_defaultWebsite.name}}"/>
+            <argument name="store" value="{{customStoreGroup.name}}"/>
+            <argument name="rootCategory" value="Default Category"/>
+        </actionGroup>
+
+        <!--Search updated store group(from above step) in grid and verify AssertStoreGroupInGrid-->
+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeUpdatedStoreGroupInGrid">
+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+        </actionGroup>
+
+        <!--Verify updated website name and updated websitecode on website form (AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm)-->
+        <actionGroup ref="AssertStoreGroupForm" stepKey="seeUpdatedStoreGroupForm">
+            <argument name="website" value="{{_defaultWebsite.name}}"/>
+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+            <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            <argument name="rootCategory" value="Default Category"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file

From 5b4944d435525b0a88009a4f718986d322591782 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Thu, 7 Mar 2019 16:17:22 -0600
Subject: [PATCH 0437/1055] MC-13613: Product mass update

---
 .../CatalogInventory/Plugin/MassUpdateProductAttribute.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
index 36958a37c6d1a..e565f609611c2 100644
--- a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
+++ b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
@@ -109,7 +109,9 @@ public function aroundExecute(Save $subject, callable $proceed)
             $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
             $productIds = $this->session->getData('product_ids');
             $inventoryData = $this->addConfigSettings($inventoryData);
-            $this->updateInventoryInProducts($productIds, $websiteId, $inventoryData);
+            if (!empty($inventoryData)) {
+                $this->updateInventoryInProducts($productIds, $websiteId, $inventoryData);
+            }
 
             return $proceed();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {

From bc364ac0a46aa7e8182e71447398d3e5fcf68bdf Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Thu, 7 Mar 2019 19:50:34 -0600
Subject: [PATCH 0438/1055] Elasticsearch6 integration tests adjustment

---
 .../Magento/Elasticsearch/Model/Config.php    | 16 ++++--
 app/code/Magento/Elasticsearch/etc/di.xml     |  8 +++
 .../Magento/Elasticsearch6/Model/Config.php   | 56 -------------------
 .../Model/DataProvider/Suggestions.php        |  2 +-
 .../Model/DataProvider/SuggestionsTest.php    |  2 +-
 app/code/Magento/Elasticsearch6/etc/di.xml    |  8 +++
 .../SearchAdapter/AdapterTest.php             |  4 +-
 .../Model/Client/ElasticsearchTest.php        | 10 ++--
 .../Model/Indexer/IndexHandlerTest.php        | 12 ++--
 .../Model/Indexer/ReindexAllTest.php          |  4 +-
 .../SearchAdapter/AdapterTest.php             | 48 ++++++++--------
 11 files changed, 67 insertions(+), 103 deletions(-)
 delete mode 100644 app/code/Magento/Elasticsearch6/Model/Config.php

diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php
index dc08a72a9feb3..387db07c62f90 100644
--- a/app/code/Magento/Elasticsearch/Model/Config.php
+++ b/app/code/Magento/Elasticsearch/Model/Config.php
@@ -25,8 +25,6 @@ class Config implements ClientOptionsInterface
      */
     const ENGINE_NAME = 'elasticsearch';
 
-    private const ENGINE_NAME_5 = 'elasticsearch5';
-
     /**
      * Elasticsearch Entity type
      */
@@ -64,23 +62,31 @@ class Config implements ClientOptionsInterface
     private $engineResolver;
 
     /**
-     * Constructor
+     * Available Elasticsearch engines.
      *
+     * @var array
+     */
+    private $engineList;
+
+    /**
      * @param ScopeConfigInterface $scopeConfig
      * @param ClientResolver|null $clientResolver
      * @param EngineResolverInterface|null $engineResolver
      * @param string|null $prefix
+     * @param array $engineList
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         ClientResolver $clientResolver = null,
         EngineResolverInterface $engineResolver = null,
-        $prefix = null
+        $prefix = null,
+        $engineList = []
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class);
         $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolverInterface::class);
         $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
+        $this->engineList = $engineList;
     }
 
     /**
@@ -138,7 +144,7 @@ public function getSearchConfigData($field, $storeId = null)
      */
     public function isElasticsearchEnabled()
     {
-        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME, self::ENGINE_NAME_5]);
+        return in_array($this->engineResolver->getCurrentSearchEngine(), $this->engineList);
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 7e219bb2f918f..23a1e76a30cfe 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -13,6 +13,14 @@
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider" />
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">elasticsearch</item>
+                <item name="elasticsearch5" xsi:type="string">elasticsearch5</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver">
         <arguments>
             <argument name="fieldMappers" xsi:type="array">
diff --git a/app/code/Magento/Elasticsearch6/Model/Config.php b/app/code/Magento/Elasticsearch6/Model/Config.php
deleted file mode 100644
index 1a989e2705fdd..0000000000000
--- a/app/code/Magento/Elasticsearch6/Model/Config.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Elasticsearch6\Model;
-
-use Magento\Framework\Search\EngineResolverInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\AdvancedSearch\Model\Client\ClientResolver;
-
-/**
- * Elasticsearch6 config model
- */
-class Config extends \Magento\Elasticsearch\Model\Config
-{
-    /**
-     * Search engine name
-     */
-    private const ENGINE_NAME_6 = 'elasticsearch6';
-
-    /**
-     * @var EngineResolverInterface
-     */
-    private $engineResolver;
-
-    /**
-     * Constructor
-     *
-     * @param ScopeConfigInterface $scopeConfig
-     * @param ClientResolver|null $clientResolver
-     * @param EngineResolverInterface|null $engineResolver
-     * @param string|null $prefix
-     */
-    public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\AdvancedSearch\Model\Client\ClientResolver $clientResolver,
-        \Magento\Framework\Search\EngineResolverInterface $engineResolver,
-        $prefix = null
-    ) {
-        parent::__construct($scopeConfig, $clientResolver, $engineResolver, $prefix);
-        $this->engineResolver = $engineResolver;
-    }
-
-    /**
-     * Return true if third party search engine is used
-     *
-     * @return bool
-     */
-    public function isElasticsearchEnabled()
-    {
-        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME_6]);
-    }
-}
diff --git a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
index 77e1270f54fc2..d05471734bb8f 100644
--- a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
+++ b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Search\Model\QueryInterface;
 use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
-use Magento\Elasticsearch6\Model\Config;
+use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
 use Magento\Search\Model\QueryResultFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
index 957edc559fdcb..b3c60b70ffa8e 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
@@ -67,7 +67,7 @@ class SuggestionsTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->config = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Config::class)
+        $this->config = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
             ->disableOriginalConstructor()
             ->setMethods(['isElasticsearchEnabled'])
             ->getMock();
diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 25eff42fd3442..f9ee035972a35 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -6,6 +6,14 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="string">elasticsearch6</item>
+            </argument>
+        </arguments>
+    </type>
+
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
index 978815f665341..a52c5bb9e21b7 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
@@ -43,7 +43,7 @@ protected function setUp()
         $contentManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Client\Elasticsearch::class)
             ->disableOriginalConstructor()
             ->getMock();
         $contentManager
@@ -78,7 +78,7 @@ protected function setUp()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @return void
      */
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
index 61add5f7d0ea7..3eea2497daa1f 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
@@ -10,7 +10,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
 
@@ -95,7 +95,7 @@ private function search($text)
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductName()
@@ -104,7 +104,7 @@ public function testSearchConfigurableProductBySimpleProductName()
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeMultiselect()
@@ -113,7 +113,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeMultiselect
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeSelect()
@@ -122,7 +122,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeSelect()
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeShortDescription()
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
index 014aaf7679bc9..77533e83b719c 100755
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
@@ -13,7 +13,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
 use Magento\Indexer\Model\Indexer;
@@ -87,7 +87,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @return void
      */
@@ -106,7 +106,7 @@ public function testReindexAll(): void
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @return void
      */
@@ -131,7 +131,7 @@ public function testReindexRowAfterEdit(): void
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @return void
      */
@@ -170,7 +170,7 @@ public function testReindexRowAfterMassAction(): void
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @magentoAppArea adminhtml
      * @return void
@@ -192,7 +192,7 @@ public function testReindexRowAfterDelete(): void
     /**
      * @magentoDbIsolation enabled
      * @magentoAppArea adminhtml
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @magentoDataFixture Magento/Elasticsearch/_files/configurable_products.php
      * @return void
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
index d40ce9e8a0706..7d4aa8e005e4e 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
@@ -68,7 +68,7 @@ protected function setUp()
     /**
      * Test search of all products after full reindex
      *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
      */
@@ -82,7 +82,7 @@ public function testSearchAll()
     /**
      * Test search of specific product after full reindex
      *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
      */
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
index dc288a18fadb7..6bb7d6ac568fc 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Elasticsearch\SearchAdapter;
 
-use Magento\Elasticsearch\Model\Config;
-
 /**
  * Class AdapterTest
  *
@@ -26,7 +24,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
     /**
      * @var string
      */
-    protected $searchEngine = Config::ENGINE_NAME;
+    protected $searchEngine = 'elasticsearch6';
 
     /**
      * Get request config path
@@ -43,12 +41,12 @@ protected function getRequestConfigPath()
      */
     protected function createAdapter()
     {
-        return $this->objectManager->create(\Magento\Elasticsearch\SearchAdapter\Adapter::class);
+        return $this->objectManager->create(\Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter::class);
     }
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchQuery()
@@ -58,7 +56,7 @@ public function testMatchQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchOrderedQuery()
@@ -70,7 +68,7 @@ public function testMatchOrderedQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAggregationsQuery()
@@ -80,7 +78,7 @@ public function testAggregationsQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchQueryFilters()
@@ -92,7 +90,7 @@ public function testMatchQueryFilters()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithAllFields()
@@ -104,7 +102,7 @@ public function testRangeFilterWithAllFields()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithoutFromField()
@@ -116,7 +114,7 @@ public function testRangeFilterWithoutFromField()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithoutToField()
@@ -128,7 +126,7 @@ public function testRangeFilterWithoutToField()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testTermFilter()
@@ -140,7 +138,7 @@ public function testTermFilter()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testTermFilterArray()
@@ -152,7 +150,7 @@ public function testTermFilterArray()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testWildcardFilter()
@@ -164,7 +162,7 @@ public function testWildcardFilter()
      * Request limits test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testSearchLimit()
@@ -176,7 +174,7 @@ public function testSearchLimit()
      * Bool filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilter()
@@ -188,7 +186,7 @@ public function testBoolFilter()
      * Test bool filter with nested negative bool filter
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilterWithNestedNegativeBoolFilter()
@@ -200,7 +198,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter()
      * Test range inside nested negative bool filter
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
@@ -213,7 +211,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
      *
      * @dataProvider elasticSearchAdvancedSearchDataProvider
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @param string $nameQuery
      * @param string $descriptionQuery
@@ -259,7 +257,7 @@ public function elasticSearchAdvancedSearchDataProvider()
     /**
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testCustomFilterableAttribute()
@@ -274,7 +272,7 @@ public function testCustomFilterableAttribute()
      *
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attributes.php
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @dataProvider filterByAttributeValuesDataProvider
      * @param string $requestName
@@ -294,7 +292,7 @@ public function testFilterByAttributeValues($requestName, $additionalData)
      * @param $rangeFilter
      * @param $expectedRecordsCount
      * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @magentoAppIsolation enabled
      * @dataProvider dateDataProvider
@@ -309,7 +307,7 @@ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount)
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAdvancedSearchCompositeProductWithOutOfStockOption()
@@ -320,7 +318,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_disabled_child.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAdvancedSearchCompositeProductWithDisabledChild()
@@ -333,7 +331,7 @@ public function testAdvancedSearchCompositeProductWithDisabledChild()
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/search_weight_products.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testSearchQueryBoost()

From e1fa2898da686fcad88d0478f0f7e610cc0c6ce6 Mon Sep 17 00:00:00 2001
From: Scott Buchanan <sbuchanan@ripen.com>
Date: Tue, 26 Feb 2019 12:49:36 -0500
Subject: [PATCH 0439/1055] populate labels for street lines in checkout

---
 app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php    | 1 +
 .../Magento/blank/Magento_Customer/web/css/source/_module.less  | 2 +-
 .../Magento/luma/Magento_Customer/web/css/source/_module.less   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index a20c146d68d92..5dedf2c7e7eba 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -278,6 +278,7 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
         for ($lineIndex = 0; $lineIndex < (int)$attributeConfig['size']; $lineIndex++) {
             $isFirstLine = $lineIndex === 0;
             $line = [
+                'label' => __("%1: Line %2", $attributeConfig['label'], $lineIndex + 1),
                 'component' => 'Magento_Ui/js/form/element/abstract',
                 'config' => [
                     // customScope is used to group elements within a single form e.g. they can be validated separately
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 8cf5cd313edc5..54a7620b3c8c7 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
@@ -165,7 +165,7 @@
 
     //  Checkout address (create shipping address)
     .field.street {
-        .field.additional {
+        .field {
             .label {
                 &:extend(.abs-visually-hidden all);
             }
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 5b0f717ff15bc..3da7dd7411930 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
@@ -200,7 +200,7 @@
 
     //  Checkout address (create shipping address)
     .field.street {
-        .field.additional {
+        .field {
             .label {
                 &:extend(.abs-visually-hidden all);
             }

From a21901aac61365d1ceb8f58b77246abe3a6a8cd3 Mon Sep 17 00:00:00 2001
From: amol2jcommerce <amol@twojay.in>
Date: Fri, 8 Mar 2019 10:58:54 +0530
Subject: [PATCH 0440/1055] changes for
 Minicart-search-logo-not-vertically-aligned-1

---
 .../luma/Magento_CatalogSearch/web/css/source/_module.less      | 2 +-
 .../luma/Magento_Checkout/web/css/source/module/_minicart.less  | 2 +-
 .../Magento/luma/Magento_Theme/web/css/source/_module.less      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
index f785dd74d900e..5680aab107104 100644
--- a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
@@ -199,7 +199,7 @@
 //  Mobile
 //  _____________________________________________
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .block-search {
         margin-top: @indent__s;
     }
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 9576004421e48..4fb0f52894971 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
@@ -400,7 +400,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .minicart-wrapper {
         margin-top: @indent__s;
     }
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..4cabd6ec94d92 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
@@ -422,7 +422,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .logo {
         margin-bottom: 13px;
         margin-top: 4px;

From e4315560018174b9d1cae692d76b4a8dd727a9b3 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Fri, 8 Mar 2019 08:04:59 +0200
Subject: [PATCH 0441/1055] mutations add<Product Type>ProductsToCart dosn't
 check if the cart is active

---
 .../Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index 21df2271cc7f3..33c91b03ee375 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -84,6 +84,13 @@ public function execute(string $cartHash, ?int $customerId): Quote
                 )
             );
         }
-        return $cart;
+
+        try {
+            return $this->cartRepository->getActiveForCustomer($customerId);
+        } catch (\Exception $e) {
+            throw new GraphQlNoSuchEntityException(
+                __('Current customer does not have an active cart.')
+            );
+        }
     }
 }

From c82cbbdb53064d560082ef65b8296cc60b8cd87b Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Fri, 8 Mar 2019 12:14:01 +0100
Subject: [PATCH 0442/1055] MC-14937: Complete Page Builder Analytics data
 collection

- Add checks on analytics.xml for dependency test
---
 .../Magento/CatalogAnalytics/composer.json    |  3 +-
 .../Magento/CustomerAnalytics/composer.json   |  3 +-
 app/code/Magento/QuoteAnalytics/composer.json |  3 +-
 .../Magento/ReviewAnalytics/composer.json     |  3 +-
 app/code/Magento/SalesAnalytics/composer.json |  3 +-
 .../Magento/WishlistAnalytics/composer.json   |  3 +-
 .../Dependency/AnalyticsConfigRule.php        | 43 +++++++++++++++++++
 .../Magento/Test/Integrity/DependencyTest.php | 28 ++++++++++++
 8 files changed, 83 insertions(+), 6 deletions(-)
 create mode 100644 dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php

diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
index 5c97261d483d8..805be8a17765f 100644
--- a/app/code/Magento/CatalogAnalytics/composer.json
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-catalog": "*"
+        "magento/module-catalog": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
index 7dec4279ee280..3840c534b1964 100644
--- a/app/code/Magento/CustomerAnalytics/composer.json
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-customer": "*"
+        "magento/module-customer": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index 90dae1ec2adca..706bed674b4a9 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-quote": "*"
+        "magento/module-quote": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
index 73f534451580c..a82d4328ca159 100644
--- a/app/code/Magento/ReviewAnalytics/composer.json
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-review": "*"
+        "magento/module-review": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
index 64424c8f5bc61..b77dcd7e71c65 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-sales": "*"
+        "magento/module-sales": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
index fc69afe2907ab..747f2a4baaaa9 100644
--- a/app/code/Magento/WishlistAnalytics/composer.json
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -4,7 +4,8 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-wishlist": "*"
+        "magento/module-wishlist": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php
new file mode 100644
index 0000000000000..b1a6da5e43822
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/AnalyticsConfigRule.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Dependency;
+
+/**
+ * Class provides dependency rule for analytics.xml config file.
+ */
+class AnalyticsConfigRule implements RuleInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
+    {
+        if ('config' != $fileType || !preg_match('#.*/analytics\.xml$#', $file)) {
+            return [];
+        }
+
+        $dependenciesInfo = [];
+        if (preg_match_all('#<[customProvider|reportProvider][^>]*class=[\'"]([^\'"]+)[\'"]#i', $contents, $matches)) {
+            $classes = array_pop($matches);
+            foreach ($classes as $class) {
+                $classParts = explode('\\', $class);
+                $module = implode('\\', array_slice($classParts, 0, 2));
+                if (strtolower($currentModule) !== strtolower($module)) {
+                    $dependenciesInfo[] = [
+                        'module' => $module,
+                        'type' => RuleInterface::TYPE_HARD,
+                        'source' => $file,
+                    ];
+                }
+            }
+        }
+
+        return $dependenciesInfo;
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index a4113abed8030..e2e0357a38f77 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -16,6 +16,7 @@
 use Magento\TestFramework\Dependency\LayoutRule;
 use Magento\TestFramework\Dependency\PhpRule;
 use Magento\TestFramework\Dependency\ReportsConfigRule;
+use Magento\TestFramework\Dependency\AnalyticsConfigRule;
 use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
 
 /**
@@ -78,6 +79,17 @@ class DependencyTest extends \PHPUnit\Framework\TestCase
      */
     protected static $_listRoutesXml = [];
 
+    /**
+     * List of analytics.xml
+     *
+     * Format: array(
+     *  '{Module_Name}' => '{Filename}'
+     * )
+     *
+     * @var array
+     */
+    protected static $_listAnalyticsXml = [];
+
     /**
      * List of routers
      *
@@ -176,6 +188,7 @@ public static function setUpBeforeClass()
         self::_prepareListConfigXml();
         self::_prepareListDbSchemaXml();
         self::_prepareListRoutesXml();
+        self::_prepareListAnalyticsXml();
 
         self::_prepareMapRouters();
         self::_prepareMapLayoutBlocks();
@@ -240,6 +253,7 @@ protected static function _initRules()
             ),
             new DiRule(new VirtualTypeMapper()),
             new ReportsConfigRule($dbRuleTables),
+            new AnalyticsConfigRule(),
         ];
     }
 
@@ -571,6 +585,20 @@ protected static function _prepareListRoutesXml()
         }
     }
 
+    /**
+     * Prepare list of analytics.xml files
+     */
+    protected static function _prepareListAnalyticsXml()
+    {
+        $files = Files::init()->getDbSchemaFiles('analytics.xml', [], false);
+        foreach ($files as $file) {
+            if (preg_match('/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
+                $module = $matches['namespace'] . '\\' . $matches['module'];
+                self::$_listAnalyticsXml[$module] = $file;
+            }
+        }
+    }
+
     /**
      * Prepare map of routers
      */

From ef50e59c883fdb040d42053c34818205f0c22607 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Fri, 8 Mar 2019 11:42:22 +0000
Subject: [PATCH 0443/1055] MFTF / Remove redundant ActionGroups

---
 ...oreFrontPasswordAutocompleteOffActionGroup.xml | 14 --------------
 .../StoreFrontClickSignInButtonActionGroup.xml    | 15 ---------------
 2 files changed, 29 deletions(-)
 delete mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontPasswordAutocompleteOffActionGroup.xml
 delete mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontClickSignInButtonActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontPasswordAutocompleteOffActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontPasswordAutocompleteOffActionGroup.xml
deleted file mode 100644
index 23a067cd94eea..0000000000000
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontPasswordAutocompleteOffActionGroup.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.
-  */
--->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertStorefrontPasswordAutoCompleteOffActionGroup">
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <assertElementContainsAttribute selector="{{StorefrontCustomerSignInFormSection.passwordField}}" attribute="autocomplete" expectedValue="off" stepKey="assertSignInPasswordAutocompleteOff"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontClickSignInButtonActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontClickSignInButtonActionGroup.xml
deleted file mode 100644
index b12858fc1037e..0000000000000
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontClickSignInButtonActionGroup.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.
-  */
--->
-
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontClickSignInButtonActionGroup">
-        <click stepKey="signIn" selector="{{StorefrontPanelHeaderSection.customerLoginLink}}" />
-        <waitForPageLoad stepKey="waitForStorefrontSignInPageLoad"/>
-    </actionGroup>
-</actionGroups>

From afa0320e4dd40dd61ba49205dbf56a94b4f018e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Fri, 8 Mar 2019 13:48:06 +0200
Subject: [PATCH 0444/1055] remove refactored code

not needed with correct html classes
---
 .../css/source/module/checkout/_fields.less   | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
index 4479c070a4e17..8dec680b58726 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
@@ -55,31 +55,3 @@
         }
     }
 }
-
-//
-//  Desktop
-//  _____________________________________________
-
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-    //  ToDo UI: remove with global blank theme .field.required update
-    .opc-wrapper {
-        .fieldset {
-            > .field {
-                &.required,
-                &._required {
-                    position: relative;
-
-                    > label {
-                        padding-right: 25px;
-
-                        &:after {
-                            margin-left: @indent__s;
-                            position: absolute;
-                            top: 9px;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

From 7409f92b62113b81e5713877a518bf50fb70cb85 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Fri, 8 Mar 2019 12:51:01 +0100
Subject: [PATCH 0445/1055] MC-14937: Complete Page Builder Analytics data
 collection

- Move gift message di.xml entries into root di.xml
---
 app/code/Magento/GiftMessage/etc/di.xml          | 7 +++++++
 app/code/Magento/GiftMessage/etc/frontend/di.xml | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/GiftMessage/etc/di.xml b/app/code/Magento/GiftMessage/etc/di.xml
index 1d03849d978b8..af42eff5d934c 100644
--- a/app/code/Magento/GiftMessage/etc/di.xml
+++ b/app/code/Magento/GiftMessage/etc/di.xml
@@ -13,6 +13,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\GiftMessage\Model\CompositeConfigProvider">
+        <arguments>
+            <argument name="configProviders" xsi:type="array">
+                <item name="gift_message_config_provider" xsi:type="object">Magento\GiftMessage\Model\GiftMessageConfigProvider</item>
+            </argument>
+        </arguments>
+    </type>
     <preference for="Magento\GiftMessage\Api\CartRepositoryInterface" type="Magento\GiftMessage\Model\CartRepository"/>
     <preference for="Magento\GiftMessage\Api\ItemRepositoryInterface" type="Magento\GiftMessage\Model\ItemRepository"/>
     <preference for="Magento\GiftMessage\Api\GuestCartRepositoryInterface" type="Magento\GiftMessage\Model\GuestCartRepository"/>
diff --git a/app/code/Magento/GiftMessage/etc/frontend/di.xml b/app/code/Magento/GiftMessage/etc/frontend/di.xml
index a4837e0180c0b..3680a7b521217 100644
--- a/app/code/Magento/GiftMessage/etc/frontend/di.xml
+++ b/app/code/Magento/GiftMessage/etc/frontend/di.xml
@@ -29,13 +29,6 @@
     <type name="Magento\Multishipping\Model\Checkout\Type\Multishipping">
         <plugin name="save_gift_messages" type="Magento\GiftMessage\Model\Type\Plugin\Multishipping"/>
     </type>
-    <type name="Magento\GiftMessage\Model\CompositeConfigProvider">
-        <arguments>
-            <argument name="configProviders" xsi:type="array">
-                <item name="gift_message_config_provider" xsi:type="object">Magento\GiftMessage\Model\GiftMessageConfigProvider</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\GiftOptions">
         <arguments>
             <argument name="layoutProcessors" xsi:type="array">

From 92d93f5433b2967afeeda07624d11afe29787031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Fri, 8 Mar 2019 13:52:26 +0200
Subject: [PATCH 0446/1055] fix asterisk

added correct class for asterisk
---
 .../frontend/web/template/checkout/checkout-agreements.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
index a448537d64e83..db9da71ebf739 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
@@ -5,17 +5,17 @@
  */
 -->
 <div data-role="checkout-agreements">
-    <div class="checkout-agreements" data-bind="visible: isVisible">
+    <div class="checkout-agreements fieldset" data-bind="visible: isVisible">
         <!-- ko foreach: agreements -->
             <!-- ko if: ($parent.isAgreementRequired($data)) -->
-            <div class="checkout-agreement required">
+            <div class="checkout-agreement field required">
                 <input type="checkbox" class="required-entry"
                        data-bind="attr: {
                                     'id': $parent.getCheckboxId($parentContext, agreementId),
                                     'name': 'agreement[' + agreementId + ']',
                                     'value': agreementId
                                     }"/>
-                <label data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
+                <label class="label" data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
                     <button type="button"
                             class="action action-show"
                             data-bind="click: function(data, event) { return $parent.showContent(data, event) }"

From 4488e63648ba75b3f47e34eda5e0ca6191289534 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Fri, 8 Mar 2019 13:27:23 +0100
Subject: [PATCH 0447/1055] MC-14937: Complete Page Builder Analytics data
 collection

- Revert gift message changes
---
 app/code/Magento/GiftMessage/etc/di.xml          | 7 -------
 app/code/Magento/GiftMessage/etc/frontend/di.xml | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/GiftMessage/etc/di.xml b/app/code/Magento/GiftMessage/etc/di.xml
index af42eff5d934c..1d03849d978b8 100644
--- a/app/code/Magento/GiftMessage/etc/di.xml
+++ b/app/code/Magento/GiftMessage/etc/di.xml
@@ -13,13 +13,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\GiftMessage\Model\CompositeConfigProvider">
-        <arguments>
-            <argument name="configProviders" xsi:type="array">
-                <item name="gift_message_config_provider" xsi:type="object">Magento\GiftMessage\Model\GiftMessageConfigProvider</item>
-            </argument>
-        </arguments>
-    </type>
     <preference for="Magento\GiftMessage\Api\CartRepositoryInterface" type="Magento\GiftMessage\Model\CartRepository"/>
     <preference for="Magento\GiftMessage\Api\ItemRepositoryInterface" type="Magento\GiftMessage\Model\ItemRepository"/>
     <preference for="Magento\GiftMessage\Api\GuestCartRepositoryInterface" type="Magento\GiftMessage\Model\GuestCartRepository"/>
diff --git a/app/code/Magento/GiftMessage/etc/frontend/di.xml b/app/code/Magento/GiftMessage/etc/frontend/di.xml
index 3680a7b521217..a4837e0180c0b 100644
--- a/app/code/Magento/GiftMessage/etc/frontend/di.xml
+++ b/app/code/Magento/GiftMessage/etc/frontend/di.xml
@@ -29,6 +29,13 @@
     <type name="Magento\Multishipping\Model\Checkout\Type\Multishipping">
         <plugin name="save_gift_messages" type="Magento\GiftMessage\Model\Type\Plugin\Multishipping"/>
     </type>
+    <type name="Magento\GiftMessage\Model\CompositeConfigProvider">
+        <arguments>
+            <argument name="configProviders" xsi:type="array">
+                <item name="gift_message_config_provider" xsi:type="object">Magento\GiftMessage\Model\GiftMessageConfigProvider</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\GiftOptions">
         <arguments>
             <argument name="layoutProcessors" xsi:type="array">

From cf51a02dd373f03fb9577e11d1f66eb71812f168 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Fri, 8 Mar 2019 14:31:39 +0100
Subject: [PATCH 0448/1055] Added test case for multiple shipping methods for
 one address

---
 .../SetOfflineShippingMethodsOnCartTest.php   | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
index 8a6476329177d..b053820c8a7a7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
@@ -71,6 +71,59 @@ public function testSetOfflineShippingMethod(string $carrier, string $method, fl
         );
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     */
+    public function testSetShippingMethodTwiceInOneRequest()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $shippingAddress = $quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: 
+    {
+      cart_id: "$maskedQuoteId", 
+      shipping_methods: [
+      {
+        cart_address_id: $shippingAddressId
+        method_code: "flatrate"
+        carrier_code: "flatrate"
+      }
+      {
+        cart_address_id: $shippingAddressId
+        method_code: "freeshipping"
+        carrier_code: "freeshipping"
+      }
+      ]
+      }) {
+    
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+          amount
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        self::expectExceptionMessage('You cannot specify multiple shipping methods.');
+        $this->sendRequestWithToken($query);
+    }
+
     /**
      * Data provider for base offline shipping methods
      *
@@ -90,7 +143,7 @@ public function offlineShippingMethodDataProvider()
      *
      * @param string $shippingCarrierCode
      * @param string $shippingMethodCode
-     * @param string $shippingAmount
+     * @param float $shippingAmount
      * @param string $shippingLabel
      * @throws \Magento\Framework\Exception\AuthenticationException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
@@ -166,7 +219,6 @@ private function getQuery(
     }
   }
 }
-
 QUERY;
     }
 

From 95653906830a6dfaf503400d3e057fcf03d1e3cf Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Fri, 8 Mar 2019 09:16:32 -0600
Subject: [PATCH 0449/1055] MC-13613: Product mass update

---
 .../Product/Action/Attribute/Save.php         | 45 +++++++++++++------
 .../Api/Data/PoisonPillInterface.php          |  2 +
 .../Api/PoisonPillCompareInterface.php        |  2 +-
 .../MessageQueue/Model/CallbackInvoker.php    |  7 ++-
 .../Magento/MessageQueue/Model/PoisonPill.php |  2 +-
 .../MessageQueue/Model/PoisonPillCompare.php  |  5 ++-
 .../MessageQueue/Model/PoisonPillFactory.php  |  2 +-
 .../Model/ResourceModel/PoisonPill.php        |  2 +-
 .../MessageQueue/CallbackInvokerInterface.php |  3 ++
 9 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 5409991477539..9a6893a1aff83 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -10,7 +10,6 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Save
@@ -42,11 +41,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      */
     private $userContext;
 
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
@@ -71,13 +65,12 @@ public function __construct(
         $this->identityService = $identityService;
         $this->serializer = $serializer;
         $this->userContext = $userContext;
-        $this->objectManager = ObjectManager::getInstance();
     }
 
     /**
      * Update product attributes
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -89,6 +82,7 @@ public function execute()
         $attributesData = $this->getRequest()->getParam('attributes', []);
         $websiteRemoveData = $this->getRequest()->getParam('remove_website_ids', []);
         $websiteAddData = $this->getRequest()->getParam('add_website_ids', []);
+
         $storeId = $this->attributeHelper->getSelectedStoreId();
         $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
         $productIds = $this->attributeHelper->getProductIds();
@@ -110,10 +104,17 @@ public function execute()
         return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['store' => $storeId]);
     }
 
+    /**
+     * Sanitize product attributes
+     *
+     * @param $attributesData
+     *
+     * @return array
+     */
     private function sanitizeProductAttributes($attributesData)
     {
-        $dateFormat = $this->objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
-        $config = $this->objectManager->get(\Magento\Eav\Model\Config::class);
+        $dateFormat = $this->_objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
+        $config = $this->_objectManager->get(\Magento\Eav\Model\Config::class);
 
         foreach ($attributesData as $attributeCode => $value) {
             $attribute = $config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
@@ -149,7 +150,7 @@ private function sanitizeProductAttributes($attributesData)
     }
 
     /**
-     * Schedule new bulk.
+     * Schedule new bulk
      *
      * @param $attributesData
      * @param $websiteRemoveData
@@ -157,6 +158,8 @@ private function sanitizeProductAttributes($attributesData)
      * @param $storeId
      * @param $websiteId
      * @param $productIds
+     * @throws \Magento\Framework\Exception\LocalizedException
+     *
      * @return void
      */
     private function publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds):void
@@ -196,7 +199,12 @@ private function publish($attributesData, $websiteRemoveData, $websiteAddData, $
         }
 
         if (!empty($operations)) {
-            $result = $this->bulkManagement->scheduleBulk($bulkUuid, $operations, $bulkDescription, $this->userContext->getUserId());
+            $result = $this->bulkManagement->scheduleBulk(
+                $bulkUuid,
+                $operations,
+                $bulkDescription,
+                $this->userContext->getUserId()
+            );
             if (!$result) {
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('Something went wrong while processing the request.')
@@ -206,6 +214,7 @@ private function publish($attributesData, $websiteRemoveData, $websiteAddData, $
     }
 
     /**
+     * Make asynchronous operation
      * @param $meta
      * @param $queue
      * @param $dataToUpdate
@@ -213,10 +222,18 @@ private function publish($attributesData, $websiteRemoveData, $websiteAddData, $
      * @param $websiteId
      * @param $productIds
      * @param $bulkUuid
+     *
      * @return OperationInterface
      */
-    private function makeOperation($meta, $queue, $dataToUpdate, $storeId, $websiteId, $productIds, $bulkUuid): OperationInterface
-    {
+    private function makeOperation(
+        $meta,
+        $queue,
+        $dataToUpdate,
+        $storeId,
+        $websiteId,
+        $productIds,
+        $bulkUuid
+    ): OperationInterface {
         $dataToEncode = [
             'meta_information' => $meta,
             'product_ids' => $productIds,
diff --git a/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php b/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
index f526e0d4ea067..b48d6d585492a 100644
--- a/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
+++ b/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
@@ -22,6 +22,8 @@ interface PoisonPillInterface
     public function getVersion(): ?int;
 
     /**
+     * Set version of poison pill.
+     *
      * @param int $version
      * @return void
      */
diff --git a/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php b/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
index 32d57353f4426..e2df3d69ca0aa 100644
--- a/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
+++ b/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
@@ -17,7 +17,7 @@
 interface PoisonPillCompareInterface
 {
     /**
-     * Check is version of current poison pill is latest.
+     * Check if version of current poison pill is latest.
      *
      * @param PoisonPillInterface $poisonPill
      * @return bool
diff --git a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
index 465c2d366c582..a61a6862843b3 100644
--- a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
+++ b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for  license details.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
@@ -13,6 +13,9 @@
 use Magento\MessageQueue\Api\PoisonPillCompareInterface;
 use Magento\MessageQueue\Api\PoisonPillReadInterface;
 
+/**
+ * Callback invoker
+ */
 class CallbackInvoker implements CallbackInvokerInterface
 {
     /**
@@ -39,7 +42,6 @@ public function __construct(
         PoisonPillCompareInterface $poisonPillCompare
     ) {
         $this->poisonPillRead = $poisonPillRead;
-        $this->poisonPill = $poisonPillRead->getLatest();
         $this->poisonPillCompare = $poisonPillCompare;
     }
 
@@ -48,6 +50,7 @@ public function __construct(
      */
     public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
     {
+        $this->poisonPill = $this->poisonPillRead->getLatest();
         for ($i = $maxNumberOfMessages; $i > 0; $i--) {
             do {
                 $message = $queue->dequeue();
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPill.php b/app/code/Magento/MessageQueue/Model/PoisonPill.php
index a253ca4c13aa0..ac70034a85da5 100644
--- a/app/code/Magento/MessageQueue/Model/PoisonPill.php
+++ b/app/code/Magento/MessageQueue/Model/PoisonPill.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for  license details.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
index 4aa76b4fadfcc..6155526287555 100644
--- a/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
+++ b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for  license details.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
@@ -11,6 +11,9 @@
 use Magento\MessageQueue\Api\PoisonPillCompareInterface;
 use Magento\MessageQueue\Api\PoisonPillReadInterface;
 
+/**
+ * Poison pill compare
+ */
 class PoisonPillCompare implements PoisonPillCompareInterface
 {
     /**
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php b/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php
index 0fd85c998866b..0f2857fd6ec5c 100644
--- a/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php
+++ b/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for  license details.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
index 769f723dc9d5a..dab251ce50c83 100644
--- a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for  license details.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
index bae72d8186a18..36658f2e4eebe 100644
--- a/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
@@ -7,6 +7,9 @@
 
 namespace Magento\Framework\MessageQueue;
 
+/**
+ * Callback invoker interface
+ */
 interface CallbackInvokerInterface
 {
     /**

From 976803b0618c9983f51d28c789e046c07718dd25 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Fri, 8 Mar 2019 16:34:02 +0100
Subject: [PATCH 0450/1055] MC-14937: Complete Page Builder Analytics data
 collection

- Add defaults to configProviders
---
 .../Magento/GiftMessage/Model/CompositeConfigProvider.php  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php b/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
index 0fdce9e9090ac..cb370c27863ca 100644
--- a/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
+++ b/app/code/Magento/GiftMessage/Model/CompositeConfigProvider.php
@@ -7,6 +7,9 @@
 
 use Magento\Checkout\Model\ConfigProviderInterface;
 
+/**
+ * Class CompositeConfigProvider
+ */
 class CompositeConfigProvider implements ConfigProviderInterface
 {
     /**
@@ -18,13 +21,13 @@ class CompositeConfigProvider implements ConfigProviderInterface
      * @param ConfigProviderInterface[] $configProviders
      */
     public function __construct(
-        array $configProviders
+        array $configProviders = []
     ) {
         $this->configProviders = $configProviders;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig()
     {

From 590383107c2f000950d5057084bdd36eef8e5320 Mon Sep 17 00:00:00 2001
From: Vladimir Fishchenko <hws47a@gmail.com>
Date: Fri, 8 Mar 2019 17:11:51 +0100
Subject: [PATCH 0451/1055] magento/magento-functional-tests-migration#417:
 Convert CreateCustomOrderStatusEntityTest to MFTF

---
 ...nOrderStatusFormFillAndSaveActionGroup.xml | 22 ++++++++++
 ...sertOrderStatusExistsInGridActionGroup.xml | 24 ++++++++++
 ...tatusFormSaveDuplicateErrorActionGroup.xml | 15 +++++++
 ...tOrderStatusFormSaveSuccessActionGroup.xml | 15 +++++++
 .../Sales/Test/Mftf/Data/OrderStatusData.xml  | 23 ++++++++++
 .../Test/Mftf/Page/AdminOrderStatusPage.xml   | 14 ++++++
 .../Section/AdminOrderStatusFormSection.xml   | 15 +++++++
 .../Section/AdminOrderStatusGridSection.xml   | 16 +++++++
 ...inCreateOrderStatusDuplicatingCodeTest.xml | 38 ++++++++++++++++
 ...nCreateOrderStatusDuplicatingLabelTest.xml | 44 +++++++++++++++++++
 .../Mftf/Test/AdminCreateOrderStatusTest.xml  | 44 +++++++++++++++++++
 .../CreateCustomOrderStatusEntityTest.xml     |  3 ++
 12 files changed, 273 insertions(+)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
new file mode 100644
index 0000000000000..cb27439a9d886
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.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">
+    <!-- Fill Order status form and click save -->
+    <actionGroup name="AdminOrderStatusFormFillAndSave">
+        <arguments>
+            <argument name="status" type="string" defaultValue=""/>
+            <argument name="label" type="string" defaultValue=""/>
+        </arguments>
+
+        <fillField stepKey="fillStatusCode" selector="{{AdminOrderStatusFormSection.statusCodeField}}" userInput="{{status}}"/>
+        <fillField stepKey="fillStatusLabel" selector="{{AdminOrderStatusFormSection.statusLabelField}}" userInput="{{label}}"/>
+        <click stepKey="clickSaveStatus" selector="{{AdminMainActionsSection.save}}"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
new file mode 100644
index 0000000000000..bbb6aa71b8938
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.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">
+    <!-- Search order status grid for item with a specific code and validate data -->
+    <actionGroup name="AssertOrderStatusExistsInGrid">
+        <arguments>
+            <argument name="status" type="string" defaultValue=""/>
+            <argument name="label" type="string" defaultValue=""/>
+        </arguments>
+
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminOrderStatusGridSection.statusCodeFilterField}}" userInput="{{status}}" stepKey="fillStatusFilter"/>
+        <click selector="{{AdminSecondaryGridSection.searchButton}}" stepKey="clickSearch"/>
+        <see selector="{{AdminOrderStatusGridSection.statusCodeDataColumn}}" userInput="{{status}}" stepKey="seeStatusCodeInGrid"/>
+        <see selector="{{AdminOrderStatusGridSection.statusLabelDataColumn}}" userInput="{{label}}" stepKey="seeStatusLabelInGrid"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
new file mode 100644
index 0000000000000..5b4c3115744c9
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveDuplicateErrorActionGroup.xml
@@ -0,0 +1,15 @@
+<?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">
+    <!-- Assert that order status is not saved with duplication error message -->
+    <actionGroup name="AssertOrderStatusFormSaveDuplicateError">
+        <see selector="{{AdminMessagesSection.error}}" userInput="We found another order status with the same order status code." stepKey="seeError"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
new file mode 100644
index 0000000000000..d82f4b9dd25e8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusFormSaveSuccessActionGroup.xml
@@ -0,0 +1,15 @@
+<?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">
+    <!-- Assert that order status saved with success message -->
+    <actionGroup name="AssertOrderStatusFormSaveSuccess">
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the order status." stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
new file mode 100644
index 0000000000000..aecd7fcf1b703
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml
@@ -0,0 +1,23 @@
+<?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="defaultOrderStatus">
+        <data key="status" unique="suffix">order_status</data>
+        <data key="label" unique="suffix">orderLabel</data>
+    </entity>
+    <entity name="duplicatingCodeOrderStatus">
+        <data key="status">pending</data>
+        <data key="label" unique="suffix">orderLabel</data>
+    </entity>
+    <entity name="duplicatingLabelOrderStatus">
+        <data key="status" unique="suffix">order_status</data>
+        <data key="label">Suspected Fraud</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.xml
new file mode 100644
index 0000000000000..b158e4923074a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderStatusPage.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="AdminOrderStatusPage" url="sales/order_status" area="admin" module="Magento_Sales">
+        <section name="AdminOrderStatusFormSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.xml
new file mode 100644
index 0000000000000..1058b2d6f2177
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusFormSection.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="AdminOrderStatusFormSection">
+        <element name="statusCodeField" type="text" selector="#edit_form [name=status]"/>
+        <element name="statusLabelField" type="text" selector="#edit_form [name=label]"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
new file mode 100644
index 0000000000000..b624639281187
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml
@@ -0,0 +1,16 @@
+<?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="AdminOrderStatusGridSection">
+        <element name="statusCodeFilterField" type="input" selector="[data-role=filter-form] [name=status]"/>
+        <element name="statusCodeDataColumn" type="input" selector="[data-role=row] [data-column=status]"/>
+        <element name="statusLabelDataColumn" type="input" selector="[data-role=row] [data-column=label]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
new file mode 100644
index 0000000000000..aea1094b4d629
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
@@ -0,0 +1,38 @@
+<?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="AdminCreateOrderStatusDuplicatingCodeTest">
+        <annotations>
+            <stories value="Create order status"/>
+            <title value="Create order status with duplicating code"/>
+            <description value="Receive error when creating order status with the code which is already exist"/>
+            <group value="sales"/>
+            <group value="mtf_migrated"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to new order status page -->
+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
+
+        <!-- Fill the form and validate message -->
+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
+            <argument name="status" value="{{duplicatingCodeOrderStatus.status}}"/>
+            <argument name="label" value="{{duplicatingCodeOrderStatus.label}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertOrderStatusFormSaveDuplicateError" stepKey="seeFormSaveDuplicateError"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
new file mode 100644
index 0000000000000..95582e107da19
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
@@ -0,0 +1,44 @@
+<?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="AdminCreateOrderStatusDuplicatingLabelTest">
+        <annotations>
+            <stories value="Create order status"/>
+            <title value="Create order status with duplicating label"/>
+            <description value="Create an order status and get success message"/>
+            <group value="sales"/>
+            <group value="mtf_migrated"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to new order status page -->
+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
+
+        <!-- Fill the form and validate message -->
+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
+            <argument name="status" value="{{duplicatingLabelOrderStatus.status}}"/>
+            <argument name="label" value="{{duplicatingLabelOrderStatus.label}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
+
+        <!-- Verify the order status grid page shows the order status we just created -->
+        <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="searchCreatedOrderStatus">
+            <argument name="status" value="{{duplicatingLabelOrderStatus.status}}"/>
+            <argument name="label" value="{{duplicatingLabelOrderStatus.label}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
new file mode 100644
index 0000000000000..6fe25160655fc
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
@@ -0,0 +1,44 @@
+<?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="AdminCreateOrderStatusTest">
+        <annotations>
+            <stories value="Create custom order status"/>
+            <title value="Create custom order status"/>
+            <description value="Tests opening admin order status page, create a new order status with success message"/>
+            <group value="sales"/>
+            <group value="mtf_migrated"/>
+            <severity value="AVERAGE"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to new order status page -->
+        <amOnPage url="{{AdminOrderStatusPage.url}}" stepKey="goToOrderStatusPage"/>
+        <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewStatus"/>
+
+        <!-- Fill the form and validate message -->
+        <actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
+
+        <!-- Verify the order status grid page shows the order status we just created -->
+        <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="searchCreatedOrderStatus">
+            <argument name="status" value="{{defaultOrderStatus.status}}"/>
+            <argument name="label" value="{{defaultOrderStatus.label}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml
index 38ce04fa56d81..e05d0fea6b129 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.xml
@@ -8,17 +8,20 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\CreateCustomOrderStatusEntityTest" summary="Create Custom Order Status Entity" ticketId="MAGETWO-23412">
         <variation name="CreateCustomOrderStatusEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="orderStatus/data/status" xsi:type="string">order_status%isolation%</data>
             <data name="orderStatus/data/label" xsi:type="string">orderLabel%isolation%</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusSuccessCreateMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusInGrid" />
         </variation>
         <variation name="CreateCustomOrderStatusEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="orderStatus/data/status" xsi:type="string">pending</data>
             <data name="orderStatus/data/label" xsi:type="string">orderLabel%isolation%</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusDuplicateStatus" />
         </variation>
         <variation name="CreateCustomOrderStatusEntityTestVariation3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="orderStatus/data/status" xsi:type="string">order_status%isolation%</data>
             <data name="orderStatus/data/label" xsi:type="string">Suspected Fraud</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusSuccessCreateMessage" />

From 81ed92762db527a7a84cb4908169c99433356e47 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Fri, 8 Mar 2019 10:22:31 -0600
Subject: [PATCH 0452/1055] MC-15215: MFTF - DeleteCustomWebsiteActionGroup Is
 Flaky

---
 .../Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml  | 4 +---
 .../Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
index cc6a1fb62ea5f..32441a1864254 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
@@ -13,13 +13,11 @@
         </arguments>
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
         <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterResetButtonClicked" time="10"/>
         <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton" />
-        <waitForPageLoad stepKey="waitForPageLoadAfterSearch" time="10"/>
         <see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
-
+        <waitForPageLoad stepKey="waitForPageLoadAfterWebsiteSelected" time="30"/>
         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditStorePage"/>
         <selectOption userInput="No" selector="{{AdminStoresDeleteWebsiteSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteWebsiteSection.deleteButton}}" stepKey="clickDeleteButtonOnDeleteWebsitePage"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
index fea7dc07c8287..b8df919446e07 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
@@ -8,6 +8,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminStoresDeleteWebsiteSection">
         <element name="createDbBackup" type="select" selector="#store_create_backup"/>
-        <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
+        <element name="deleteButton" type="button" selector="#delete" timeout="90"/>
     </section>
 </sections>

From b0a0c07b9388e5b1159bb33e37e1a5531b96c313 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Fri, 8 Mar 2019 10:37:05 -0600
Subject: [PATCH 0453/1055] MC-13613: Product mass update

---
 .../Product/Action/Attribute/Save.php         | 44 +++++++++++--------
 .../Model/Attribute/Backend/Consumer.php      | 16 +++++--
 .../Backend/ConsumerWebsiteAssign.php         | 31 ++++++++++---
 app/code/Magento/Catalog/composer.json        |  1 +
 .../Plugin/MassUpdateProductAttribute.php     | 25 +++++++++++
 .../Magento/CatalogInventory/composer.json    |  1 +
 .../MessageQueue/Model/CallbackInvoker.php    |  1 +
 .../MessageQueue/Model/PoisonPillFactory.php  | 36 ---------------
 .../Model/ResourceModel/PoisonPill.php        |  3 ++
 .../PublisherConsumerController.php           |  5 +++
 .../Product/Action/AttributeTest.php          | 16 +++++--
 .../Framework/MessageQueue/Consumer.php       |  2 +-
 12 files changed, 112 insertions(+), 69 deletions(-)
 delete mode 100644 app/code/Magento/MessageQueue/Model/PoisonPillFactory.php

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 9a6893a1aff83..63182dd5624e6 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -13,6 +13,7 @@
 
 /**
  * Class Save
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface
 {
@@ -107,7 +108,7 @@ public function execute()
     /**
      * Sanitize product attributes
      *
-     * @param $attributesData
+     * @param array $attributesData
      *
      * @return array
      */
@@ -152,23 +153,29 @@ private function sanitizeProductAttributes($attributesData)
     /**
      * Schedule new bulk
      *
-     * @param $attributesData
-     * @param $websiteRemoveData
-     * @param $websiteAddData
-     * @param $storeId
-     * @param $websiteId
-     * @param $productIds
+     * @param array $attributesData
+     * @param array $websiteRemoveData
+     * @param array $websiteAddData
+     * @param int $storeId
+     * @param int $websiteId
+     * @param array $productIds
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @return void
      */
-    private function publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds):void
-    {
+    private function publish(
+        $attributesData,
+        $websiteRemoveData,
+        $websiteAddData,
+        $storeId,
+        $websiteId,
+        $productIds
+    ):void {
         $productIdsChunks = array_chunk($productIds, 100);
         $bulkUuid = $this->identityService->generateId();
         $bulkDescription = __('Update attributes to ' . count($productIds) . ' selected products');
         $operations = [];
-        foreach($productIdsChunks as $productIdsChunk) {
+        foreach ($productIdsChunks as $productIdsChunk) {
             if ($websiteRemoveData || $websiteAddData) {
                 $dataToUpdate = [
                     'website_assign' => $websiteAddData,
@@ -215,13 +222,14 @@ private function publish($attributesData, $websiteRemoveData, $websiteAddData, $
 
     /**
      * Make asynchronous operation
-     * @param $meta
-     * @param $queue
-     * @param $dataToUpdate
-     * @param $storeId
-     * @param $websiteId
-     * @param $productIds
-     * @param $bulkUuid
+     *
+     * @param string $meta
+     * @param string $queue
+     * @param array $dataToUpdate
+     * @param int $storeId
+     * @param int $websiteId
+     * @param array $productIds
+     * @param int $bulkUuid
      *
      * @return OperationInterface
      */
@@ -252,6 +260,4 @@ private function makeOperation(
 
         return $this->operationFactory->create($data);
     }
-
 }
-
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index f9c90f82dacd4..5785a9f3ccaa7 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -15,6 +15,7 @@
 
 /**
  * Consumer for export message.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Consumer
 {
@@ -88,7 +89,11 @@ public function __construct(
     }
 
     /**
+     * Process
+     *
      * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
+     * @throws \Exception
+     *
      * @return void
      */
     public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
@@ -97,7 +102,6 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             $serializedData = $operation->getSerializedData();
             $data = $this->serializer->unserialize($serializedData);
             $this->execute($data);
-
         } catch (\Zend_Db_Adapter_Exception  $e) {
             $this->logger->critical($e->getMessage());
             if (
@@ -111,7 +115,9 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             } else {
                 $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
                 $errorCode = $e->getCode();
-                $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
+                $message = __(
+                    'Sorry, something went wrong during product attributes update. Please see log for details.'
+                );
             }
         } catch (NoSuchEntityException $e) {
             $this->logger->critical($e->getMessage());
@@ -140,7 +146,11 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
     }
 
     /**
-     * @param $data
+     * Execute
+     *
+     * @param array $data
+     *
+     * @return void
      */
     private function execute($data): void
     {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
index 591c0892b4228..13933b952cad4 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
@@ -15,6 +15,7 @@
 
 /**
  * Consumer for export message.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConsumerWebsiteAssign
 {
@@ -81,7 +82,11 @@ public function __construct(
     }
 
     /**
+     * Process
+     *
      * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation
+     * @throws \Exception
+     *
      * @return void
      */
     public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterface $operation)
@@ -103,7 +108,9 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             } else {
                 $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
                 $errorCode = $e->getCode();
-                $message = __('Sorry, something went wrong during product attributes update. Please see log for details.');
+                $message = __(
+                    'Sorry, something went wrong during product attributes update. Please see log for details.'
+                );
             }
         } catch (NoSuchEntityException $e) {
             $this->logger->critical($e->getMessage());
@@ -132,9 +139,13 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
     }
 
     /**
-     * @param $productIds
-     * @param $websiteRemoveData
-     * @param $websiteAddData
+     * Update website in products
+     *
+     * @param array $productIds
+     * @param array $websiteRemoveData
+     * @param array $websiteAddData
+     *
+     * @return void
      */
     private function updateWebsiteInProducts($productIds, $websiteRemoveData, $websiteAddData): void
     {
@@ -147,11 +158,19 @@ private function updateWebsiteInProducts($productIds, $websiteRemoveData, $websi
     }
 
     /**
-     * @param $data
+     * Execute
+     *
+     * @param array $data
+     *
+     * @return void
      */
     private function execute($data): void
     {
-        $this->updateWebsiteInProducts($data['product_ids'], $data['attributes']['website_detach'], $data['attributes']['website_assign']);
+        $this->updateWebsiteInProducts(
+            $data['product_ids'],
+            $data['attributes']['website_detach'],
+            $data['attributes']['website_assign']
+        );
         $this->productPriceIndexerProcessor->reindexList($data['product_ids']);
         $this->productFlatIndexerProcessor->reindexList($data['product_ids']);
     }
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 44d051933909b..47e532edfe548 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -7,6 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/module-asynchronous-operations": "*",
         "magento/module-backend": "*",
         "magento/module-catalog-inventory": "*",
         "magento/module-catalog-rule": "*",
diff --git a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
index e565f609611c2..dc1d888d2af19 100644
--- a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
+++ b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
@@ -8,6 +8,10 @@
 use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 
+/**
+ * MassUpdate product attribute.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class MassUpdateProductAttribute
 {
     /**
@@ -70,6 +74,7 @@ class MassUpdateProductAttribute
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Backend\Model\View\Result\RedirectFactory $redirectFactory
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
@@ -96,7 +101,10 @@ public function __construct(
     }
 
     /**
+     * Around execute plugin
+     *
      * @param Save $subject
+     *
      * @return \Magento\Framework\Controller\ResultInterface
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -109,6 +117,7 @@ public function aroundExecute(Save $subject, callable $proceed)
             $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
             $productIds = $this->session->getData('product_ids');
             $inventoryData = $this->addConfigSettings($inventoryData);
+
             if (!empty($inventoryData)) {
                 $this->updateInventoryInProducts($productIds, $websiteId, $inventoryData);
             }
@@ -126,6 +135,13 @@ public function aroundExecute(Save $subject, callable $proceed)
         return $this->redirectFactory->create()->setPath('catalog/product/', ['_current' => true]);
     }
 
+    /**
+     * Add config settings
+     *
+     * @param array $inventoryData
+     *
+     * @return array
+     */
     private function addConfigSettings($inventoryData)
     {
         $options = $this->stockConfiguration->getConfigItemOptions();
@@ -138,6 +154,15 @@ private function addConfigSettings($inventoryData)
         return $inventoryData;
     }
 
+    /**
+     * Update inventory in products
+     *
+     * @param array $productIds
+     * @param int $websiteId
+     * @param array $inventoryData
+     *
+     * @return void
+     */
     private function updateInventoryInProducts($productIds, $websiteId, $inventoryData): void
     {
         foreach ($productIds as $productId) {
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index eb6239ea87ef0..f18a5ff1d875a 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -7,6 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/module-backend": "*",
         "magento/module-catalog": "*",
         "magento/module-search": "*",
         "magento/module-config": "*",
diff --git a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
index a61a6862843b3..33229c6432c5a 100644
--- a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
+++ b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
@@ -47,6 +47,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
     {
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php b/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php
deleted file mode 100644
index 0f2857fd6ec5c..0000000000000
--- a/app/code/Magento/MessageQueue/Model/PoisonPillFactory.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MessageQueue\Model;
-
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
-
-class PoisonPillFactory
-{
-    /**
-     * @var PoisonPillInterface
-     */
-    private $poisonPill;
-
-    /**
-     * @param PoisonPillInterface $poisonPill
-     */
-    public function __construct(
-        PoisonPillInterface $poisonPill
-    ) {
-        $this->poisonPill = $poisonPill;
-    }
-
-    /**
-     * @param int $version
-     * @return PoisonPillInterface
-     */
-    public function create(int $version): PoisonPillInterface
-    {
-
-    }
-}
diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
index dab251ce50c83..7fab0a15ca19f 100644
--- a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
@@ -27,7 +27,10 @@ class PoisonPill extends AbstractDb implements PoisonPillPutInterface, PoisonPil
     private $poisonPillFactory;
 
     /**
+     * PoisonPill constructor.
+     *
      * @param Context $context
+     * @param PoisonPillInterfaceFactory $poisonPillFactory
      * @param string|null $connectionName
      */
     public function __construct(
diff --git a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
index 7748e43bbd621..32240e68ae73e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
@@ -223,6 +223,11 @@ public function getPublisher()
         return $this->publisher;
     }
 
+    /**
+     * Start consumers
+     *
+     * @return void
+     */
     public function startConsumers(): void
     {
         foreach ($this->consumers as $consumer) {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
index 0fe618b2db304..53aa1e24a5cd2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
@@ -122,10 +122,18 @@ public function testSaveActionChangeVisibility($attributes)
             \Magento\Catalog\Block\Product\ListProduct::class
         );
 
-        $this->publisherConsumerController->waitForAsynchronousResult(function() use($repository)  {
-            return $repository->get('simple', false, null, true)->getVisibility() !=  Visibility::VISIBILITY_NOT_VISIBLE;
-            sleep(3);
-        }, []);
+        $this->publisherConsumerController->waitForAsynchronousResult(
+            function() use ($repository) {
+                sleep(3);
+                return $repository->get(
+                    'simple',
+                    false,
+                    null,
+                    true
+                    )->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE;
+            },
+            []
+        );
 
         $category = $categoryFactory->create()->load(2);
         $layer = $listProduct->getLayer();
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
index 72c5f2e0cbdfc..8f65a2d8c5ed2 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
@@ -103,7 +103,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process($maxNumberOfMessages = null)
     {

From f6949d306a1aa4795b5e9cdfe0f4e5e451440bb4 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Fri, 8 Mar 2019 10:52:46 -0600
Subject: [PATCH 0454/1055] Travis CI env updated with Elasticsearch 6

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d29aa241b15b6..e75e8f1a52dd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,7 @@ cache:
     - $HOME/node_modules
     - $HOME/yarn.lock
 before_install:
-  - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
+  - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.6.1.deb && sudo dpkg -i --force-confnew elasticsearch-6.6.1.deb && sudo service elasticsearch restart
   - ./dev/travis/before_install.sh
 install: composer install --no-interaction
 before_script: ./dev/travis/before_script.sh

From 91040106ffca5ec4296a7650110bef20b4f0d1f7 Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Fri, 8 Mar 2019 12:25:10 -0600
Subject: [PATCH 0455/1055] MC-4435: Convert MassDeleteSearchTermEntityTest to
 MFTF

---
 .../ActionGroup/StorefrontCatalogSearchActionGroup.xml | 10 ++++++++--
 .../Section/AdminCatalogSearchTermIndexSection.xml     |  1 +
 .../Mftf/ActionGroup/AdminSearchTermActionGroup.xml    |  4 ++--
 .../Section/StorefrontQuickSearchResultsSection.xml    |  1 +
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index 6b913e5b458e6..d99d1b69887ed 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -11,9 +11,10 @@
     <!-- Quick search the phrase and check if the result page contains correct information -->
     <actionGroup name="StorefrontCheckQuickSearchActionGroup">
         <arguments>
-            <argument name="phrase"/>
+            <argument name="phrase" type="string"/>
         </arguments>
-        <submitForm selector="#search_mini_form" parameterArray="['q' => '{{phrase}}']" stepKey="fillQuickSearch" />
+        <fillField stepKey="fillInput" selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{phrase}}"/>
+        <submitForm selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" parameterArray="[]" stepKey="submitQuickSearch" />
         <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
         <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
         <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
@@ -116,4 +117,9 @@
         <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
+
+    <!-- Asserts that search results do not contain any results-->
+    <actionGroup name="StorefrontCheckSearchIsEmpty">
+        <see stepKey="checkEmpty" selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="Your search returned no results"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
index 5491c27228387..ac316d060f6e9 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchTermIndexSection.xml
@@ -16,6 +16,7 @@
         <element name="submit" type="button" selector="//button[@class='action-default scalable']/span" timeout="30"/>
         <element name="searchQuery" type="text" selector="//tr[@class='data-grid-filters']//td/input[@name='search_query']"/>
         <element name="nthRow" type="checkbox" selector="//tbody/tr['{{rowNum}}']//input[@name='search']" parameterized="true"/>
+        <element name="searchTermRowCheckboxBySearchQuery" type="checkbox" selector="//*[normalize-space()='{{var1}}']/preceding-sibling::td//input[@name='search']" parameterized="true" timeout="30"/>
         <element name="okButton" type="button" selector="//button[@class='action-primary action-accept']/span" timeout="30"/>
         <element name="emptyRecords" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
     </section>
diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
index f116e44e5c141..e0b3d4b850bbb 100644
--- a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminSearchTermActionGroup.xml
@@ -17,12 +17,12 @@
         <fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
         <click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
         <waitForPageLoad stepKey="waitForSearchResultLoad"/>
-        <checkOption selector="{{AdminCatalogSearchTermIndexSection.checkBox}}" stepKey="checkCheckBox"/>
+        <checkOption selector="{{AdminCatalogSearchTermIndexSection.searchTermRowCheckboxBySearchQuery(searchQuery)}}" stepKey="checkCheckBox"/>
     </actionGroup>
 
     <!-- Delete search term -->
     <actionGroup name="deleteSearchTerm">
-        <selectOption selector="{{AdminCatalogSearchTermIndexSection.delete}}" userInput="delete" stepKey="selectDeleteOption"/>
+        <selectOption selector="{{AdminCatalogSearchTermIndexSection.massActions}}" userInput="delete" stepKey="selectDeleteOption"/>
         <click selector="{{AdminCatalogSearchTermIndexSection.submit}}" stepKey="clickSubmitButton"/>
         <click selector="{{AdminCatalogSearchTermIndexSection.okButton}}" stepKey="clickOkButton"/>
         <waitForElementVisible selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
index 9e5bde9a2be49..81b025c9554e2 100644
--- a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
@@ -15,5 +15,6 @@
         <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="//span[@class='price-wrapper ']/span[@class='price']"/>
+        <element name="messageSection" type="text" selector="div .message"/>
     </section>
 </sections>

From 223a712697ef9e967312d1872f1e7867d34952d0 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 13 Feb 2019 20:51:05 +0200
Subject: [PATCH 0456/1055] graphQl-360(361): unmarked tests

---
 .../Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php    | 2 --
 .../GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
index 1419aff867d2d..098c53b430b88 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
@@ -24,8 +24,6 @@ class CategoryProductsVariantsTest extends GraphQlAbstract
      */
     public function testGetSimpleProductsFromCategory()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/360');
-
         $query
             = <<<QUERY
 {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
index c25eed1fd6511..da5410384627c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php
@@ -28,8 +28,6 @@ class ConfigurableProductViewTest extends GraphQlAbstract
      */
     public function testQueryConfigurableProductLinks()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/361');
-
         $productSku = 'configurable';
 
         $query

From 7547a8f6da2d988c6e6174ad18b8c25223e0b4b0 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Fri, 8 Mar 2019 12:53:58 -0600
Subject: [PATCH 0457/1055] MC-15215: MFTF - DeleteCustomWebsiteActionGroup Is
 Flaky

---
 .../Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml    | 1 +
 .../Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
index 32441a1864254..da3ce02a80f28 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
@@ -21,5 +21,6 @@
         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditStorePage"/>
         <selectOption userInput="No" selector="{{AdminStoresDeleteWebsiteSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteWebsiteSection.deleteButton}}" stepKey="clickDeleteButtonOnDeleteWebsitePage"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the website." stepKey="checkSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
index b8df919446e07..1bdf7f0c22c4e 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml
@@ -8,6 +8,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminStoresDeleteWebsiteSection">
         <element name="createDbBackup" type="select" selector="#store_create_backup"/>
-        <element name="deleteButton" type="button" selector="#delete" timeout="90"/>
+        <element name="deleteButton" type="button" selector="#delete" timeout="120"/>
     </section>
 </sections>

From 7b1fc55e5a047dfdd63fc39d91d1fa86188fb434 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 8 Mar 2019 12:54:49 -0600
Subject: [PATCH 0458/1055] GraphQL-360: Unskip and fix
 testGetSimpleProductsFromCategory

---
 .../Model/Variant/Collection.php              | 13 +++----
 .../Catalog/CategoryProductsVariantsTest.php  |  1 -
 .../Magento/GraphQl/Catalog/CategoryTest.php  | 37 +++----------------
 3 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
index 9fda4ec0173ec..12571602878d1 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -90,14 +90,17 @@ public function __construct(
      */
     public function addParentProduct(Product $product) : void
     {
-        if (isset($this->parentProducts[$product->getId()])) {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $productId = $product->getData($linkField);
+
+        if (isset($this->parentProducts[$productId])) {
             return;
         }
 
         if (!empty($this->childrenMap)) {
             $this->childrenMap = [];
         }
-        $this->parentProducts[$product->getId()] = $product;
+        $this->parentProducts[$productId] = $product;
     }
 
     /**
@@ -140,16 +143,12 @@ private function fetch() : array
             return $this->childrenMap;
         }
 
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         foreach ($this->parentProducts as $product) {
             $attributeData = $this->getAttributesCodes($product);
             /** @var ChildCollection $childCollection */
             $childCollection = $this->childCollectionFactory->create();
-            $childCollection->addAttributeToSelect($attributeData);
-
-            /** @var Product $product */
-            $product->setData($linkField, $product->getId());
             $childCollection->setProductFilter($product);
+            $childCollection->addAttributeToSelect($attributeData);
 
             /** @var Product $childProduct */
             foreach ($childCollection->getItems() as $childProduct) {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
index 098c53b430b88..f62be7328481c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php
@@ -18,7 +18,6 @@
 class CategoryProductsVariantsTest extends GraphQlAbstract
 {
     /**
-     *
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
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 c5fd2c49b9924..b20d8d21b66aa 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -28,7 +28,6 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -70,14 +69,7 @@ public function testCategoriesTree()
     }
 }
 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);
+        $response = $this->graphQlQuery($query);
         $responseDataObject = new DataObject($response);
         //Some sort of smoke testing
         self::assertEquals(
@@ -111,39 +103,22 @@ public function testCategoriesTree()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testGetCategoryById()
     {
-        $rootCategoryId = 13;
+        $categoryId = 13;
         $query = <<<QUERY
 {
-  category(id: {$rootCategoryId}) {
+  category(id: {$categoryId}) {
       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')
-        );
+        $response = $this->graphQlQuery($query);
+        self::assertEquals('Category 1.2', $response['category']['name']);
+        self::assertEquals(13, $response['category']['id']);
     }
 
     /**

From 189d79b14cc8bf31f2eb5f06f9ac8172684f7394 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Fri, 8 Mar 2019 13:30:18 -0600
Subject: [PATCH 0459/1055] MC-13613: Product mass update

---
 .../Magento/Catalog/Model/Attribute/Backend/Consumer.php     | 5 ++---
 .../Model/Attribute/Backend/ConsumerWebsiteAssign.php        | 5 ++---
 app/code/Magento/Catalog/composer.json                       | 1 +
 .../CatalogInventory/Plugin/MassUpdateProductAttribute.php   | 1 +
 .../Magento/MessageQueue/Model/ResourceModel/PoisonPill.php  | 3 +++
 .../Controller/Adminhtml/Product/Action/AttributeTest.php    | 4 ++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index 5785a9f3ccaa7..becd6c160155c 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -102,10 +102,9 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             $serializedData = $operation->getSerializedData();
             $data = $this->serializer->unserialize($serializedData);
             $this->execute($data);
-        } catch (\Zend_Db_Adapter_Exception  $e) {
+        } catch (\Zend_Db_Adapter_Exception $e) {
             $this->logger->critical($e->getMessage());
-            if (
-                $e instanceof \Magento\Framework\DB\Adapter\LockWaitException
+            if ($e instanceof \Magento\Framework\DB\Adapter\LockWaitException
                 || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
                 || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
             ) {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
index 13933b952cad4..b47d65e310070 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
@@ -95,10 +95,9 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             $serializedData = $operation->getSerializedData();
             $data = $this->serializer->unserialize($serializedData);
             $this->execute($data);
-        } catch (\Zend_Db_Adapter_Exception  $e) {
+        } catch (\Zend_Db_Adapter_Exception $e) {
             $this->logger->critical($e->getMessage());
-            if (
-                $e instanceof \Magento\Framework\DB\Adapter\LockWaitException
+            if ($e instanceof \Magento\Framework\DB\Adapter\LockWaitException
                 || $e instanceof \Magento\Framework\DB\Adapter\DeadlockException
                 || $e instanceof \Magento\Framework\DB\Adapter\ConnectionException
             ) {
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 47e532edfe548..5c3ee3da8ca81 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -7,6 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/module-authorization": "*",
         "magento/module-asynchronous-operations": "*",
         "magento/module-backend": "*",
         "magento/module-catalog-inventory": "*",
diff --git a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
index dc1d888d2af19..f41fc00b55acb 100644
--- a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
+++ b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
@@ -104,6 +104,7 @@ public function __construct(
      * Around execute plugin
      *
      * @param Save $subject
+     * @param callable $proceed
      *
      * @return \Magento\Framework\Controller\ResultInterface
      *
diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
index 7fab0a15ca19f..b6149be04c471 100644
--- a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
@@ -14,6 +14,9 @@
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
+/**
+ * PoisonPill.
+ */
 class PoisonPill extends AbstractDb implements PoisonPillPutInterface, PoisonPillReadInterface
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
index 53aa1e24a5cd2..3ec8c806dcbb1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
@@ -123,14 +123,14 @@ public function testSaveActionChangeVisibility($attributes)
         );
 
         $this->publisherConsumerController->waitForAsynchronousResult(
-            function() use ($repository) {
+            function () use ($repository) {
                 sleep(3);
                 return $repository->get(
                     'simple',
                     false,
                     null,
                     true
-                    )->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE;
+                )->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE;
             },
             []
         );

From aa7a9544d0aa0d51389a367311f8a5d5b0dae12c Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Fri, 8 Mar 2019 13:48:54 -0600
Subject: [PATCH 0460/1055] MC-13613: Product mass update

---
 .../Magento/MessageQueue/etc/db_schema_whitelist.json  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
index f31981d2ec40f..d9d623a994b37 100644
--- a/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
+++ b/app/code/Magento/MessageQueue/etc/db_schema_whitelist.json
@@ -9,5 +9,13 @@
             "PRIMARY": true,
             "QUEUE_LOCK_MESSAGE_CODE": true
         }
+    },
+    "queue_poison_pill": {
+        "column": {
+            "version": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
     }
-}
\ No newline at end of file
+}

From 63a25905793915ab720a5620a94141e4c4bd8997 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Fri, 8 Mar 2019 11:44:06 -0600
Subject: [PATCH 0461/1055] MAGETWO-97830: Elasticsearch date field crash
 quicksearch

---
 .../Product/FieldProvider/DynamicField.php    |   2 +-
 .../Aggregation/Builder/Term.php              |   4 +-
 .../SearchAdapter/Query/Builder/Match.php     |  67 ++++++++--
 .../ValueTransformer/DateTransformer.php      |  44 +++++++
 .../ValueTransformer/FloatTransformer.php     |  24 ++++
 .../ValueTransformer/IntegerTransformer.php   |  24 ++++
 .../ValueTransformer/TextTransformer.php      |  65 ++++++++++
 .../Query/ValueTransformerInterface.php       |  22 ++++
 .../Query/ValueTransformerPool.php            |  46 +++++++
 .../SearchAdapter/Query/Builder/MatchTest.php | 117 ++++++++++--------
 app/code/Magento/Elasticsearch/etc/di.xml     |  18 +++
 .../Model/ResourceModel/SynonymReader.php     |  14 ++-
 ...hp => product_text_attribute_rollback.php} |   6 +-
 .../_files/product_export_data_rollback.php   |   8 +-
 ...uct_export_data_special_chars_rollback.php |   8 +-
 .../SearchAdapter/AdapterTest.php             |  14 +++
 .../Search/_files/filterable_attributes.php   |  33 ++++-
 .../_files/filterable_attributes_rollback.php |  12 +-
 .../Search/Model/SynonymReaderTest.php        |  17 ++-
 19 files changed, 465 insertions(+), 80 deletions(-)
 create mode 100644 app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php
 create mode 100644 app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php
 create mode 100644 app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php
 create mode 100644 app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
 create mode 100644 app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php
 create mode 100644 app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php
 rename dev/tests/integration/testsuite/Magento/Catalog/_files/{text_attribute_rollback.php => product_text_attribute_rollback.php} (84%)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
index 181cbd4dfd4b3..7fa460fbb3968 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php
@@ -140,7 +140,7 @@ public function getFields(array $context = []): array
         foreach ($groups as $group) {
             $groupPriceKey = $this->fieldNameResolver->getFieldName(
                 $priceAttribute,
-                ['customerGroupId' => $group->getId(), 'websiteId' => $context['websiteId']]
+                array_merge($context, ['customerGroupId' => $group->getId()])
             );
             $allAttributes[$groupPriceKey] = [
                 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
index 0c03a9df18dc8..eeb48f805bccf 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php
@@ -22,13 +22,15 @@ public function build(
         array $queryResult,
         DataProviderInterface $dataProvider
     ) {
+        $buckets = $queryResult['aggregations'][$bucket->getName()]['buckets'] ?? [];
         $values = [];
-        foreach ($queryResult['aggregations'][$bucket->getName()]['buckets'] as $resultBucket) {
+        foreach ($buckets as $resultBucket) {
             $values[$resultBucket['key']] = [
                 'value' => $resultBucket['key'],
                 'count' => $resultBucket['doc_count'],
             ];
         }
+
         return $values;
     }
 }
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
index aaa9d8a88382f..64a82e131aad6 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
 
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
+    as FieldTypeResolver;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
@@ -26,20 +31,49 @@ class Match implements QueryInterface
     private $fieldMapper;
 
     /**
+     * @deprecated
+     * @see \Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer
      * @var PreprocessorInterface[]
      */
     protected $preprocessorContainer;
 
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeProvider;
+
+    /**
+     * @var FieldTypeResolver
+     */
+    private $fieldTypeResolver;
+
+    /**
+     * @var ValueTransformerPool
+     */
+    private $valueTransformerPool;
+
     /**
      * @param FieldMapperInterface $fieldMapper
      * @param PreprocessorInterface[] $preprocessorContainer
+     * @param AttributeProvider|null $attributeProvider
+     * @param FieldTypeResolver|null $fieldTypeResolver
+     * @param ValueTransformerPool|null $valueTransformerPool
      */
     public function __construct(
         FieldMapperInterface $fieldMapper,
-        array $preprocessorContainer
+        array $preprocessorContainer,
+        AttributeProvider $attributeProvider = null,
+        FieldTypeResolver $fieldTypeResolver = null,
+        ValueTransformerPool $valueTransformerPool = null
     ) {
         $this->fieldMapper = $fieldMapper;
         $this->preprocessorContainer = $preprocessorContainer;
+        $this->attributeProvider = $attributeProvider ?? ObjectManager::getInstance()
+            ->get(AttributeProvider::class);
+        $this->fieldTypeResolver = $fieldTypeResolver ?? ObjectManager::getInstance()
+            ->get(FieldTypeResolver::class);
+        $this->valueTransformerPool = $valueTransformerPool ?? ObjectManager::getInstance()
+            ->get(ValueTransformerPool::class);
     }
 
     /**
@@ -72,10 +106,6 @@ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $
      */
     protected function prepareQuery($queryValue, $conditionType)
     {
-        $queryValue = $this->escape($queryValue);
-        foreach ($this->preprocessorContainer as $preprocessor) {
-            $queryValue = $preprocessor->process($queryValue);
-        }
         $condition = $conditionType === BoolExpression::QUERY_CONDITION_NOT ?
             self::QUERY_CONDITION_MUST_NOT : $conditionType;
         return [
@@ -104,10 +134,24 @@ protected function buildQueries(array $matches, array $queryValue)
 
         // Checking for quoted phrase \"phrase test\", trim escaped surrounding quotes if found
         $count = 0;
-        $value = preg_replace('#^\\\\"(.*)\\\\"$#m', '$1', $queryValue['value'], -1, $count);
+        $value = preg_replace('#^"(.*)"$#m', '$1', $queryValue['value'], -1, $count);
         $condition = ($count) ? 'match_phrase' : 'match';
 
+        $transformedTypes = [];
         foreach ($matches as $match) {
+            $attributeAdapter = $this->attributeProvider->getByAttributeCode($match['field']);
+            $fieldType = $this->fieldTypeResolver->getFieldType($attributeAdapter);
+            $valueTransformer = $this->valueTransformerPool->get($fieldType ?? 'text');
+            $valueTransformerHash = \spl_object_hash($valueTransformer);
+            if (!isset($transformedTypes[$valueTransformerHash])) {
+                $transformedTypes[$valueTransformerHash] = $valueTransformer->transform($value);
+            }
+            $transformedValue = $transformedTypes[$valueTransformerHash];
+            if (null === $transformedValue) {
+                //Value is incompatible with this field type.
+                continue;
+            }
+
             $resolvedField = $this->fieldMapper->getFieldName(
                 $match['field'],
                 ['type' => FieldMapperInterface::TYPE_QUERY]
@@ -117,8 +161,8 @@ protected function buildQueries(array $matches, array $queryValue)
                 'body' => [
                     $condition => [
                         $resolvedField => [
-                            'query' => $value,
-                            'boost' => isset($match['boost']) ? $match['boost'] : 1,
+                            'query' => $transformedValue,
+                            'boost' => $match['boost'] ?? 1,
                         ],
                     ],
                 ],
@@ -131,16 +175,13 @@ protected function buildQueries(array $matches, array $queryValue)
     /**
      * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
      *
-     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
-     * https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html Fulltext-boolean search docs.
-     *
+     * @deprecated
+     * @see \Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer
      * @param string $value
      * @return string
      */
     protected function escape($value)
     {
-        $value = preg_replace('/@+|[@+-]+$/', '', $value);
-
         $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
         $replace = '\\\$1';
 
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php
new file mode 100644
index 0000000000000..49eca6e9d82a6
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\Model\Adapter\FieldType\Date;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+
+/**
+ * Value transformer for date type fields.
+ */
+class DateTransformer implements ValueTransformerInterface
+{
+    /**
+     * @var Date
+     */
+    private $dateFieldType;
+
+    /**
+     * @param Date $dateFieldType
+     */
+    public function __construct(Date $dateFieldType)
+    {
+        $this->dateFieldType = $dateFieldType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): ?string
+    {
+        try {
+            $formattedDate = $this->dateFieldType->formatDate(null, $value);
+        } catch (\Exception $e) {
+            $formattedDate = null;
+        }
+
+        return $formattedDate;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php
new file mode 100644
index 0000000000000..5e330076d3df7
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+
+/**
+ * Value transformer for float type fields.
+ */
+class FloatTransformer implements ValueTransformerInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): ?float
+    {
+        return \is_numeric($value) ? (float) $value : null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php
new file mode 100644
index 0000000000000..0846ff3a9bd86
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+
+/**
+ * Value transformer for integer type fields.
+ */
+class IntegerTransformer implements ValueTransformerInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): ?int
+    {
+        return \is_numeric($value) ? (int) $value : null;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
new file mode 100644
index 0000000000000..68bec2580f621
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
+
+/**
+ * Value transformer for fields with text types.
+ */
+class TextTransformer implements ValueTransformerInterface
+{
+    /**
+     * @var PreprocessorInterface[]
+     */
+    private $preprocessors;
+
+    /**
+     * @param PreprocessorInterface[] $preprocessors
+     */
+    public function __construct(array $preprocessors = [])
+    {
+        foreach ($preprocessors as $preprocessor) {
+            if (!$preprocessor instanceof PreprocessorInterface) {
+                throw new \InvalidArgumentException(
+                    \sprintf('"%s" is not a instance of ValueTransformerInterface.', get_class($preprocessor))
+                );
+            }
+        }
+
+        $this->preprocessors = $preprocessors;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): string
+    {
+        $value = $this->escape($value);
+        foreach ($this->preprocessors as $preprocessor) {
+            $value = $preprocessor->process($value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
+     *
+     * @param string $value
+     * @return string
+     */
+    private function escape(string $value): string
+    {
+        $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
+        $replace = '\\\$1';
+
+        return preg_replace($pattern, $replace, $value);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php
new file mode 100644
index 0000000000000..c84ddc69cc7a8
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query;
+
+/**
+ * Value transformer of search term for matching with ES field types.
+ */
+interface ValueTransformerInterface
+{
+    /**
+     * Transform value according to field type.
+     *
+     * @param string $value
+     * @return mixed
+     */
+    public function transform(string $value);
+}
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php
new file mode 100644
index 0000000000000..11a35d79ce1fd
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformerPool.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query;
+
+/**
+ * Pool of value transformers.
+ */
+class ValueTransformerPool
+{
+    /**
+     * @var ValueTransformerInterface[]
+     */
+    private $transformers;
+
+    /**
+     * @param ValueTransformerInterface[] $valueTransformers
+     */
+    public function __construct(array $valueTransformers = [])
+    {
+        foreach ($valueTransformers as $valueTransformer) {
+            if (!$valueTransformer instanceof ValueTransformerInterface) {
+                throw new \InvalidArgumentException(
+                    \sprintf('"%s" is not a instance of ValueTransformerInterface.', get_class($valueTransformer))
+                );
+            }
+        }
+
+        $this->transformers = $valueTransformers;
+    }
+
+    /**
+     * Get value transformer related to field type.
+     *
+     * @param string $fieldType
+     * @return ValueTransformerInterface
+     */
+    public function get(string $fieldType): ValueTransformerInterface
+    {
+        return $this->transformers[$fieldType] ?? $this->transformers['default'];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
index 8114feb09d35d..f3e2b0e9e0fa9 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
@@ -5,14 +5,30 @@
  */
 namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder;
 
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
+    as FieldTypeResolver;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
 use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
 use Magento\Framework\Search\Request\Query\Match as MatchRequestQuery;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject as MockObject;
 
 class MatchTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var AttributeProvider|MockObject
+     */
+    private $attributeProvider;
+
+    /**
+     * @var FieldTypeResolver|MockObject
+     */
+    private $fieldTypeResolver;
+
     /**
      * @var MatchQueryBuilder
      */
@@ -23,46 +39,63 @@ class MatchTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
+        $this->attributeProvider = $this->createMock(AttributeProvider::class);
+        $this->fieldTypeResolver = $this->createMock(FieldTypeResolver::class);
+
+        $valueTransformerPoolMock = $this->createMock(ValueTransformerPool::class);
+        $valueTransformerMock = $this->createMock(ValueTransformerInterface::class);
+        $valueTransformerPoolMock->method('get')
+            ->willReturn($valueTransformerMock);
+        $valueTransformerMock->method('transform')
+            ->willReturnArgument(0);
+
         $this->matchQueryBuilder = (new ObjectManager($this))->getObject(
             MatchQueryBuilder::class,
             [
                 'fieldMapper' => $this->getFieldMapper(),
                 'preprocessorContainer' => [],
+                'attributeProvider' => $this->attributeProvider,
+                'fieldTypeResolver' => $this->fieldTypeResolver,
+                'valueTransformerPool' => $valueTransformerPoolMock,
             ]
         );
     }
 
     /**
      * Tests that method constructs a correct select query.
-     * @see MatchQueryBuilder::build
-     *
-     * @dataProvider queryValuesInvariantsProvider
      *
-     * @param string $rawQueryValue
-     * @param string $errorMessage
+     * @see MatchQueryBuilder::build
      */
-    public function testBuild($rawQueryValue, $errorMessage)
+    public function testBuild()
     {
-        $this->assertSelectQuery(
-            $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not'),
-            $errorMessage
-        );
-    }
+        $attributeAdapter = $this->createMock(AttributeAdapter::class);
+        $this->attributeProvider->expects($this->once())
+            ->method('getByAttributeCode')
+            ->with('some_field')
+            ->willReturn($attributeAdapter);
+        $this->fieldTypeResolver->expects($this->once())
+            ->method('getFieldType')
+            ->with($attributeAdapter)
+            ->willReturn('text');
+
+        $rawQueryValue = 'query_value';
+        $selectQuery = $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not');
 
-    /**
-     * @link https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html Fulltext-boolean search docs.
-     *
-     * @return array
-     */
-    public function queryValuesInvariantsProvider()
-    {
-        return [
-            ['query_value', 'Select query field must match simple raw query value.'],
-            ['query_value+', 'Specifying a trailing plus sign causes InnoDB to report a syntax error.'],
-            ['query_value-', 'Specifying a trailing minus sign causes InnoDB to report a syntax error.'],
-            ['query_@value', 'The @ symbol is reserved for use by the @distance proximity search operator.'],
-            ['query_value+@', 'The @ symbol is reserved for use by the @distance proximity search operator.'],
+        $expectedSelectQuery = [
+            'bool' => [
+                'must_not' => [
+                    [
+                        'match' => [
+                            'some_field' => [
+                                'query' => $rawQueryValue,
+                                'boost' => 43,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
         ];
+        $this->assertEquals($expectedSelectQuery, $selectQuery);
     }
 
     /**
@@ -76,6 +109,16 @@ public function queryValuesInvariantsProvider()
      */
     public function testBuildMatchQuery($rawQueryValue, $queryValue, $match)
     {
+        $attributeAdapter = $this->createMock(AttributeAdapter::class);
+        $this->attributeProvider->expects($this->once())
+            ->method('getByAttributeCode')
+            ->with('some_field')
+            ->willReturn($attributeAdapter);
+        $this->fieldTypeResolver->expects($this->once())
+            ->method('getFieldType')
+            ->with($attributeAdapter)
+            ->willReturn('text');
+
         $query = $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'should');
 
         $expectedSelectQuery = [
@@ -111,30 +154,6 @@ public function matchProvider()
         ];
     }
 
-    /**
-     * @param array $selectQuery
-     * @param string $errorMessage
-     */
-    private function assertSelectQuery($selectQuery, $errorMessage)
-    {
-        $expectedSelectQuery = [
-            'bool' => [
-                'must_not' => [
-                    [
-                        'match' => [
-                            'some_field' => [
-                                'query' => 'query_value',
-                                'boost' => 43,
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ];
-
-        $this->assertEquals($expectedSelectQuery, $selectQuery, $errorMessage);
-    }
-
     /**
      * Gets fieldMapper mock object.
      *
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 9796dc93858f1..83dfd17a61d8b 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -532,4 +532,22 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool">
+        <arguments>
+            <argument name="valueTransformers" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer</item>
+                <item name="date" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\DateTransformer</item>
+                <item name="float" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\FloatTransformer</item>
+                <item name="integer" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\IntegerTransformer</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer">
+        <arguments>
+            <argument name="preprocessors" xsi:type="array">
+                <item name="stopwordsPreprocessor" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords</item>
+                <item name="synonymsPreprocessor" xsi:type="object">Magento\Search\Adapter\Query\Preprocessor\Synonyms</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
index 46e794a1954cf..45eee0a4001d1 100644
--- a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
+++ b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
@@ -87,7 +87,7 @@ private function queryByPhrase($phrase)
     {
         $matchQuery = $this->fullTextSelect->getMatchQuery(
             ['synonyms' => 'synonyms'],
-            $phrase,
+            $this->escapePhrase($phrase),
             Fulltext::FULLTEXT_MODE_BOOLEAN
         );
         $query = $this->getConnection()->select()->from(
@@ -97,6 +97,18 @@ private function queryByPhrase($phrase)
         return $this->getConnection()->fetchAll($query);
     }
 
+    /**
+     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
+     *
+     * @see https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html
+     * @param string $phrase
+     * @return string
+     */
+    private function escapePhrase(string $phrase): string
+    {
+        return preg_replace('/@+|[@+-]+$/', '', $phrase);
+    }
+
     /**
      * A private helper function to retrieve matching synonym groups per scope
      *
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/text_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_text_attribute_rollback.php
similarity index 84%
rename from dev/tests/integration/testsuite/Magento/Catalog/_files/text_attribute_rollback.php
rename to dev/tests/integration/testsuite/Magento/Catalog/_files/product_text_attribute_rollback.php
index cbc0476efd1b5..a9ab0e11312b2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/text_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_text_attribute_rollback.php
@@ -3,13 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /* Delete attribute with text_attribute code */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
+
 /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
 $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    'Magento\Catalog\Model\ResourceModel\Eav\Attribute'
+    \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
 );
 $attribute->load('text_attribute', 'attribute_code');
 $attribute->delete();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
index 168073bc6ab74..c57c7c3fd6a92 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_rollback.php
@@ -5,10 +5,10 @@
  */
 
 /** Delete all products */
-require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
 /** Delete text attribute */
-require dirname(dirname(__DIR__)) . '/Catalog/_files/text_attribute_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/product_text_attribute_rollback.php';
 
-require dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
+include dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
 
-require dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
index 168073bc6ab74..c57c7c3fd6a92 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars_rollback.php
@@ -5,10 +5,10 @@
  */
 
 /** Delete all products */
-require dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/products_with_multiselect_attribute_rollback.php';
 /** Delete text attribute */
-require dirname(dirname(__DIR__)) . '/Catalog/_files/text_attribute_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/product_text_attribute_rollback.php';
 
-require dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
+include dirname(dirname(__DIR__)) . '/Store/_files/second_store_rollback.php';
 
-require dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
+include dirname(dirname(__DIR__)) . '/Catalog/_files/category_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
index dc288a18fadb7..8d80fd8533d6f 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
@@ -369,4 +369,18 @@ public function dateDataProvider()
             [['from' => '2000-02-01T00:00:00Z', 'to' => ''], 0],
         ];
     }
+
+    public function filterByAttributeValuesDataProvider()
+    {
+        $variations = parent::filterByAttributeValuesDataProvider();
+
+        $variations['quick search by date'] = [
+            'quick_search_container',
+            [
+                'search_term' => '2000-10-30',
+            ],
+        ];
+
+        return $variations;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
index b09af48b5f943..f4f3337a253c0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
@@ -20,6 +20,10 @@
     CategorySetup::class,
     ['resourceName' => 'catalog_setup']
 );
+$productEntityTypeId = $installer->getEntityTypeId(
+    \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE
+);
+
 $selectOptions = [];
 $selectAttributes = [];
 foreach (range(1, 2) as $index) {
@@ -30,7 +34,7 @@
     $selectAttribute->setData(
         [
             'attribute_code' => 'select_attribute_' . $index,
-            'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+            'entity_type_id' => $productEntityTypeId,
             'is_global' => 1,
             'is_user_defined' => 1,
             'frontend_input' => 'select',
@@ -56,7 +60,8 @@
     );
     $selectAttribute->save();
     /* Assign attribute to attribute set */
-    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $selectAttribute->getId());
+    $installer->addAttributeToGroup($productEntityTypeId, 'Default', 'General', $selectAttribute->getId());
+
     /** @var $selectOptions Collection */
     $selectOption = Bootstrap::getObjectManager()->create(
         Collection::class
@@ -65,6 +70,26 @@
     $selectAttributes[$index] = $selectAttribute;
     $selectOptions[$index] = $selectOption;
 }
+
+$dateAttribute = Bootstrap::getObjectManager()->create(Attribute::class);
+$dateAttribute->setData(
+    [
+        'attribute_code' => 'date_attribute',
+        'entity_type_id' => $productEntityTypeId,
+        'is_global' => 1,
+        'is_filterable' => 1,
+        'backend_type' => 'datetime',
+        'frontend_input' => 'date',
+        'frontend_label' => 'Test Date',
+        'is_searchable' => 1,
+        'is_filterable_in_search' => 1,
+    ]
+);
+$dateAttribute->save();
+/* Assign attribute to attribute set */
+$installer->addAttributeToGroup($productEntityTypeId, 'Default', 'General', $dateAttribute->getId());
+
+$productAttributeSetId = $installer->getAttributeSetId($productEntityTypeId, 'Default');
 /* Create simple products per each first attribute option */
 foreach ($selectOptions[1] as $option) {
     /** @var $product Product */
@@ -74,7 +99,7 @@
     $product->setTypeId(
         Type::TYPE_SIMPLE
     )->setAttributeSetId(
-        $installer->getAttributeSetId('catalog_product', 'Default')
+        $productAttributeSetId
     )->setWebsiteIds(
         [1]
     )->setName(
@@ -92,6 +117,7 @@
     )->setStockData(
         ['use_config_manage_stock' => 1, 'qty' => 5, 'is_in_stock' => 1]
     )->save();
+
     Bootstrap::getObjectManager()->get(
         Action::class
     )->updateAttributes(
@@ -99,6 +125,7 @@
         [
             $selectAttributes[1]->getAttributeCode() => $option->getId(),
             $selectAttributes[2]->getAttributeCode() => $selectOptions[2]->getLastItem()->getId(),
+            $dateAttribute->getAttributeCode() => '10/30/2000',
         ],
         $product->getStoreId()
     );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php
index 18a5372d06d98..fd413726b2637 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php
@@ -13,6 +13,7 @@
 $registry = Bootstrap::getObjectManager()->get(Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
+
 /** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product\Collection */
 $productCollection = Bootstrap::getObjectManager()
     ->create(Product::class)
@@ -20,17 +21,26 @@
 foreach ($productCollection as $product) {
     $product->delete();
 }
+
 /** @var $attribute Attribute */
 $attribute = Bootstrap::getObjectManager()->create(
     Attribute::class
 );
 /** @var $installer CategorySetup */
 $installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
+$productEntityTypeId = $installer->getEntityTypeId(
+    \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE
+);
 foreach (range(1, 2) as $index) {
-    $attribute->loadByCode($installer->getEntityTypeId('catalog_product'), 'select_attribute_' . $index);
+    $attribute->loadByCode($productEntityTypeId, 'select_attribute_' . $index);
     if ($attribute->getId()) {
         $attribute->delete();
     }
 }
+$attribute->loadByCode($productEntityTypeId, 'date_attribute');
+if ($attribute->getId()) {
+    $attribute->delete();
+}
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
index b9ba89ba53144..2d0020ba22680 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
@@ -48,7 +48,22 @@ public static function loadByPhraseDataProvider()
                 ['synonyms' => 'queen,monarch', 'store_id' => 1, 'website_id' => 0],
                 ['synonyms' => 'british,english', 'store_id' => 1, 'website_id' => 0]
                 ]
-            ]
+            ],
+            [
+                'query_value', []
+            ],
+            [
+                'query_value+', []
+            ],
+            [
+                'query_value-', []
+            ],
+            [
+                'query_@value', []
+            ],
+            [
+                'query_value+@', []
+            ],
         ];
     }
 

From 6601d7584ea60d17406d818bb00fa3c5dd91655d Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Fri, 8 Mar 2019 15:06:34 -0600
Subject: [PATCH 0462/1055] MC-4865: Convert UpdateStoreEntityTest to MFTF

---
 .../Test/Mftf/Section/AdminConfigSection.xml  |  4 +-
 .../AdminCreateStoreViewActionGroup.xml       | 28 ++++++-
 .../Mftf/Section/AdminStoresGridSection.xml   |  2 +-
 .../Mftf/Test/AdminUpdateStoreViewTest.xml    | 81 +++++++++++++++++++
 4 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml

diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
index 8a56c2777084e..9ab1e4a10d7df 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
@@ -11,5 +11,7 @@
         <element name="generalTab" type="text" selector="//div[@class='admin__page-nav-title title _collapsible']//strong[text()='General']"/>
         <element name="generalTabClosed" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='false' or @aria-expanded='0']//strong[text()='General']"/>
         <element name="generalTabOpened" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='true' or @aria-expanded='1']//strong[text()='General']"/>
+        <element name="defaultConfigButton" type="button" selector="#store-change-button" timeout="30"/>
+        <element name="defaultConfigDropdown" type="textarea" selector="//ul[@class='dropdown-menu']"/>
     </section>
-</sections>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index 9b942109785d4..b6855b72e0f27 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -62,4 +62,30 @@
         <waitForElementVisible selector="{{errorMessageSelector}}" stepKey="waitForErrorMessage"/>
         <see selector="{{errorMessageSelector}}" userInput="{{errorMessage}}" stepKey="seeErrorMessage"/>
     </actionGroup>
-</actionGroups>
+    <actionGroup name="AssertStoreViewInGrid">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewInGridMessage"/>
+    </actionGroup>
+    <actionGroup name="AssertStoreViewForm">
+        <arguments>
+            <argument name="storeDropdown" type="string"/>
+            <argument name="storeViewName" type="string"/>
+            <argument name="storeViewCode" type="string"/>
+            <argument name="status" type="string"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
+        <seeInField selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{storeDropdown}}" stepKey="seeAssertStore"/>
+        <seeInField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewName"/>
+        <seeInField selector="{{AdminNewStoreSection.storeCodeTextField}}" userInput="{{storeViewCode}}" stepKey="seeAssertStoreViewCode"/>
+        <seeInField selector="{{AdminNewStoreSection.statusDropdown}}" userInput="{{status}}" stepKey="seeAssertStatus"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index ce6a210db413b..ac0f00e64dd4e 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -20,7 +20,7 @@
         <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
-        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
+        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[{{rownum}}]" parameterized="true"/>
         <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
         <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
         <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml
new file mode 100644
index 0000000000000..963afb7ff482b
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+        <test name="AdminUpdateStoreViewTest">
+            <annotations>
+                <stories value="Update Store View"/>
+                <title value="Update Store View and Verify Backend and Frontend"/>
+                <description value="Test log in to Stores and Update Store View Test"/>
+                <testCaseId value="MC-14316"/>
+                <severity value="CRITICAL"/>
+                <group value="store"/>
+                <group value="mtf_migrated"/>
+            </annotations>
+            <before>
+                <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+                <!--Create custom store view-->
+                <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
+                    <argument name="StoreGroup" value="_defaultStoreGroup"/>
+                    <argument name="customStore" value="storeViewData"/>
+                </actionGroup>
+            </before>
+            <after>
+                <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
+                    <argument name="customStore" value="storeViewData"/>
+                </actionGroup>
+                <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteUpdatedStoreView">
+                    <argument name="customStore" value="SecondStoreUnique"/>
+                </actionGroup>
+                <actionGroup ref="logout" stepKey="logout"/>
+            </after>
+
+            <!--Search created store view in grid-->
+            <actionGroup ref="AssertStoreViewInGrid" stepKey="searchCreatedStoreViewInGrid">
+                <argument name="storeViewName" value="{{storeViewData.name}}"/>
+            </actionGroup>
+            <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
+            <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
+            <!--Update created store view as per requirements-->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="updateStoreView">
+                <argument name="StoreGroup" value="_defaultStoreGroup"/>
+                <argument name="customStore" value="SecondStoreUnique"/>
+            </actionGroup>
+            <!--Save the updated Store view and verify AssertStoreViewSuccessSaveMessage-->
+            <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage">
+            </actionGroup>
+
+            <!--Search updated store view in grid and verify AssertStoreViewInGridMessage-->
+            <actionGroup ref="AssertStoreViewInGrid" stepKey="verifyUpdatedStoreViewInGrid">
+                <argument name="storeViewName" value="{{SecondStoreUnique.name}}"/>
+            </actionGroup>
+
+            <!--Go to store view form page and verify AssertStoreForm-->
+            <actionGroup ref="AssertStoreViewForm" stepKey="verifyStoreViewForm">
+                <argument name="storeDropdown" value="{{_defaultStoreGroup.name}}"/>
+                <argument name="storeViewName" value="{{SecondStoreUnique.name}}"/>
+                <argument name="storeViewCode" value="{{SecondStoreUnique.code}}"/>
+                <argument name="status" value="Enabled"/>
+            </actionGroup>
+
+            <!--Go to store configuration page and verify AssertStoreBackend-->
+            <amOnPage url="{{AdminConfigPage.url}}" stepKey="goToConfigStoreConfigurationPage"/>
+            <waitForPageLoad stepKey="waitForSystemStoreConfigurationPageLoad" />
+            <click selector="{{AdminConfigSection.defaultConfigButton}}" stepKey="clickDefaultConfigButton"/>
+            <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeViewData.name}}" stepKey="seeAssertStoreViewInDefaultConfigDropdown"/>
+            <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{SecondStoreUnique.name}}" stepKey="seeAssertUpdateStoreViewInDefaultConfigDropdown"/>
+
+            <!--Go to storefront and verify AssertStoreFrontend-->
+            <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+            <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
+            <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="selectStoreSwitcher"/>
+            <waitForPageLoad stepKey="waitForFirstStoreView"/>
+            <see selector="{{StorefrontHeaderSection.storeViewDropdown}}" userInput="{{storeViewData.name}}" stepKey="seeAssertStoreViewOnStorefront"/>
+            <see selector="{{StorefrontHeaderSection.storeViewDropdown}}" userInput="{{SecondStoreUnique.name}}" stepKey="seeAssertUpdatedStoreViewOnStorefront"/>
+        </test>
+</tests>
\ No newline at end of file

From 9f93a5e01785ce3ab143e561ff9204609e430c6d Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Fri, 8 Mar 2019 15:49:44 -0600
Subject: [PATCH 0463/1055] MAGETWO-97830: Elasticsearch date field crash
 quicksearch

---
 .../SearchAdapter/Query/Builder/Match.php             | 11 +++++------
 .../Unit/SearchAdapter/Query/Builder/MatchTest.php    |  7 +++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
index 64a82e131aad6..afd383c13421f 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
@@ -6,8 +6,7 @@
 namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
 
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
-    as FieldTypeResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface as TypeResolver;
 use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Search\Request\Query\BoolExpression;
@@ -43,7 +42,7 @@ class Match implements QueryInterface
     private $attributeProvider;
 
     /**
-     * @var FieldTypeResolver
+     * @var TypeResolver
      */
     private $fieldTypeResolver;
 
@@ -56,14 +55,14 @@ class Match implements QueryInterface
      * @param FieldMapperInterface $fieldMapper
      * @param PreprocessorInterface[] $preprocessorContainer
      * @param AttributeProvider|null $attributeProvider
-     * @param FieldTypeResolver|null $fieldTypeResolver
+     * @param TypeResolver|null $fieldTypeResolver
      * @param ValueTransformerPool|null $valueTransformerPool
      */
     public function __construct(
         FieldMapperInterface $fieldMapper,
         array $preprocessorContainer,
         AttributeProvider $attributeProvider = null,
-        FieldTypeResolver $fieldTypeResolver = null,
+        TypeResolver $fieldTypeResolver = null,
         ValueTransformerPool $valueTransformerPool = null
     ) {
         $this->fieldMapper = $fieldMapper;
@@ -71,7 +70,7 @@ public function __construct(
         $this->attributeProvider = $attributeProvider ?? ObjectManager::getInstance()
             ->get(AttributeProvider::class);
         $this->fieldTypeResolver = $fieldTypeResolver ?? ObjectManager::getInstance()
-            ->get(FieldTypeResolver::class);
+            ->get(TypeResolver::class);
         $this->valueTransformerPool = $valueTransformerPool ?? ObjectManager::getInstance()
             ->get(ValueTransformerPool::class);
     }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
index f3e2b0e9e0fa9..d0ffc6debcd8a 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
@@ -7,8 +7,7 @@
 
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
-use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface
-    as FieldTypeResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface as TypeResolver;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
 use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder;
 use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
@@ -25,7 +24,7 @@ class MatchTest extends \PHPUnit\Framework\TestCase
     private $attributeProvider;
 
     /**
-     * @var FieldTypeResolver|MockObject
+     * @var TypeResolver|MockObject
      */
     private $fieldTypeResolver;
 
@@ -40,7 +39,7 @@ class MatchTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->attributeProvider = $this->createMock(AttributeProvider::class);
-        $this->fieldTypeResolver = $this->createMock(FieldTypeResolver::class);
+        $this->fieldTypeResolver = $this->createMock(TypeResolver::class);
 
         $valueTransformerPoolMock = $this->createMock(ValueTransformerPool::class);
         $valueTransformerMock = $this->createMock(ValueTransformerInterface::class);

From fa60f8b9e471abcffab9c3173e17587cdb6db218 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Fri, 8 Mar 2019 16:18:01 -0600
Subject: [PATCH 0464/1055] ENGCOM-4389: Elasticsearch6 implementation

---
 .travis.yml                                   |  2 +-
 .../Magento/Elasticsearch/Model/Config.php    | 16 ++++--
 app/code/Magento/Elasticsearch/composer.json  |  2 +-
 app/code/Magento/Elasticsearch/etc/di.xml     |  8 +++
 .../Magento/Elasticsearch6/Model/Config.php   | 56 -------------------
 .../Model/DataProvider/Suggestions.php        |  2 +-
 .../Model/DataProvider/SuggestionsTest.php    |  2 +-
 app/code/Magento/Elasticsearch6/composer.json |  2 +-
 app/code/Magento/Elasticsearch6/etc/di.xml    |  8 +++
 .../SearchAdapter/AdapterTest.php             |  4 +-
 .../Model/Client/ElasticsearchTest.php        | 10 ++--
 .../Model/Indexer/IndexHandlerTest.php        | 12 ++--
 .../Model/Indexer/ReindexAllTest.php          |  4 +-
 .../SearchAdapter/AdapterTest.php             | 48 ++++++++--------
 .../Php/_files/phpcpd/blacklist/common.txt    |  1 +
 15 files changed, 71 insertions(+), 106 deletions(-)
 delete mode 100644 app/code/Magento/Elasticsearch6/Model/Config.php

diff --git a/.travis.yml b/.travis.yml
index d29aa241b15b6..e75e8f1a52dd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,7 @@ cache:
     - $HOME/node_modules
     - $HOME/yarn.lock
 before_install:
-  - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
+  - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.6.1.deb && sudo dpkg -i --force-confnew elasticsearch-6.6.1.deb && sudo service elasticsearch restart
   - ./dev/travis/before_install.sh
 install: composer install --no-interaction
 before_script: ./dev/travis/before_script.sh
diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php
index dc08a72a9feb3..387db07c62f90 100644
--- a/app/code/Magento/Elasticsearch/Model/Config.php
+++ b/app/code/Magento/Elasticsearch/Model/Config.php
@@ -25,8 +25,6 @@ class Config implements ClientOptionsInterface
      */
     const ENGINE_NAME = 'elasticsearch';
 
-    private const ENGINE_NAME_5 = 'elasticsearch5';
-
     /**
      * Elasticsearch Entity type
      */
@@ -64,23 +62,31 @@ class Config implements ClientOptionsInterface
     private $engineResolver;
 
     /**
-     * Constructor
+     * Available Elasticsearch engines.
      *
+     * @var array
+     */
+    private $engineList;
+
+    /**
      * @param ScopeConfigInterface $scopeConfig
      * @param ClientResolver|null $clientResolver
      * @param EngineResolverInterface|null $engineResolver
      * @param string|null $prefix
+     * @param array $engineList
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         ClientResolver $clientResolver = null,
         EngineResolverInterface $engineResolver = null,
-        $prefix = null
+        $prefix = null,
+        $engineList = []
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class);
         $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolverInterface::class);
         $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
+        $this->engineList = $engineList;
     }
 
     /**
@@ -138,7 +144,7 @@ public function getSearchConfigData($field, $storeId = null)
      */
     public function isElasticsearchEnabled()
     {
-        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME, self::ENGINE_NAME_5]);
+        return in_array($this->engineResolver->getCurrentSearchEngine(), $this->engineList);
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index a821506f5ef6e..c6ac38c1e4005 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "~2.0|~5.1"
+        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 9796dc93858f1..4a354a2ea528f 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -13,6 +13,14 @@
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider" />
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">elasticsearch</item>
+                <item name="elasticsearch5" xsi:type="string">elasticsearch5</item>
+            </argument>
+        </arguments>
+    </type>
 
     <virtualType name="Magento\Elasticsearch\Model\Layer\Search\Context" type="Magento\Catalog\Model\Layer\Search\Context">
         <arguments>
diff --git a/app/code/Magento/Elasticsearch6/Model/Config.php b/app/code/Magento/Elasticsearch6/Model/Config.php
deleted file mode 100644
index 1a989e2705fdd..0000000000000
--- a/app/code/Magento/Elasticsearch6/Model/Config.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Elasticsearch6\Model;
-
-use Magento\Framework\Search\EngineResolverInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\AdvancedSearch\Model\Client\ClientResolver;
-
-/**
- * Elasticsearch6 config model
- */
-class Config extends \Magento\Elasticsearch\Model\Config
-{
-    /**
-     * Search engine name
-     */
-    private const ENGINE_NAME_6 = 'elasticsearch6';
-
-    /**
-     * @var EngineResolverInterface
-     */
-    private $engineResolver;
-
-    /**
-     * Constructor
-     *
-     * @param ScopeConfigInterface $scopeConfig
-     * @param ClientResolver|null $clientResolver
-     * @param EngineResolverInterface|null $engineResolver
-     * @param string|null $prefix
-     */
-    public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\AdvancedSearch\Model\Client\ClientResolver $clientResolver,
-        \Magento\Framework\Search\EngineResolverInterface $engineResolver,
-        $prefix = null
-    ) {
-        parent::__construct($scopeConfig, $clientResolver, $engineResolver, $prefix);
-        $this->engineResolver = $engineResolver;
-    }
-
-    /**
-     * Return true if third party search engine is used
-     *
-     * @return bool
-     */
-    public function isElasticsearchEnabled()
-    {
-        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME_6]);
-    }
-}
diff --git a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
index 77e1270f54fc2..d05471734bb8f 100644
--- a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
+++ b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Search\Model\QueryInterface;
 use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
-use Magento\Elasticsearch6\Model\Config;
+use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
 use Magento\Search\Model\QueryResultFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
index 957edc559fdcb..b3c60b70ffa8e 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
@@ -67,7 +67,7 @@ class SuggestionsTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->config = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Config::class)
+        $this->config = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
             ->disableOriginalConstructor()
             ->setMethods(['isElasticsearchEnabled'])
             ->getMock();
diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index c289d8cd3e4e4..26b6c8c678ade 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -9,7 +9,7 @@
         "magento/module-search": "*",
         "magento/module-store": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~6.1"
+        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 25eff42fd3442..f9ee035972a35 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -6,6 +6,14 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="string">elasticsearch6</item>
+            </argument>
+        </arguments>
+    </type>
+
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
index 978815f665341..a52c5bb9e21b7 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/AdapterTest.php
@@ -43,7 +43,7 @@ protected function setUp()
         $contentManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
+        $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Client\Elasticsearch::class)
             ->disableOriginalConstructor()
             ->getMock();
         $contentManager
@@ -78,7 +78,7 @@ protected function setUp()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @return void
      */
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
index 61add5f7d0ea7..3eea2497daa1f 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php
@@ -10,7 +10,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
 
@@ -95,7 +95,7 @@ private function search($text)
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductName()
@@ -104,7 +104,7 @@ public function testSearchConfigurableProductBySimpleProductName()
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeMultiselect()
@@ -113,7 +113,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeMultiselect
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeSelect()
@@ -122,7 +122,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeSelect()
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductAttributeShortDescription()
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
index 014aaf7679bc9..77533e83b719c 100755
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php
@@ -13,7 +13,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
 use Magento\Indexer\Model\Indexer;
@@ -87,7 +87,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @return void
      */
@@ -106,7 +106,7 @@ public function testReindexAll(): void
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @return void
      */
@@ -131,7 +131,7 @@ public function testReindexRowAfterEdit(): void
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @return void
      */
@@ -170,7 +170,7 @@ public function testReindexRowAfterMassAction(): void
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @magentoAppArea adminhtml
      * @return void
@@ -192,7 +192,7 @@ public function testReindexRowAfterDelete(): void
     /**
      * @magentoDbIsolation enabled
      * @magentoAppArea adminhtml
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @magentoDataFixture Magento/Elasticsearch/_files/configurable_products.php
      * @return void
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
index d40ce9e8a0706..7d4aa8e005e4e 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
@@ -68,7 +68,7 @@ protected function setUp()
     /**
      * Test search of all products after full reindex
      *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
      */
@@ -82,7 +82,7 @@ public function testSearchAll()
     /**
      * Test search of specific product after full reindex
      *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
      */
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
index dc288a18fadb7..6bb7d6ac568fc 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Elasticsearch\SearchAdapter;
 
-use Magento\Elasticsearch\Model\Config;
-
 /**
  * Class AdapterTest
  *
@@ -26,7 +24,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
     /**
      * @var string
      */
-    protected $searchEngine = Config::ENGINE_NAME;
+    protected $searchEngine = 'elasticsearch6';
 
     /**
      * Get request config path
@@ -43,12 +41,12 @@ protected function getRequestConfigPath()
      */
     protected function createAdapter()
     {
-        return $this->objectManager->create(\Magento\Elasticsearch\SearchAdapter\Adapter::class);
+        return $this->objectManager->create(\Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter::class);
     }
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchQuery()
@@ -58,7 +56,7 @@ public function testMatchQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchOrderedQuery()
@@ -70,7 +68,7 @@ public function testMatchOrderedQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAggregationsQuery()
@@ -80,7 +78,7 @@ public function testAggregationsQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchQueryFilters()
@@ -92,7 +90,7 @@ public function testMatchQueryFilters()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithAllFields()
@@ -104,7 +102,7 @@ public function testRangeFilterWithAllFields()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithoutFromField()
@@ -116,7 +114,7 @@ public function testRangeFilterWithoutFromField()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithoutToField()
@@ -128,7 +126,7 @@ public function testRangeFilterWithoutToField()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testTermFilter()
@@ -140,7 +138,7 @@ public function testTermFilter()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testTermFilterArray()
@@ -152,7 +150,7 @@ public function testTermFilterArray()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testWildcardFilter()
@@ -164,7 +162,7 @@ public function testWildcardFilter()
      * Request limits test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testSearchLimit()
@@ -176,7 +174,7 @@ public function testSearchLimit()
      * Bool filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilter()
@@ -188,7 +186,7 @@ public function testBoolFilter()
      * Test bool filter with nested negative bool filter
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilterWithNestedNegativeBoolFilter()
@@ -200,7 +198,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter()
      * Test range inside nested negative bool filter
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
@@ -213,7 +211,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
      *
      * @dataProvider elasticSearchAdvancedSearchDataProvider
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @param string $nameQuery
      * @param string $descriptionQuery
@@ -259,7 +257,7 @@ public function elasticSearchAdvancedSearchDataProvider()
     /**
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testCustomFilterableAttribute()
@@ -274,7 +272,7 @@ public function testCustomFilterableAttribute()
      *
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attributes.php
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @dataProvider filterByAttributeValuesDataProvider
      * @param string $requestName
@@ -294,7 +292,7 @@ public function testFilterByAttributeValues($requestName, $additionalData)
      * @param $rangeFilter
      * @param $expectedRecordsCount
      * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @magentoAppIsolation enabled
      * @dataProvider dateDataProvider
@@ -309,7 +307,7 @@ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount)
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAdvancedSearchCompositeProductWithOutOfStockOption()
@@ -320,7 +318,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_disabled_child.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAdvancedSearchCompositeProductWithDisabledChild()
@@ -333,7 +331,7 @@ public function testAdvancedSearchCompositeProductWithDisabledChild()
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/search_weight_products.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testSearchQueryBoost()
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 3e788c1eba0ee..96854aa76281f 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
@@ -212,3 +212,4 @@ Magento/Elasticsearch6/Model/Client
 Magento/CatalogSearch/Model/ResourceModel/Fulltext
 Magento/Elasticsearch/Model/Layer/Search
 Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver
+Magento/Elasticsearch6/Model/Client

From 04f60d5d27f661b2a33c1f6db2ef511ab5ff3c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20F=C3=BChr?= <d.fuehr@techdivision.com>
Date: Fri, 8 Mar 2019 23:20:21 +0100
Subject: [PATCH 0465/1055] 18752: make root cause visible for exception on
 submitQuote

Github Issue: https://github.com/magento/magento2/issues/18752

If an exceptions happens in orderManagement->place($order) or an
"sales_model_service_quote_submit_success" observer, the catch block
itself fires an event that currently fails for guest checkouts in
Magento\CatalogInventory\Model\ResourceModel\Stock->correctItemsQty().

This second exception hides the root exception and is logged to
the exception log with the message "Rolled back transaction has not
been completed correctly".

This is not bound for this observer, but may occur in every other
observer that is currently register or may be registered in the future.

Therefore the failure event is wrapped in a try-catch itself and throws
a combined exception that is logged in the exception.log.
---
 .../Magento/Quote/Model/QuoteManagement.php   | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index 8f216b64aa9b0..b10777f816fdf 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\StateException;
+use Magento\Framework\Phrase;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Model\Quote\Address\ToOrder as ToOrderConverter;
 use Magento\Quote\Model\Quote\Address\ToOrderAddress as ToOrderAddressConverter;
@@ -532,19 +533,31 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
             );
             $this->quoteRepository->save($quote);
         } catch (\Exception $e) {
-            if (!empty($this->addressesToSync)) {
-                foreach ($this->addressesToSync as $addressId) {
-                    $this->addressRepository->deleteById($addressId);
+            try {
+                if (!empty($this->addressesToSync)) {
+                    foreach ($this->addressesToSync as $addressId) {
+                        $this->addressRepository->deleteById($addressId);
+                    }
                 }
+                $this->eventManager->dispatch(
+                    'sales_model_service_quote_submit_failure',
+                    [
+                        'order' => $order,
+                        'quote' => $quote,
+                        'exception' => $e,
+                    ]
+                );
+            } catch (\Exception $consecutiveException) {
+                $message = new Phrase(
+                    "An exception occurred on 'sales_model_service_quote_submit_failure' event: %1\n%2",
+                    [
+                        $consecutiveException->getMessage(),
+                        $consecutiveException->getTraceAsString()
+                    ]
+                );
+
+                throw new LocalizedException($message, $e);
             }
-            $this->eventManager->dispatch(
-                'sales_model_service_quote_submit_failure',
-                [
-                    'order'     => $order,
-                    'quote'     => $quote,
-                    'exception' => $e
-                ]
-            );
             throw $e;
         }
         return $order;

From ce9b0970193cd12d69c8240b802b04bd88777df9 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Fri, 8 Mar 2019 17:16:08 -0600
Subject: [PATCH 0466/1055] MC-15325: Unable to add Giftcards during
 BrainTree(Paypal) purchase

---
 .../Braintree/Controller/Paypal/Review.php    |  3 +-
 .../Controller/Paypal/ReviewTest.php          | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php

diff --git a/app/code/Magento/Braintree/Controller/Paypal/Review.php b/app/code/Magento/Braintree/Controller/Paypal/Review.php
index 14ec829d98024..eb2de7c7b6e39 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/Review.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/Review.php
@@ -13,11 +13,12 @@
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
 /**
  * Class Review
  */
-class Review extends AbstractAction implements HttpPostActionInterface
+class Review extends AbstractAction implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var QuoteUpdater
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php
new file mode 100644
index 0000000000000..fc79048f15f45
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/ReviewTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Controller\Paypal;
+
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * ReviewTest
+ */
+class ReviewTest extends AbstractController
+{
+    /**
+     * @var Review
+     */
+    private $controller;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->controller = $this->_objectManager->create(Review::class);
+    }
+
+    /**
+     * Test controller implements correct interfaces
+     *
+     */
+    public function testInterfaceImplementation()
+    {
+        $this->assertInstanceOf(HttpGetActionInterface::class, $this->controller);
+        $this->assertInstanceOf(HttpPostActionInterface::class, $this->controller);
+    }
+}

From c2012388eb962a0e8d27278766ed87bb4192f3dc Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 8 Mar 2019 18:58:08 -0600
Subject: [PATCH 0467/1055] GraphQL-458: CustomerGraphQl module refactoring

---
 .../Address/CreateCustomerAddress.php         | 115 ++++++++++++++++++
 .../CustomerAddressCreateDataValidator.php    |  56 ---------
 .../CustomerAddressUpdateDataValidator.php    |  56 ---------
 .../Address/DeleteCustomerAddress.php         |  60 +++++++++
 ...der.php => ExtractCustomerAddressData.php} |  29 +++--
 .../Customer/Address}/GetCustomerAddress.php  |   4 +-
 .../Address/GetCustomerAddressForUser.php     |  61 ----------
 .../Address/UpdateCustomerAddress.php         | 111 +++++++++++++++++
 ...eAccount.php => CreateCustomerAccount.php} |  45 +++++--
 ...taProvider.php => ExtractCustomerData.php} |  39 +-----
 ...eckCustomerAccount.php => GetCustomer.php} |  33 ++---
 .../Model/Customer/SetUpUserContext.php       |  30 -----
 ...omerData.php => UpdateCustomerAccount.php} |  46 +++++--
 .../Model/Resolver/ChangePassword.php         |  42 +++----
 .../Model/Resolver/CreateCustomer.php         |  66 +++-------
 .../Model/Resolver/CreateCustomerAddress.php  | 100 ++++-----------
 .../Model/Resolver/Customer.php               |  33 +++--
 .../Model/Resolver/CustomerAddresses.php      |  71 +++++++++++
 .../Model/Resolver/DeleteCustomerAddress.php  |  75 ++++--------
 .../Model/Resolver/IsEmailAvailable.php       |  11 +-
 .../Model/Resolver/IsSubscribed.php           |  19 ++-
 .../Model/Resolver/RevokeCustomerToken.php    |  19 ++-
 .../Model/Resolver/UpdateCustomer.php         |  60 ++++-----
 .../Model/Resolver/UpdateCustomerAddress.php  | 102 ++++++----------
 .../CustomerGraphQl/Test/Mftf/README.md       |   3 -
 .../CustomerGraphQl/etc/schema.graphqls       |   2 +-
 ...ddress.php => ExtractQuoteAddressData.php} |   4 +-
 .../Model/Cart/SetBillingAddressOnCart.php    |  17 +--
 .../Model/Cart/SetShippingAddressesOnCart.php |  17 +--
 .../Model/Resolver/BillingAddress.php         |  16 +--
 .../Model/Resolver/ShippingAddresses.php      |  16 +--
 .../SalesGraphQl/Model/Resolver/Orders.php    |  17 ++-
 .../Model/Resolver/DeletePaymentToken.php     |  19 ++-
 .../Model/Resolver/PaymentTokens.php          |  20 ++-
 .../Customer/ChangeCustomerPasswordTest.php   |   1 -
 .../Customer/DeleteCustomerAddressTest.php    |   2 +-
 .../GraphQl/Customer/UpdateCustomerTest.php   |   3 +-
 .../Customer/SetBillingAddressOnCartTest.php  |   2 +-
 .../Quote/SetShippingAddressOnCartTest.php    |   2 +-
 39 files changed, 719 insertions(+), 705 deletions(-)
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
 delete mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
 delete mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/DeleteCustomerAddress.php
 rename app/code/Magento/CustomerGraphQl/Model/Customer/Address/{CustomerAddressDataProvider.php => ExtractCustomerAddressData.php} (80%)
 rename app/code/Magento/{QuoteGraphQl/Model/Cart => CustomerGraphQl/Model/Customer/Address}/GetCustomerAddress.php (92%)
 delete mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
 rename app/code/Magento/CustomerGraphQl/Model/Customer/{CreateAccount.php => CreateCustomerAccount.php} (62%)
 rename app/code/Magento/CustomerGraphQl/Model/Customer/{CustomerDataProvider.php => ExtractCustomerData.php} (72%)
 rename app/code/Magento/CustomerGraphQl/Model/Customer/{CheckCustomerAccount.php => GetCustomer.php} (79%)
 delete mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
 rename app/code/Magento/CustomerGraphQl/Model/Customer/{UpdateCustomerData.php => UpdateCustomerAccount.php} (72%)
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php
 delete mode 100644 app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
 rename app/code/Magento/QuoteGraphQl/Model/Cart/{ExtractDataFromAddress.php => ExtractQuoteAddressData.php} (96%)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
new file mode 100644
index 0000000000000..388b6dc2ea943
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
@@ -0,0 +1,115 @@
+<?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\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Api\DataObjectHelper;
+
+/**
+ * Create customer address
+ */
+class CreateCustomerAddress
+{
+    /**
+     * @var GetAllowedAddressAttributes
+     */
+    private $getAllowedAddressAttributes;
+
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $addressFactory;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
+     * @param AddressInterfaceFactory $addressFactory
+     * @param AddressRepositoryInterface $addressRepository
+     * @param DataObjectHelper $dataObjectHelper
+     */
+    public function __construct(
+        GetAllowedAddressAttributes $getAllowedAddressAttributes,
+        AddressInterfaceFactory $addressFactory,
+        AddressRepositoryInterface $addressRepository,
+        DataObjectHelper $dataObjectHelper
+    ) {
+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
+        $this->addressFactory = $addressFactory;
+        $this->addressRepository = $addressRepository;
+        $this->dataObjectHelper = $dataObjectHelper;
+    }
+
+    /**
+     * Create customer address
+     *
+     * @param int $customerId
+     * @param array $data
+     * @return AddressInterface
+     * @throws GraphQlInputException
+     */
+    public function execute(int $customerId, array $data): AddressInterface
+    {
+        $this->validateData($data);
+
+        /** @var AddressInterface $address */
+        $address = $this->addressFactory->create();
+        $this->dataObjectHelper->populateWithArray($address, $data, AddressInterface::class);
+
+        if (isset($data['region']['region_id'])) {
+            $address->setRegionId($address->getRegion()->getRegionId());
+        }
+        $address->setCustomerId($customerId);
+
+        try {
+            $this->addressRepository->save($address);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+        return $address;
+    }
+
+    /**
+     * Validate customer address create data
+     *
+     * @param array $addressData
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validateData(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/CustomerAddressCreateDataValidator.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
deleted file mode 100644
index 65672bcd3503b..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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/Address/CustomerAddressUpdateDataValidator.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
deleted file mode 100644
index 13716b491fddf..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/DeleteCustomerAddress.php
new file mode 100644
index 0000000000000..586fbebde703f
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/DeleteCustomerAddress.php
@@ -0,0 +1,60 @@
+<?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\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Delete customer address
+ */
+class DeleteCustomerAddress
+{
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @param AddressRepositoryInterface $addressRepository
+     */
+    public function __construct(
+        AddressRepositoryInterface $addressRepository
+    ) {
+        $this->addressRepository = $addressRepository;
+    }
+
+    /**
+     * Delete customer address
+     *
+     * @param AddressInterface $address
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function execute(AddressInterface $address): void
+    {
+        if ($address->isDefaultBilling()) {
+            throw new GraphQlInputException(
+                __('Customer Address %1 is set as default billing address and can not be deleted', [$address->getId()])
+            );
+        }
+        if ($address->isDefaultShipping()) {
+            throw new GraphQlInputException(
+                __('Customer Address %1 is set as default shipping address and can not be deleted', [$address->getId()])
+            );
+        }
+
+        try {
+            $this->addressRepository->delete($address);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
similarity index 80%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
index 9640953032ac6..a4649bccc02e8 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
@@ -17,9 +17,9 @@
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
- * Customer Address field data provider, used for GraphQL request processing.
+ * Transform single customer address data from object to in array format
  */
-class CustomerAddressDataProvider
+class ExtractCustomerAddressData
 {
     /**
      * @var ServiceOutputProcessor
@@ -82,24 +82,27 @@ private function curateAddressDefaultValues(array $address, AddressInterface $ad
     /**
      * Transform single customer address data from object to in array format
      *
-     * @param AddressInterface $addressObject
+     * @param AddressInterface $address
      * @return array
      */
-    public function getAddressData(AddressInterface $addressObject): array
+    public function execute(AddressInterface $address): array
     {
-        $address = $this->serviceOutputProcessor->process(
-            $addressObject,
+        $addressData = $this->serviceOutputProcessor->process(
+            $address,
             AddressRepositoryInterface::class,
             'getById'
         );
-        $address = $this->curateAddressDefaultValues($address, $addressObject);
+        $addressData = $this->curateAddressDefaultValues($addressData, $address);
 
-        if (isset($address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
-            $address = array_merge($address, $address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY]);
+        if (isset($addressData[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
+            $addressData = array_merge(
+                $addressData,
+                $addressData[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY]
+            );
         }
         $customAttributes = [];
-        if (isset($address[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES])) {
-            foreach ($address[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
+        if (isset($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES])) {
+            foreach ($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
                 $isArray = false;
                 if (is_array($attribute['value'])) {
                     $isArray = true;
@@ -120,8 +123,8 @@ public function getAddressData(AddressInterface $addressObject): array
                 $customAttributes[$attribute['attribute_code']] = $attribute['value'];
             }
         }
-        $address = array_merge($address, $customAttributes);
+        $addressData = array_merge($addressData, $customAttributes);
 
-        return $address;
+        return $addressData;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddress.php
similarity index 92%
rename from app/code/Magento/QuoteGraphQl/Model/Cart/GetCustomerAddress.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddress.php
index 039324abf6854..7258f2e726fd7 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddress.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\QuoteGraphQl\Model\Cart;
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
@@ -58,7 +58,7 @@ public function execute(int $addressId, int $customerId): AddressInterface
         if ((int)$customerAddress->getCustomerId() !== $customerId) {
             throw new GraphQlAuthorizationException(
                 __(
-                    'The current user cannot use address with ID "%address_id"',
+                    'Current customer does not have permission to address with ID "%address_id"',
                     ['address_id' => $addressId]
                 )
             );
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
deleted file mode 100644
index f7323402a6c62..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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/Address/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
new file mode 100644
index 0000000000000..65745a20bc8eb
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
@@ -0,0 +1,111 @@
+<?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\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Api\DataObjectHelper;
+
+/**
+ * Update customer address
+ */
+class UpdateCustomerAddress
+{
+    /**
+     * @var GetAllowedAddressAttributes
+     */
+    private $getAllowedAddressAttributes;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var array
+     */
+    private $restrictedKeys;
+
+    /**
+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
+     * @param AddressRepositoryInterface $addressRepository
+     * @param DataObjectHelper $dataObjectHelper
+     * @param array $restrictedKeys
+     */
+    public function __construct(
+        GetAllowedAddressAttributes $getAllowedAddressAttributes,
+        AddressRepositoryInterface $addressRepository,
+        DataObjectHelper $dataObjectHelper,
+        array $restrictedKeys = []
+    ) {
+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
+        $this->addressRepository = $addressRepository;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->restrictedKeys = $restrictedKeys;
+    }
+
+    /**
+     * Update customer address
+     *
+     * @param AddressInterface $address
+     * @param array $data
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function execute(AddressInterface $address, array $data): void
+    {
+        $this->validateData($data);
+
+        $filteredData = array_diff_key($data, array_flip($this->restrictedKeys));
+        $this->dataObjectHelper->populateWithArray($address, $filteredData, AddressInterface::class);
+
+        if (isset($data['region']['region_id'])) {
+            $address->setRegionId($address->getRegion()->getRegionId());
+        }
+
+        try {
+            $this->addressRepository->save($address);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+    }
+
+    /**
+     * Validate customer address update data
+     *
+     * @param array $addressData
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validateData(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/CreateAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
similarity index 62%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
index 4a4b5c863528b..75371b805e023 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
@@ -12,13 +12,13 @@
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Class CreateAccount creates new customer account
+ * Create new customer account
  */
-class CreateAccount
+class CreateCustomerAccount
 {
     /**
      * @var DataObjectHelper
@@ -40,46 +40,71 @@ class CreateAccount
      */
     private $storeManager;
 
+    /**
+     * @var ChangeSubscriptionStatus
+     */
+    private $changeSubscriptionStatus;
+
     /**
      * @param DataObjectHelper $dataObjectHelper
      * @param CustomerInterfaceFactory $customerFactory
      * @param StoreManagerInterface $storeManager
      * @param AccountManagementInterface $accountManagement
+     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
      */
     public function __construct(
         DataObjectHelper $dataObjectHelper,
         CustomerInterfaceFactory $customerFactory,
         StoreManagerInterface $storeManager,
-        AccountManagementInterface $accountManagement
+        AccountManagementInterface $accountManagement,
+        ChangeSubscriptionStatus $changeSubscriptionStatus
     ) {
         $this->dataObjectHelper = $dataObjectHelper;
         $this->customerFactory = $customerFactory;
         $this->accountManagement = $accountManagement;
         $this->storeManager = $storeManager;
+        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
     }
 
     /**
      * Creates new customer account
      *
-     * @param array $args
+     * @param array $data
+     * @return CustomerInterface
+     * @throws GraphQlInputException
+     */
+    public function execute(array $data): CustomerInterface
+    {
+        try {
+            $customer = $this->createAccount($data);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()));
+        }
+
+        if (isset($data['is_subscribed'])) {
+            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
+        }
+        return $customer;
+    }
+
+    /**
+     * @param array $data
      * @return CustomerInterface
      * @throws LocalizedException
-     * @throws NoSuchEntityException
      */
-    public function execute(array $args): CustomerInterface
+    private function createAccount(array $data): CustomerInterface
     {
         $customerDataObject = $this->customerFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customerDataObject,
-            $args['input'],
+            $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;
-
+        $password = array_key_exists('password', $data) ? $data['password'] : null;
         return $this->accountManagement->createAccount($customerDataObject, $password);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
similarity index 72%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
index c8382593eab23..abe028051a07e 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
@@ -9,22 +9,15 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\ServiceOutputProcessor;
 use Magento\Customer\Api\Data\CustomerInterface;
 
 /**
- * Customer field data provider, used for GraphQL request processing.
+ * Transform single customer data from object to in array format
  */
-class CustomerDataProvider
+class ExtractCustomerData
 {
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
-
     /**
      * @var ServiceOutputProcessor
      */
@@ -36,47 +29,24 @@ class CustomerDataProvider
     private $serializer;
 
     /**
-     * @param CustomerRepositoryInterface $customerRepository
      * @param ServiceOutputProcessor $serviceOutputProcessor
      * @param SerializerInterface $serializer
      */
     public function __construct(
-        CustomerRepositoryInterface $customerRepository,
         ServiceOutputProcessor $serviceOutputProcessor,
         SerializerInterface $serializer
     ) {
-        $this->customerRepository = $customerRepository;
         $this->serviceOutputProcessor = $serviceOutputProcessor;
         $this->serializer = $serializer;
     }
 
-    /**
-     * Get customer data by Id or empty array
-     *
-     * @param int $customerId
-     * @return array
-     * @throws NoSuchEntityException|LocalizedException
-     */
-    public function getCustomerById(int $customerId): array
-    {
-        try {
-            $customer = $this->customerRepository->getById($customerId);
-        } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(
-                __('Customer id "%customer_id" does not exist.', ['customer_id' => $customerId]),
-                $e
-            );
-        }
-        return $this->processCustomer($customer);
-    }
-
     /**
      * Curate default shipping and default billing keys
      *
      * @param array $arrayAddress
      * @return array
      */
-    private function curateAddressData(array $arrayAddress) : array
+    private function curateAddressData(array $arrayAddress): array
     {
         foreach ($arrayAddress as $key => $address) {
             if (!isset($address['default_shipping'])) {
@@ -94,8 +64,9 @@ private function curateAddressData(array $arrayAddress) : array
      *
      * @param CustomerInterface $customer
      * @return array
+     * @throws LocalizedException
      */
-    private function processCustomer(CustomerInterface $customer): array
+    public function execute(CustomerInterface $customer): array
     {
         $customerData = $this->serviceOutputProcessor->process(
             $customer,
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
similarity index 79%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerAccount.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
index b2f524c877fd6..8bd5c9157493c 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
@@ -10,6 +10,7 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -17,11 +18,12 @@
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 
 /**
- * Check customer account
+ * Get customer
  */
-class CheckCustomerAccount
+class GetCustomer
 {
     /**
      * @var AuthenticationInterface
@@ -54,39 +56,41 @@ public function __construct(
     }
 
     /**
-     * Check customer account
+     * Get customer
      *
-     * @param int|null $customerId
-     * @param int|null $customerType
-     * @return void
+     * @param ContextInterface $context
+     * @return CustomerInterface
+     * @throws GraphQlAuthenticationException
      * @throws GraphQlAuthorizationException
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
-     * @throws GraphQlAuthenticationException
      */
-    public function execute(?int $customerId, ?int $customerType): void
+    public function execute(ContextInterface $context): CustomerInterface
     {
-        if (true === $this->isCustomerGuest($customerId, $customerType)) {
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        if (true === $this->isUserGuest($currentUserId, $currentUserType)) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
         try {
-            $this->customerRepository->getById($customerId);
+            $customer = $this->customerRepository->getById($currentUserId);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(
-                __('Customer with id "%customer_id" does not exist.', ['customer_id' => $customerId]),
+                __('Customer with id "%customer_id" does not exist.', ['customer_id' => $currentUserId]),
                 $e
             );
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
 
-        if (true === $this->authentication->isLocked($customerId)) {
+        if (true === $this->authentication->isLocked($currentUserId)) {
             throw new GraphQlAuthenticationException(__('The account is locked.'));
         }
 
         try {
-            $confirmationStatus = $this->accountManagement->getConfirmationStatus($customerId);
+            $confirmationStatus = $this->accountManagement->getConfirmationStatus($currentUserId);
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
@@ -94,6 +98,7 @@ public function execute(?int $customerId, ?int $customerType): void
         if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
             throw new GraphQlAuthenticationException(__("This account isn't confirmed. Verify and try again."));
         }
+        return $customer;
     }
 
     /**
@@ -103,7 +108,7 @@ public function execute(?int $customerId, ?int $customerType): void
      * @param int|null $customerType
      * @return bool
      */
-    private function isCustomerGuest(?int $customerId, ?int $customerType): bool
+    private function isUserGuest(?int $customerId, ?int $customerType): bool
     {
         if (null === $customerId || null === $customerType) {
             return true;
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php b/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
deleted file mode 100644
index 1fcf1c0d7c1c3..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-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
-{
-    /**
-     * Set up user context after creating new customer account
-     *
-     * @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/Customer/UpdateCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
similarity index 72%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
index 33f16f3d94b7d..b58ea8f0d21ab 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
@@ -18,9 +18,9 @@
 use Magento\Framework\Api\DataObjectHelper;
 
 /**
- * Update customer data
+ * Update customer account data
  */
-class UpdateCustomerData
+class UpdateCustomerAccount
 {
     /**
      * @var CustomerRepositoryInterface
@@ -42,6 +42,11 @@ class UpdateCustomerData
      */
     private $dataObjectHelper;
 
+    /**
+     * @var ChangeSubscriptionStatus
+     */
+    private $changeSubscriptionStatus;
+
     /**
      * @var array
      */
@@ -52,6 +57,7 @@ class UpdateCustomerData
      * @param StoreManagerInterface $storeManager
      * @param CheckCustomerPassword $checkCustomerPassword
      * @param DataObjectHelper $dataObjectHelper
+     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
      * @param array $restrictedKeys
      */
     public function __construct(
@@ -59,6 +65,7 @@ public function __construct(
         StoreManagerInterface $storeManager,
         CheckCustomerPassword $checkCustomerPassword,
         DataObjectHelper $dataObjectHelper,
+        ChangeSubscriptionStatus $changeSubscriptionStatus,
         array $restrictedKeys = []
     ) {
         $this->customerRepository = $customerRepository;
@@ -66,34 +73,53 @@ public function __construct(
         $this->checkCustomerPassword = $checkCustomerPassword;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->restrictedKeys = $restrictedKeys;
+        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
     }
 
     /**
-     * Update account information
+     * Update customer account data
      *
-     * @param int $customerId
+     * @param CustomerInterface $customer
      * @param array $data
      * @return void
      * @throws GraphQlAlreadyExistsException
-     * @throws GraphQlInputException
      * @throws GraphQlAuthenticationException
+     * @throws GraphQlInputException
      */
-    public function execute(int $customerId, array $data): void
+    public function execute(CustomerInterface $customer, array $data): void
     {
-        $customer = $this->customerRepository->getById($customerId);
+        try {
+            $this->updateCustomer($customer, $data);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()));
+        }
 
-        $filteredData = array_diff_key($data, array_flip($this->restrictedKeys));
-        $this->dataObjectHelper->populateWithArray($customer, $filteredData, CustomerInterface::class);
+        if (isset($data['is_subscribed'])) {
+            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
+        }
+    }
 
+    /**
+     * @param CustomerInterface $customer
+     * @param array $data
+     * @throws GraphQlAlreadyExistsException
+     * @throws GraphQlAuthenticationException
+     * @throws GraphQlInputException
+     */
+    private function updateCustomer(CustomerInterface $customer, array $data): void
+    {
         if (isset($data['email']) && $customer->getEmail() !== $data['email']) {
             if (!isset($data['password']) || empty($data['password'])) {
                 throw new GraphQlInputException(__('Provide the current "password" to change "email".'));
             }
 
-            $this->checkCustomerPassword->execute($data['password'], $customerId);
+            $this->checkCustomerPassword->execute($data['password'], (int)$customer->getId());
             $customer->setEmail($data['email']);
         }
 
+        $filteredData = array_diff_key($data, array_flip($this->restrictedKeys));
+        $this->dataObjectHelper->populateWithArray($customer, $filteredData, CustomerInterface::class);
+
         $customer->setStoreId($this->storeManager->getStore()->getId());
 
         try {
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
index 78fa852a7ac59..b80c8a99ec59e 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
@@ -9,8 +9,8 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerPassword;
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -22,9 +22,9 @@
 class ChangePassword implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var CheckCustomerPassword
@@ -37,26 +37,26 @@ class ChangePassword implements ResolverInterface
     private $accountManagement;
 
     /**
-     * @var CustomerDataProvider
+     * @var ExtractCustomerData
      */
-    private $customerDataProvider;
+    private $extractCustomerData;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param CheckCustomerPassword $checkCustomerPassword
      * @param AccountManagementInterface $accountManagement
-     * @param CustomerDataProvider $customerDataProvider
+     * @param ExtractCustomerData $extractCustomerData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         CheckCustomerPassword $checkCustomerPassword,
         AccountManagementInterface $accountManagement,
-        CustomerDataProvider $customerDataProvider
+        ExtractCustomerData $extractCustomerData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->checkCustomerPassword = $checkCustomerPassword;
         $this->accountManagement = $accountManagement;
-        $this->customerDataProvider = $customerDataProvider;
+        $this->extractCustomerData = $extractCustomerData;
     }
 
     /**
@@ -69,24 +69,20 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($args['currentPassword'])) {
+        if (!isset($args['currentPassword']) || '' == trim($args['currentPassword'])) {
             throw new GraphQlInputException(__('Specify the "currentPassword" value.'));
         }
 
-        if (!isset($args['newPassword'])) {
+        if (!isset($args['newPassword']) || '' == trim($args['newPassword'])) {
             throw new GraphQlInputException(__('Specify the "newPassword" value.'));
         }
 
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+        $customer = $this->getCustomer->execute($context);
+        $customerId = (int)$customer->getId();
 
-        $currentUserId = (int)$currentUserId;
-        $this->checkCustomerPassword->execute($args['currentPassword'], $currentUserId);
+        $this->checkCustomerPassword->execute($args['currentPassword'], $customerId);
+        $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']);
 
-        $this->accountManagement->changePasswordById($currentUserId, $args['currentPassword'], $args['newPassword']);
-
-        $data = $this->customerDataProvider->getCustomerById($currentUserId);
-        return $data;
+        return $this->extractCustomerData->execute($customer);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
index 299045c6b62b0..1ae22bcc12792 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
@@ -7,16 +7,13 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\ChangeSubscriptionStatus;
-use Magento\CustomerGraphQl\Model\Customer\CreateAccount;
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
-use Magento\CustomerGraphQl\Model\Customer\SetUpUserContext;
-use Magento\Framework\Exception\State\InputMismatchException;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\CustomerGraphQl\Model\Customer\CreateCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 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\Framework\Validator\Exception as ValidatorException;
 
 /**
  * Create customer account resolver
@@ -24,41 +21,25 @@
 class CreateCustomer implements ResolverInterface
 {
     /**
-     * @var CustomerDataProvider
+     * @var ExtractCustomerData
      */
-    private $customerDataProvider;
+    private $extractCustomerData;
 
     /**
-     * @var ChangeSubscriptionStatus
+     * @var CreateCustomerAccount
      */
-    private $changeSubscriptionStatus;
+    private $createCustomerAccount;
 
     /**
-     * @var CreateAccount
-     */
-    private $createAccount;
-
-    /**
-     * @var SetUpUserContext
-     */
-    private $setUpUserContext;
-
-    /**
-     * @param CustomerDataProvider $customerDataProvider
-     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
-     * @param SetUpUserContext $setUpUserContext
-     * @param CreateAccount $createAccount
+     * @param ExtractCustomerData $extractCustomerData
+     * @param CreateCustomerAccount $createCustomerAccount
      */
     public function __construct(
-        CustomerDataProvider $customerDataProvider,
-        ChangeSubscriptionStatus $changeSubscriptionStatus,
-        SetUpUserContext $setUpUserContext,
-        CreateAccount $createAccount
+        ExtractCustomerData $extractCustomerData,
+        CreateCustomerAccount $createCustomerAccount
     ) {
-        $this->customerDataProvider = $customerDataProvider;
-        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
-        $this->createAccount = $createAccount;
-        $this->setUpUserContext = $setUpUserContext;
+        $this->extractCustomerData = $extractCustomerData;
+        $this->createCustomerAccount = $createCustomerAccount;
     }
 
     /**
@@ -74,22 +55,13 @@ public function resolve(
         if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
             throw new GraphQlInputException(__('"input" value should be specified'));
         }
-        try {
-            $customer = $this->createAccount->execute($args);
-            $customerId = (int)$customer->getId();
-            $this->setUpUserContext->execute($context, $customer);
-            if (array_key_exists('is_subscribed', $args['input'])) {
-                if ($args['input']['is_subscribed']) {
-                    $this->changeSubscriptionStatus->execute($customerId, true);
-                }
-            }
-            $data = $this->customerDataProvider->getCustomerById($customerId);
-        } catch (ValidatorException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
-        } catch (InputMismatchException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
-        }
 
+        $customer = $this->createCustomerAccount->execute($args['input']);
+
+        $context->setUserId((int)$customer->getId());
+        $context->setUserType(UserContextInterface::USER_TYPE_CUSTOMER);
+
+        $data = $this->extractCustomerData->execute($customer);
         return ['customer' => $data];
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
index 823444e5a2d7d..fd8122de961ee 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
@@ -7,14 +7,9 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\Data\AddressInterfaceFactory;
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressCreateDataValidator;
-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\CustomerGraphQl\Model\Customer\Address\CreateCustomerAddress as CreateCustomerAddressModel;
+use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -26,57 +21,33 @@
 class CreateCustomerAddress implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var AddressRepositoryInterface
+     * @var CreateCustomerAddressModel
      */
-    private $addressRepository;
+    private $createCustomerAddress;
 
     /**
-     * @var AddressInterfaceFactory
+     * @var ExtractCustomerAddressData
      */
-    private $addressInterfaceFactory;
+    private $extractCustomerAddressData;
 
     /**
-     * @var CustomerAddressDataProvider
-     */
-    private $customerAddressDataProvider;
-
-    /**
-     * @var DataObjectHelper
-     */
-    private $dataObjectHelper;
-
-    /**
-     * @var CustomerAddressCreateDataValidator
-     */
-    private $customerAddressCreateDataValidator;
-
-    /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param AddressRepositoryInterface $addressRepository
-     * @param AddressInterfaceFactory $addressInterfaceFactory
-     * @param CustomerAddressDataProvider $customerAddressDataProvider
-     * @param DataObjectHelper $dataObjectHelper
-     * @param CustomerAddressCreateDataValidator $customerAddressCreateDataValidator
+     * @param GetCustomer $getCustomer
+     * @param CreateCustomerAddressModel $createCustomerAddress
+     * @param ExtractCustomerAddressData $extractCustomerAddressData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        AddressRepositoryInterface $addressRepository,
-        AddressInterfaceFactory $addressInterfaceFactory,
-        CustomerAddressDataProvider $customerAddressDataProvider,
-        DataObjectHelper $dataObjectHelper,
-        CustomerAddressCreateDataValidator $customerAddressCreateDataValidator
+        GetCustomer $getCustomer,
+        CreateCustomerAddressModel $createCustomerAddress,
+        ExtractCustomerAddressData $extractCustomerAddressData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->addressRepository = $addressRepository;
-        $this->addressInterfaceFactory = $addressInterfaceFactory;
-        $this->customerAddressDataProvider = $customerAddressDataProvider;
-        $this->dataObjectHelper = $dataObjectHelper;
-        $this->customerAddressCreateDataValidator = $customerAddressCreateDataValidator;
+        $this->getCustomer = $getCustomer;
+        $this->createCustomerAddress = $createCustomerAddress;
+        $this->extractCustomerAddressData = $extractCustomerAddressData;
     }
 
     /**
@@ -89,36 +60,13 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-        $this->customerAddressCreateDataValidator->validate($args['input']);
-
-        $address = $this->createCustomerAddress((int)$currentUserId, $args['input']);
-        return $this->customerAddressDataProvider->getAddressData($address);
-    }
+        if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
+            throw new GraphQlInputException(__('"input" value should be specified'));
+        }
 
-    /**
-     * Create customer address
-     *
-     * @param int $customerId
-     * @param array $addressData
-     * @return AddressInterface
-     * @throws GraphQlInputException
-     */
-    private function createCustomerAddress(int $customerId, array $addressData) : AddressInterface
-    {
-        /** @var AddressInterface $address */
-        $address = $this->addressInterfaceFactory->create();
-        $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
-        $address->setCustomerId($customerId);
+        $customer = $this->getCustomer->execute($context);
 
-        try {
-            $address = $this->addressRepository->save($address);
-        } catch (InputException $e) {
-            throw new GraphQlInputException(__($e->getMessage()), $e);
-        }
-        return $address;
+        $address = $this->createCustomerAddress->execute((int)$customer->getId(), $args['input']);
+        return $this->extractCustomerAddressData->execute($address);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
index c3c78a1004da6..91048d4836c80 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
@@ -7,9 +7,9 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
@@ -19,25 +19,25 @@
 class Customer implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var CustomerDataProvider
+     * @var ExtractCustomerData
      */
-    private $customerDataProvider;
+    private $extractCustomerData;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param CustomerDataProvider $customerDataProvider
+     * @param GetCustomer $getCustomer
+     * @param ExtractCustomerData $extractCustomerData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        CustomerDataProvider $customerDataProvider
+        GetCustomer $getCustomer,
+        ExtractCustomerData $extractCustomerData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->customerDataProvider = $customerDataProvider;
+        $this->getCustomer = $getCustomer;
+        $this->extractCustomerData = $extractCustomerData;
     }
 
     /**
@@ -50,13 +50,8 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $currentUserId = (int)$currentUserId;
-        $data = $this->customerDataProvider->getCustomerById($currentUserId);
-        return $data;
+        return $this->extractCustomerData->execute($customer);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php
new file mode 100644
index 0000000000000..e6e3887de423c
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php
@@ -0,0 +1,71 @@
+<?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\Model\Customer;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
+
+/**
+ * Customers addresses field resolver
+ */
+class CustomerAddresses implements ResolverInterface
+{
+    /**
+     * @var GetCustomer
+     */
+    private $getCustomer;
+
+    /**
+     * @var ExtractCustomerAddressData
+     */
+    private $extractCustomerAddressData;
+
+    /**
+     * @param GetCustomer $getCustomer
+     * @param ExtractCustomerAddressData $extractCustomerAddressData
+     */
+    public function __construct(
+        GetCustomer $getCustomer,
+        ExtractCustomerAddressData $extractCustomerAddressData
+    ) {
+        $this->getCustomer = $getCustomer;
+        $this->extractCustomerAddressData = $extractCustomerAddressData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        /** @var Customer $customer */
+        $customer = $value['model'];
+
+        $addressesData = [];
+        $addresses = $customer->getAddresses();
+
+        if (count($addresses)) {
+            foreach ($addresses as $address) {
+                $addressesData[] = $this->extractCustomerAddressData->execute($address);
+            }
+        }
+        return $addressesData;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
index 084857c84d5a4..08e82d930f268 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
@@ -7,14 +7,13 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddressForUser;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\Address\DeleteCustomerAddress as DeleteCustomerAddressModel;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+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;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 
 /**
  * Customers address delete, used for GraphQL request processing.
@@ -22,33 +21,33 @@
 class DeleteCustomerAddress implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var AddressRepositoryInterface
+     * @var GetCustomerAddress
      */
-    private $addressRepository;
+    private $getCustomerAddress;
 
     /**
-     * @var GetCustomerAddressForUser
+     * @var DeleteCustomerAddressModel
      */
-    private $getCustomerAddressForUser;
+    private $deleteCustomerAddress;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param AddressRepositoryInterface $addressRepository
-     * @param GetCustomerAddressForUser $getCustomerAddressForUser
+     * @param GetCustomer $getCustomer
+     * @param GetCustomerAddress $getCustomerAddress
+     * @param DeleteCustomerAddressModel $deleteCustomerAddress
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        AddressRepositoryInterface $addressRepository,
-        GetCustomerAddressForUser $getCustomerAddressForUser
+        GetCustomer $getCustomer,
+        GetCustomerAddress $getCustomerAddress,
+        DeleteCustomerAddressModel $deleteCustomerAddress
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->addressRepository = $addressRepository;
-        $this->getCustomerAddressForUser = $getCustomerAddressForUser;
+        $this->getCustomer = $getCustomer;
+        $this->getCustomerAddress = $getCustomerAddress;
+        $this->deleteCustomerAddress = $deleteCustomerAddress;
     }
 
     /**
@@ -61,36 +60,14 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+        if (!isset($args['id']) || empty($args['id'])) {
+            throw new GraphQlInputException(__('Address "id" value should be specified'));
+        }
 
-        return $this->deleteCustomerAddress((int)$currentUserId, (int)$args['id']);
-    }
+        $customer = $this->getCustomer->execute($context);
+        $address = $this->getCustomerAddress->execute((int)$args['id'], (int)$customer->getId());
 
-    /**
-     * Delete customer address
-     *
-     * @param int $customerId
-     * @param int $addressId
-     * @return bool
-     * @throws GraphQlAuthorizationException
-     * @throws GraphQlNoSuchEntityException
-     */
-    private function deleteCustomerAddress($customerId, $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])
-            );
-        }
-        if ($address->isDefaultShipping()) {
-            throw new GraphQlAuthorizationException(
-                __('Customer Address %1 is set as default shipping address and can not be deleted', [$addressId])
-            );
-        }
-        return $this->addressRepository->delete($address);
+        $this->deleteCustomerAddress->execute($address);
+        return true;
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php
index 11ad0f77f8949..ddf1aec275ece 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsEmailAvailable.php
@@ -8,6 +8,7 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -42,11 +43,15 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $email = $args['email'] ?? null;
-        if (!$email) {
+        if (!isset($args['email']) || empty($args['email'])) {
             throw new GraphQlInputException(__('"Email should be specified'));
         }
-        $isEmailAvailable = $this->accountManagement->isEmailAvailable($email);
+
+        try {
+            $isEmailAvailable = $this->accountManagement->isEmailAvailable($args['email']);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
 
         return [
             'is_email_available' => $isEmailAvailable
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
index c0bd864b3ee09..fc5691d97cbfe 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
@@ -7,7 +7,7 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -19,9 +19,9 @@
 class IsSubscribed implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var SubscriberFactory
@@ -29,14 +29,14 @@ class IsSubscribed implements ResolverInterface
     private $subscriberFactory;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param SubscriberFactory $subscriberFactory
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         SubscriberFactory $subscriberFactory
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->subscriberFactory = $subscriberFactory;
     }
 
@@ -50,12 +50,9 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $status = $this->subscriberFactory->create()->loadByCustomerId((int)$currentUserId)->isSubscribed();
+        $status = $this->subscriberFactory->create()->loadByCustomerId((int)$customer->getId())->isSubscribed();
         return (bool)$status;
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
index 3301162dc0088..92779597e5afa 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
@@ -7,7 +7,7 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
@@ -19,9 +19,9 @@
 class RevokeCustomerToken implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var CustomerTokenServiceInterface
@@ -29,14 +29,14 @@ class RevokeCustomerToken implements ResolverInterface
     private $customerTokenService;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param CustomerTokenServiceInterface $customerTokenService
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         CustomerTokenServiceInterface $customerTokenService
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->customerTokenService = $customerTokenService;
     }
 
@@ -50,11 +50,8 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        return ['result' => $this->customerTokenService->revokeCustomerAccessToken((int)$currentUserId)];
+        return ['result' => $this->customerTokenService->revokeCustomerAccessToken((int)$customer->getId())];
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
index 50760d2e2e31c..7e06a2a063b4b 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
@@ -7,12 +7,11 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\ChangeSubscriptionStatus;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
-use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerData;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
@@ -22,41 +21,33 @@
 class UpdateCustomer implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var UpdateCustomerData
+     * @var UpdateCustomerAccount
      */
-    private $updateCustomerData;
+    private $updateCustomerAccount;
 
     /**
-     * @var ChangeSubscriptionStatus
+     * @var ExtractCustomerData
      */
-    private $changeSubscriptionStatus;
+    private $extractCustomerData;
 
     /**
-     * @var CustomerDataProvider
-     */
-    private $customerDataProvider;
-
-    /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param UpdateCustomerData $updateCustomerData
-     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
-     * @param CustomerDataProvider $customerDataProvider
+     * @param GetCustomer $getCustomer
+     * @param UpdateCustomerAccount $updateCustomerAccount
+     * @param ExtractCustomerData $extractCustomerData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        UpdateCustomerData $updateCustomerData,
-        ChangeSubscriptionStatus $changeSubscriptionStatus,
-        CustomerDataProvider $customerDataProvider
+        GetCustomer $getCustomer,
+        UpdateCustomerAccount $updateCustomerAccount,
+        ExtractCustomerData $extractCustomerData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->updateCustomerData = $updateCustomerData;
-        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
-        $this->customerDataProvider = $customerDataProvider;
+        $this->getCustomer = $getCustomer;
+        $this->updateCustomerAccount = $updateCustomerAccount;
+        $this->extractCustomerData = $extractCustomerData;
     }
 
     /**
@@ -73,19 +64,10 @@ public function resolve(
             throw new GraphQlInputException(__('"input" value should be specified'));
         }
 
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $currentUserId = (int)$currentUserId;
-        $this->updateCustomerData->execute($currentUserId, $args['input']);
-
-        if (isset($args['input']['is_subscribed'])) {
-            $this->changeSubscriptionStatus->execute($currentUserId, (bool)$args['input']['is_subscribed']);
-        }
+        $customer = $this->getCustomer->execute($context);
+        $this->updateCustomerAccount->execute($customer, $args['input']);
 
-        $data = $this->customerDataProvider->getCustomerById($currentUserId);
+        $data = $this->extractCustomerData->execute($customer);
         return ['customer' => $data];
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
index 833ab2e450280..bf41b7ddd10c9 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -7,13 +7,11 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\Data\AddressInterface;
-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\Framework\Api\DataObjectHelper;
+use Magento\CustomerGraphQl\Model\Customer\Address\ExtractCustomerAddressData;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\Address\UpdateCustomerAddress as UpdateCustomerAddressModel;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+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;
@@ -24,57 +22,41 @@
 class UpdateCustomerAddress implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
-     * @var AddressRepositoryInterface
+     * @var GetCustomerAddress
      */
-    private $addressRepository;
+    private $getCustomerAddress;
 
     /**
-     * @var CustomerAddressDataProvider
+     * @var UpdateCustomerAddressModel
      */
-    private $customerAddressDataProvider;
+    private $updateCustomerAddress;
 
     /**
-     * @var DataObjectHelper
+     * @var ExtractCustomerAddressData
      */
-    private $dataObjectHelper;
+    private $extractCustomerAddressData;
 
     /**
-     * @var CustomerAddressUpdateDataValidator
-     */
-    private $customerAddressUpdateDataValidator;
-
-    /**
-     * @var GetCustomerAddressForUser
-     */
-    private $getCustomerAddressForUser;
-
-    /**
-     * @param CheckCustomerAccount $checkCustomerAccount
-     * @param AddressRepositoryInterface $addressRepository
-     * @param CustomerAddressDataProvider $customerAddressDataProvider
-     * @param DataObjectHelper $dataObjectHelper
-     * @param CustomerAddressUpdateDataValidator $customerAddressUpdateDataValidator
-     * @param GetCustomerAddressForUser $getCustomerAddressForUser
+     * @param GetCustomer $getCustomer
+     * @param GetCustomerAddress $getCustomerAddress
+     * @param UpdateCustomerAddressModel $updateCustomerAddress
+     * @param ExtractCustomerAddressData $extractCustomerAddressData
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
-        AddressRepositoryInterface $addressRepository,
-        CustomerAddressDataProvider $customerAddressDataProvider,
-        DataObjectHelper $dataObjectHelper,
-        CustomerAddressUpdateDataValidator $customerAddressUpdateDataValidator,
-        GetCustomerAddressForUser $getCustomerAddressForUser
+        GetCustomer $getCustomer,
+        GetCustomerAddress $getCustomerAddress,
+        UpdateCustomerAddressModel $updateCustomerAddress,
+        ExtractCustomerAddressData $extractCustomerAddressData
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->addressRepository = $addressRepository;
-        $this->customerAddressDataProvider = $customerAddressDataProvider;
-        $this->dataObjectHelper = $dataObjectHelper;
-        $this->customerAddressUpdateDataValidator = $customerAddressUpdateDataValidator;
-        $this->getCustomerAddressForUser = $getCustomerAddressForUser;
+        $this->getCustomer = $getCustomer;
+        $this->getCustomerAddress = $getCustomerAddress;
+        $this->updateCustomerAddress = $updateCustomerAddress;
+        $this->extractCustomerAddressData = $extractCustomerAddressData;
     }
 
     /**
@@ -87,32 +69,18 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
-
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-        $this->customerAddressUpdateDataValidator->validate($args['input']);
-
-        $address = $this->updateCustomerAddress((int)$currentUserId, (int)$args['id'], $args['input']);
-        return $this->customerAddressDataProvider->getAddressData($address);
-    }
+        if (!isset($args['id']) || empty($args['id'])) {
+            throw new GraphQlInputException(__('Address "id" value should be specified'));
+        }
 
-    /**
-     * Update customer address
-     *
-     * @param int $customerId
-     * @param int $addressId
-     * @param array $addressData
-     * @return AddressInterface
-     */
-    private function updateCustomerAddress(int $customerId, int $addressId, array $addressData)
-    {
-        $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
-        $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
-        if (isset($addressData['region']['region_id'])) {
-            $address->setRegionId($address->getRegion()->getRegionId());
+        if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
+            throw new GraphQlInputException(__('"input" value should be specified'));
         }
 
-        return $this->addressRepository->save($address);
+        $customer = $this->getCustomer->execute($context);
+        $address = $this->getCustomerAddress->execute((int)$args['id'], (int)$customer->getId());
+
+        $this->updateCustomerAddress->execute($address, $args['input']);
+        return $this->extractCustomerAddressData->execute($address);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md b/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
deleted file mode 100644
index ae023224f4d9b..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Customer Graph Ql Functional Tests
-
-The Functional Test Module for **Magento Customer Graph Ql** module.
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index c5860005c6e0e..4e4fd1d0fa8ad 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -91,7 +91,7 @@ type Customer @doc(description: "Customer defines the customer name and address
     taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
     id: Int @doc(description: "The ID assigned to the customer")
     is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\IsSubscribed")
-    addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses")
+    addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CustomerAddresses")
     gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)")
 }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
similarity index 96%
rename from app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php
rename to app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
index 20212d3412595..840dedb4f274e 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
@@ -13,9 +13,9 @@
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
 /**
- * Extract the necessary address fields from an Address model
+ * Extract address fields from an Quote Address model
  */
-class ExtractDataFromAddress
+class ExtractQuoteAddressData
 {
     /**
      * @var ExtensibleDataObjectConverter
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
index cf277c729cdfd..0aafe0e7882d7 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -7,7 +7,8 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -26,9 +27,9 @@ class SetBillingAddressOnCart
     private $quoteAddressFactory;
 
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var GetCustomerAddress
@@ -42,18 +43,18 @@ class SetBillingAddressOnCart
 
     /**
      * @param QuoteAddressFactory $quoteAddressFactory
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param GetCustomerAddress $getCustomerAddress
      * @param AssignBillingAddressToCart $assignBillingAddressToCart
      */
     public function __construct(
         QuoteAddressFactory $quoteAddressFactory,
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         GetCustomerAddress $getCustomerAddress,
         AssignBillingAddressToCart $assignBillingAddressToCart
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->getCustomerAddress = $getCustomerAddress;
         $this->assignBillingAddressToCart = $assignBillingAddressToCart;
     }
@@ -99,8 +100,8 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
         if (null === $customerAddressId) {
             $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
         } else {
-            $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
-            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$context->getUserId());
+            $customer = $this->getCustomer->execute($context);
+            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
             $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
         }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index 8e54ab0d3feef..bbca7721754cb 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -7,7 +7,8 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
@@ -23,9 +24,9 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
     private $quoteAddressFactory;
 
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var GetCustomerAddress
@@ -39,18 +40,18 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
 
     /**
      * @param QuoteAddressFactory $quoteAddressFactory
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param GetCustomerAddress $getCustomerAddress
      * @param AssignShippingAddressToCart $assignShippingAddressToCart
      */
     public function __construct(
         QuoteAddressFactory $quoteAddressFactory,
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         GetCustomerAddress $getCustomerAddress,
         AssignShippingAddressToCart $assignShippingAddressToCart
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->getCustomerAddress = $getCustomerAddress;
         $this->assignShippingAddressToCart = $assignShippingAddressToCart;
     }
@@ -84,8 +85,8 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         if (null === $customerAddressId) {
             $shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
         } else {
-            $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
-            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$context->getUserId());
+            $customer = $this->getCustomer->execute($context);
+            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
             $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
         }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
index a03533ecefffa..a6bb0b0d04df1 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
@@ -11,7 +11,8 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromAddress;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
 
 /**
  * @inheritdoc
@@ -19,16 +20,16 @@
 class BillingAddress implements ResolverInterface
 {
     /**
-     * @var ExtractDataFromAddress
+     * @var ExtractQuoteAddressData
      */
-    private $extractDataFromAddress;
+    private $extractQuoteAddressData;
 
     /**
-     * @param ExtractDataFromAddress $extractDataFromAddress
+     * @param ExtractQuoteAddressData $extractQuoteAddressData
      */
-    public function __construct(ExtractDataFromAddress $extractDataFromAddress)
+    public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
     {
-        $this->extractDataFromAddress = $extractDataFromAddress;
+        $this->extractQuoteAddressData = $extractQuoteAddressData;
     }
 
     /**
@@ -39,6 +40,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
+        /** @var CartInterface $cart */
         $cart = $value['model'];
 
         $billingAddress = $cart->getBillingAddress();
@@ -46,7 +48,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             return null;
         }
 
-        $addressData = $this->extractDataFromAddress->execute($billingAddress);
+        $addressData = $this->extractQuoteAddressData->execute($billingAddress);
         return $addressData;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
index 3a55ef9ae25a8..eb3b0966740eb 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
@@ -11,7 +11,8 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromAddress;
+use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
 
 /**
  * @inheritdoc
@@ -19,16 +20,16 @@
 class ShippingAddresses implements ResolverInterface
 {
     /**
-     * @var ExtractDataFromAddress
+     * @var ExtractQuoteAddressData
      */
-    private $extractDataFromAddress;
+    private $extractQuoteAddressData;
 
     /**
-     * @param ExtractDataFromAddress $extractDataFromAddress
+     * @param ExtractQuoteAddressData $extractQuoteAddressData
      */
-    public function __construct(ExtractDataFromAddress $extractDataFromAddress)
+    public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
     {
-        $this->extractDataFromAddress = $extractDataFromAddress;
+        $this->extractQuoteAddressData = $extractQuoteAddressData;
     }
 
     /**
@@ -39,6 +40,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
+        /** @var Quote $cart */
         $cart = $value['model'];
 
         $addressesData = [];
@@ -46,7 +48,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         if (count($shippingAddresses)) {
             foreach ($shippingAddresses as $shippingAddress) {
-                $addressesData[] = $this->extractDataFromAddress->execute($shippingAddress);
+                $addressesData[] = $this->extractQuoteAddressData->execute($shippingAddress);
             }
         }
         return $addressesData;
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
index 5802115d44b5e..3e592cf061dfc 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 
 /**
  * Orders data reslover
@@ -24,20 +24,20 @@ class Orders implements ResolverInterface
     private $collectionFactory;
 
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @param CollectionFactoryInterface $collectionFactory
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      */
     public function __construct(
         CollectionFactoryInterface $collectionFactory,
-        CheckCustomerAccount $checkCustomerAccount
+        GetCustomer $getCustomer
     ) {
         $this->collectionFactory = $collectionFactory;
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
     }
 
     /**
@@ -50,11 +50,10 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $customerId = $context->getUserId();
-        $this->checkCustomerAccount->execute($customerId, $context->getUserType());
+        $customer = $this->getCustomer->execute($context);
 
         $items = [];
-        $orders = $this->collectionFactory->create($customerId);
+        $orders = $this->collectionFactory->create($customer->getId());
 
         /** @var \Magento\Sales\Model\Order $order */
         foreach ($orders as $order) {
diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php b/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
index 696dbf166fc38..cbdbbdcf010b6 100644
--- a/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
+++ b/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
@@ -14,7 +14,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Vault\Api\PaymentTokenManagementInterface;
 use Magento\Vault\Api\PaymentTokenRepositoryInterface;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 
 /**
  * Delete Payment Token resolver, used for GraphQL mutation processing.
@@ -22,9 +22,9 @@
 class DeletePaymentToken implements ResolverInterface
 {
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @var PaymentTokenManagementInterface
@@ -37,16 +37,16 @@ class DeletePaymentToken implements ResolverInterface
     private $paymentTokenRepository;
 
     /**
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      * @param PaymentTokenManagementInterface $paymentTokenManagement
      * @param PaymentTokenRepositoryInterface $paymentTokenRepository
      */
     public function __construct(
-        CheckCustomerAccount $checkCustomerAccount,
+        GetCustomer $getCustomer,
         PaymentTokenManagementInterface $paymentTokenManagement,
         PaymentTokenRepositoryInterface $paymentTokenRepository
     ) {
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
         $this->paymentTokenManagement = $paymentTokenManagement;
         $this->paymentTokenRepository = $paymentTokenRepository;
     }
@@ -65,12 +65,9 @@ public function resolve(
             throw new GraphQlInputException(__('Specify the "public_hash" value.'));
         }
 
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $token = $this->paymentTokenManagement->getByPublicHash($args['public_hash'], $currentUserId);
+        $token = $this->paymentTokenManagement->getByPublicHash($args['public_hash'], $customer->getId());
         if (!$token) {
             throw new GraphQlNoSuchEntityException(
                 __('Could not find a token using public hash: %1', $args['public_hash'])
diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php b/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
index 80e81037bb5dd..1563eaedf6b9b 100644
--- a/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
+++ b/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Vault\Model\PaymentTokenManagement;
-use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 
 /**
  * Customers Payment Tokens resolver, used for GraphQL request processing.
@@ -24,20 +24,20 @@ class PaymentTokens implements ResolverInterface
     private $paymentTokenManagement;
 
     /**
-     * @var CheckCustomerAccount
+     * @var GetCustomer
      */
-    private $checkCustomerAccount;
+    private $getCustomer;
 
     /**
      * @param PaymentTokenManagement $paymentTokenManagement
-     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param GetCustomer $getCustomer
      */
     public function __construct(
         PaymentTokenManagement $paymentTokenManagement,
-        CheckCustomerAccount $checkCustomerAccount
+        GetCustomer $getCustomer
     ) {
         $this->paymentTokenManagement = $paymentTokenManagement;
-        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->getCustomer = $getCustomer;
     }
 
     /**
@@ -50,12 +50,9 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $currentUserId = $context->getUserId();
-        $currentUserType = $context->getUserType();
+        $customer = $this->getCustomer->execute($context);
 
-        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
-
-        $tokens = $this->paymentTokenManagement->getVisibleAvailableTokens($currentUserId);
+        $tokens = $this->paymentTokenManagement->getVisibleAvailableTokens($customer->getId());
         $result = [];
 
         foreach ($tokens as $token) {
@@ -66,7 +63,6 @@ public function resolve(
                 'details' => $token->getTokenDetails(),
             ];
         }
-
         return ['items' => $result];
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
index 66b171740ccab..84c111bd25fd4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
@@ -77,7 +77,6 @@ public function testChangePasswordIfUserIsNotAuthorizedTest()
      */
     public function testChangeWeakPassword()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/190');
         $customerEmail = 'customer@example.com';
         $oldCustomerPassword = 'password';
         $newCustomerPassword = 'weakpass';
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 ba0232020298f..1153b9662b41a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
@@ -132,7 +132,7 @@ public function testDeleteDefaultBillingCustomerAddress()
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      *
      * @expectedException \Exception
-     * @expectedExceptionMessage Address id 9999 does not exist.
+     * @expectedExceptionMessage Could not find a address with ID "9999"
      */
     public function testDeleteNonExistCustomerAddress()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
index ee8fabc43c901..df45e1de771d9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
@@ -94,8 +94,7 @@ public function testUpdateCustomer()
         $this->assertEquals($newMiddlename, $response['updateCustomer']['customer']['middlename']);
         $this->assertEquals($newLastname, $response['updateCustomer']['customer']['lastname']);
         $this->assertEquals($newSuffix, $response['updateCustomer']['customer']['suffix']);
-        $newDobDate = new \DateTime($newDob);
-        $this->assertEquals($newDobDate->format('Y-m-d'), $response['updateCustomer']['customer']['dob']);
+        $this->assertEquals($newDob, $response['updateCustomer']['customer']['dob']);
         $this->assertEquals($newTaxVat, $response['updateCustomer']['customer']['taxvat']);
         $this->assertEquals($newEmail, $response['updateCustomer']['customer']['email']);
         $this->assertEquals($newGender, $response['updateCustomer']['customer']['gender']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 1a93c011e80a8..d37e04838ab37 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -376,7 +376,7 @@ public function testSetBillingAddressToAnotherCustomerCart()
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The current user cannot use address with ID "1"
+     * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
      */
     public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
index 4916bb2aa78c3..00332284d16df 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
@@ -428,7 +428,7 @@ public function testSetMultipleNewShippingAddresses()
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The current user cannot use address with ID "1"
+     * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
      */
     public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
     {

From 8ef99e010235e1978cf8c797e4adf7bf71f9cb77 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sat, 9 Mar 2019 11:51:55 +0100
Subject: [PATCH 0468/1055] Added test coverage for guest user

---
 .../GraphQl/Quote/Customer/CartTotalsTest.php |   2 +-
 .../GraphQl/Quote/Guest/CartTotalsTest.php    | 116 ++++++++++++++++++
 ...th_tax.php => quote_with_tax_customer.php} |   0
 ...p => quote_with_tax_customer_rollback.php} |   0
 .../Checkout/_files/quote_with_tax_guest.php  |  64 ++++++++++
 .../_files/quote_with_tax_guest_rollback.php  |  21 ++++
 6 files changed, 202 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
 rename dev/tests/integration/testsuite/Magento/Checkout/_files/{quote_with_tax.php => quote_with_tax_customer.php} (100%)
 rename dev/tests/integration/testsuite/Magento/Checkout/_files/{quote_with_tax_rollback.php => quote_with_tax_customer_rollback.php} (100%)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
index 36da00bdfa790..a6ddc7cff20cc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
@@ -49,7 +49,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_tax.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_tax_customer.php
      */
     public function testGetCartTotalsForCustomerWithTaxApplied()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
new file mode 100644
index 0000000000000..9396af53e0ccc
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test getting cart totals for guest
+ */
+class CartTotalsTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quoteFactory = $objectManager->create(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->create(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_tax_guest.php
+     */
+    public function testGetCartTotalsForCustomerWithTaxApplied()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_tax');
+
+        $query = <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    prices {
+      grand_total {
+        value,
+        currency
+      }
+      subtotal_including_tax {
+        value
+        currency
+      }
+      subtotal_excluding_tax {
+        value
+        currency
+      }
+      subtotal_with_discount_excluding_tax {
+        value
+        currency
+      }
+      applied_taxes {
+        label
+        amount {
+          value
+          currency
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('prices', $response['cart']);
+        $pricesResponse = $response['cart']['prices'];
+        self::assertEquals(10, $pricesResponse['grand_total']['value']);
+        self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+
+        $appliedTaxesResponse = $pricesResponse['applied_taxes'];
+
+        self::assertEquals('US-CA-*-Rate 1', $appliedTaxesResponse[0]['label']);
+        self::assertEquals(0.83, $appliedTaxesResponse[0]['amount']['value']);
+        self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax.php
rename to dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_rollback.php
rename to dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
new file mode 100644
index 0000000000000..75c20e45f11ed
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Model\Quote;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_tax.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var AddressInterface $quoteAddress */
+$quoteAddress = $objectManager->create(AddressInterface::class);
+$quoteAddress->setData(
+    [
+        'telephone' => 3468676,
+        'postcode' => 75477,
+        'country_id' => 'US',
+        'city' => 'CityM',
+        'company' => 'CompanyName',
+        'street' => 'Green str, 67',
+        'lastname' => 'Smith',
+        'firstname' => 'John',
+        'region_id' => 12
+    ]
+);
+//$quoteAddress->save();
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+$quote->setStoreId(
+    1
+)->setIsActive(
+    true
+)->setIsMultiShipping(
+    false
+)->setShippingAddress(
+    $quoteAddress
+)->setBillingAddress(
+    $quoteAddress
+)->setCheckoutMethod(
+    'customer'
+)->setReservedOrderId(
+    'test_order_tax'
+)->addProduct(
+    $product
+);
+
+$quote->getShippingAddress()->setRegionId(12);
+
+$quoteRepository = $objectManager->get(
+    \Magento\Quote\Api\CartRepositoryInterface::class
+);
+
+$quoteRepository->save($quote);
+
+/** @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();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest_rollback.php
new file mode 100644
index 0000000000000..6fcbdf7276de2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_tax_rollback.php';
+
+/** @var $objectManager ObjectManager */
+$objectManager = Bootstrap::getObjectManager();
+$quote = $objectManager->create(Quote::class);
+$quote->load('test_order_tax', 'reserved_order_id')->delete();
+
+/** @var QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(QuoteIdMask::class);
+$quoteIdMask->delete($quote->getId());

From 8210d824dc4accdb631a03f47f3d311e2ff74ad5 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sat, 9 Mar 2019 12:40:56 +0100
Subject: [PATCH 0469/1055] Use a single resolver for totals/taxes for
 performance improvement

---
 .../QuoteGraphQl/Model/Resolver/CartTaxes.php | 65 -------------------
 .../QuoteGraphQl/Model/Resolver/Totals.php    | 62 +++++++++++-------
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |  2 +-
 .../GraphQl/Quote/Customer/CartTotalsTest.php |  2 +-
 .../GraphQl/Quote/Guest/CartTotalsTest.php    |  2 +-
 5 files changed, 40 insertions(+), 93 deletions(-)
 delete mode 100644 app/code/Magento/QuoteGraphQl/Model/Resolver/CartTaxes.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartTaxes.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartTaxes.php
deleted file mode 100644
index 53782c488fb82..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartTaxes.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\QuoteGraphQl\Model\Resolver;
-
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\Quote\TotalsCollector;
-
-/**
- * @inheritdoc
- */
-class CartTaxes implements ResolverInterface
-{
-    /**
-     * @var TotalsCollector
-     */
-    private $totalsCollector;
-
-    /**
-     * @param TotalsCollector $totalsCollector
-     */
-    public function __construct(
-        TotalsCollector $totalsCollector
-    ) {
-        $this->totalsCollector = $totalsCollector;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-    {
-        if (!isset($value['model'])) {
-            throw new LocalizedException(__('"model" value should be specified'));
-        }
-
-        $data = [];
-
-        /** @var Quote $quote */
-        $quote = $value['model'];
-        $appliedTaxes = $this->totalsCollector->collectQuoteTotals($value['model'])->getAppliedTaxes();
-
-        if (count($appliedTaxes) == 0) {
-            return [];
-        }
-
-        $currency = $quote->getQuoteCurrencyCode();
-        foreach ($appliedTaxes as $appliedTax) {
-            $data[] = [
-                'label' => $appliedTax['id'],
-                'amount' => ['value' => $appliedTax['amount'], 'currency' => $currency]
-            ];
-        }
-
-        return $data;
-    }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php
index fd77d7a9d0efe..926f2b2de3cf2 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php
@@ -11,7 +11,8 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Quote\Api\CartTotalRepositoryInterface;
+use Magento\Quote\Model\Quote\Address\Total;
+use Magento\Quote\Model\Quote\TotalsCollector;
 
 /**
  * @inheritdoc
@@ -19,17 +20,17 @@
 class Totals implements ResolverInterface
 {
     /**
-     * @var CartTotalRepositoryInterface
+     * @var TotalsCollector
      */
-    private $cartTotalRepository;
+    private $totalsCollector;
 
     /**
-     * @param CartTotalRepositoryInterface $cartTotalRepository
+     * @param TotalsCollector $totalsCollector
      */
     public function __construct(
-        CartTotalRepositoryInterface $cartTotalRepository
+        TotalsCollector $totalsCollector
     ) {
-        $this->cartTotalRepository = $cartTotalRepository;
+        $this->totalsCollector = $totalsCollector;
     }
 
     /**
@@ -41,34 +42,45 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new LocalizedException(__('"model" value should be specified'));
         }
 
-        $cartTotals = $this->cartTotalRepository->get($value['model']->getId());
+        /** @var Quote $quote */
+        $quote = $value['model'];
+        $cartTotals = $this->totalsCollector->collectQuoteTotals($quote);
+        $currency = $quote->getQuoteCurrencyCode();
 
-        $currency = $cartTotals->getQuoteCurrencyCode();
-        $data = $this->addCurrencyCode([
-            'grand_total' => ['value' => $cartTotals->getGrandTotal(), ],
-            'subtotal_including_tax' => ['value' => $cartTotals->getSubtotalInclTax()],
-            'subtotal_excluding_tax' => ['value' => $cartTotals->getSubtotal()],
-            'subtotal_with_discount_excluding_tax' => ['value' => $cartTotals->getSubtotalWithDiscount()]
-        ], $currency);
-
-        $data['model'] = $value['model'];
-
-        return $data;
+        return [
+            'grand_total' => ['value' => $cartTotals->getGrandTotal(), 'currency' => $currency],
+            'subtotal_including_tax' => ['value' => $cartTotals->getSubtotalInclTax(), 'currency' => $currency],
+            'subtotal_excluding_tax' => ['value' => $cartTotals->getSubtotal(), 'currency' => $currency],
+            'subtotal_with_discount_excluding_tax' => [
+                'value' => $cartTotals->getSubtotalWithDiscount(), 'currency' => $currency
+            ],
+            'applied_taxes' => $this->getAppliedTaxes($cartTotals, $currency),
+            'model' => $quote
+        ];
     }
 
     /**
-     * Adds currency code to the totals
+     * Returns taxes applied to the current quote
      *
-     * @param array $totals
-     * @param string|null $currencyCode
+     * @param Total $total
+     * @param string $currency
      * @return array
      */
-    private function addCurrencyCode(array $totals, $currencyCode): array
+    private function getAppliedTaxes(Total $total, string $currency): array
     {
-        foreach ($totals as &$total) {
-            $total['currency'] = $currencyCode;
+        $appliedTaxes = $total->getAppliedTaxes();
+
+        if (count($appliedTaxes) === 0) {
+            return [];
+        }
+
+        foreach ($appliedTaxes as $appliedTax) {
+            $appliedTaxesData[] = [
+                'label' => $appliedTax['id'],
+                'amount' => ['value' => $appliedTax['amount'], 'currency' => $currency]
+            ];
         }
 
-        return $totals;
+        return $appliedTaxesData;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 24694303f4ec7..516da1512d047 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -125,7 +125,7 @@ type CartPrices {
     subtotal_including_tax: Money
     subtotal_excluding_tax: Money
     subtotal_with_discount_excluding_tax: Money
-    applied_taxes: [CartTaxItem] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartTaxes")
+    applied_taxes: [CartTaxItem]
 }
 
 type CartTaxItem {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
index a6ddc7cff20cc..f50ebf38aa1ee 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
@@ -90,7 +90,7 @@ public function testGetCartTotalsForCustomerWithTaxApplied()
 
         self::assertArrayHasKey('prices', $response['cart']);
         $pricesResponse = $response['cart']['prices'];
-        self::assertEquals(10, $pricesResponse['grand_total']['value']);
+        self::assertEquals(10.83, $pricesResponse['grand_total']['value']);
         self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
         self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
         self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
index 9396af53e0ccc..b399fea37951a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
@@ -90,7 +90,7 @@ public function testGetCartTotalsForCustomerWithTaxApplied()
 
         self::assertArrayHasKey('prices', $response['cart']);
         $pricesResponse = $response['cart']['prices'];
-        self::assertEquals(10, $pricesResponse['grand_total']['value']);
+        self::assertEquals(10.83, $pricesResponse['grand_total']['value']);
         self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
         self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
         self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);

From 269730337b2e10b6d4addc85a0cc60fff55e4289 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sat, 9 Mar 2019 15:30:01 +0100
Subject: [PATCH 0470/1055] Test coverage for cart with no tax applied

---
 .../GraphQl/Quote/Customer/CartTotalsTest.php | 68 ++++++++++++------
 .../GraphQl/Quote/Guest/CartTotalsTest.php    | 72 ++++++++++++-------
 .../_files/quote_with_address_guest.php       | 61 ++++++++++++++++
 .../quote_with_address_guest_rollback.php     | 21 ++++++
 .../Checkout/_files/quote_with_tax_guest.php  |  1 -
 5 files changed, 176 insertions(+), 47 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
index f50ebf38aa1ee..7efbc61be6cd0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
@@ -42,20 +42,62 @@ class CartTotalsTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->create(QuoteResource::class);
-        $this->quoteFactory = $objectManager->create(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->customerTokenService = $objectManager->create(CustomerTokenServiceInterface::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_tax_customer.php
      */
-    public function testGetCartTotalsForCustomerWithTaxApplied()
+    public function testGetCartTotalsWithTaxApplied()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_tax');
+        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
+        $response = $this->sendRequestWithToken($query);
+
+        self::assertArrayHasKey('prices', $response['cart']);
+        $pricesResponse = $response['cart']['prices'];
+        self::assertEquals(10.83, $pricesResponse['grand_total']['value']);
+        self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+
+        $appliedTaxesResponse = $pricesResponse['applied_taxes'];
+
+        self::assertEquals('US-CA-*-Rate 1', $appliedTaxesResponse[0]['label']);
+        self::assertEquals(0.83, $appliedTaxesResponse[0]['amount']['value']);
+        self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @group last
+     */
+    public function testGetTotalsWithNoTaxApplied()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
+        $response = $this->sendRequestWithToken($query);
+
+        $pricesResponse = $response['cart']['prices'];
+        self::assertEquals(20, $pricesResponse['grand_total']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+        self::assertEmpty($pricesResponse['applied_taxes']);
+    }
 
-        $query = <<<QUERY
+    /**
+     * Generates GraphQl query for retrieving cart totals
+     *
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartTotalsGraphqlQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
     prices {
@@ -86,20 +128,6 @@ public function testGetCartTotalsForCustomerWithTaxApplied()
   }
 }
 QUERY;
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('prices', $response['cart']);
-        $pricesResponse = $response['cart']['prices'];
-        self::assertEquals(10.83, $pricesResponse['grand_total']['value']);
-        self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
-
-        $appliedTaxesResponse = $pricesResponse['applied_taxes'];
-
-        self::assertEquals('US-CA-*-Rate 1', $appliedTaxesResponse[0]['label']);
-        self::assertEquals(0.83, $appliedTaxesResponse[0]['amount']['value']);
-        self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
index b399fea37951a..d634bd0acbaf9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -19,11 +18,6 @@
  */
 class CartTotalsTest extends GraphQlAbstract
 {
-    /**
-     * @var CustomerTokenServiceInterface
-     */
-    private $customerTokenService;
-
     /**
      * @var QuoteResource
      */
@@ -42,20 +36,60 @@ class CartTotalsTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->create(QuoteResource::class);
-        $this->quoteFactory = $objectManager->create(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->customerTokenService = $objectManager->create(CustomerTokenServiceInterface::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_tax_guest.php
      */
-    public function testGetCartTotalsForCustomerWithTaxApplied()
+    public function testGetCartTotalsWithTaxApplied()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_tax');
+        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('prices', $response['cart']);
+        $pricesResponse = $response['cart']['prices'];
+        self::assertEquals(10.83, $pricesResponse['grand_total']['value']);
+        self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+
+        $appliedTaxesResponse = $pricesResponse['applied_taxes'];
+
+        self::assertEquals('US-CA-*-Rate 1', $appliedTaxesResponse[0]['label']);
+        self::assertEquals(0.83, $appliedTaxesResponse[0]['amount']['value']);
+        self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_guest.php
+     */
+    public function testGetTotalsWithNoTaxApplied()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
 
-        $query = <<<QUERY
+        $pricesResponse = $response['cart']['prices'];
+        self::assertEquals(10, $pricesResponse['grand_total']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+        self::assertEmpty($pricesResponse['applied_taxes']);
+    }
+
+    /**
+     * Generates GraphQl query for retrieving cart totals
+     *
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartTotalsGraphqlQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
     prices {
@@ -86,20 +120,6 @@ public function testGetCartTotalsForCustomerWithTaxApplied()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('prices', $response['cart']);
-        $pricesResponse = $response['cart']['prices'];
-        self::assertEquals(10.83, $pricesResponse['grand_total']['value']);
-        self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
-
-        $appliedTaxesResponse = $pricesResponse['applied_taxes'];
-
-        self::assertEquals('US-CA-*-Rate 1', $appliedTaxesResponse[0]['label']);
-        self::assertEquals(0.83, $appliedTaxesResponse[0]['amount']['value']);
-        self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest.php
new file mode 100644
index 0000000000000..da496f01ec05d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Model\Quote;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/products.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var AddressInterface $quoteAddress */
+$quoteAddress = $objectManager->create(AddressInterface::class);
+$quoteAddress->setData(
+    [
+        'telephone' => 3468676,
+        'postcode' => 75477,
+        'country_id' => 'US',
+        'city' => 'CityM',
+        'company' => 'CompanyName',
+        'street' => 'Green str, 67',
+        'lastname' => 'Smith',
+        'firstname' => 'John',
+        'region_id' => 1
+    ]
+);
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+$quote->setStoreId(
+    1
+)->setIsActive(
+    true
+)->setIsMultiShipping(
+    false
+)->setShippingAddress(
+    $quoteAddress
+)->setBillingAddress(
+    $quoteAddress
+)->setCheckoutMethod(
+    'customer'
+)->setReservedOrderId(
+    'test_order_1'
+)->addProduct(
+    $product
+);
+
+$quoteRepository = $objectManager->get(
+    \Magento\Quote\Api\CartRepositoryInterface::class
+);
+
+$quoteRepository->save($quote);
+
+/** @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();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest_rollback.php
new file mode 100644
index 0000000000000..3130ca9353e92
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
+
+/** @var $objectManager ObjectManager */
+$objectManager = Bootstrap::getObjectManager();
+$quote = $objectManager->create(Quote::class);
+$quote->load('test_order_1', 'reserved_order_id')->delete();
+
+/** @var QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(QuoteIdMask::class);
+$quoteIdMask->delete($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
index 75c20e45f11ed..09d47f3cdca7b 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
@@ -25,7 +25,6 @@
         'region_id' => 12
     ]
 );
-//$quoteAddress->save();
 
 /** @var Quote $quote */
 $quote = $objectManager->create(Quote::class);

From 2aeb8748ce4cf467e81744276c81dd521452a6fe Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sun, 10 Mar 2019 09:58:15 +0100
Subject: [PATCH 0471/1055] Test case for getting totals with no quote address
 set

---
 .../GraphQl/Quote/Customer/CartTotalsTest.php | 21 +++++++++++++++++-
 .../GraphQl/Quote/Guest/CartTotalsTest.php    | 20 +++++++++++++++++
 ...uote_with_customer_no_address_rollback.php | 22 +++++++++++++++++++
 .../_files/quote_with_tax_customer.php        |  4 ++--
 .../Checkout/_files/quote_with_tax_guest.php  |  6 ++---
 5 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
index 7efbc61be6cd0..8dc6650b68f91 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
@@ -73,7 +73,6 @@ public function testGetCartTotalsWithTaxApplied()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @group last
      */
     public function testGetTotalsWithNoTaxApplied()
     {
@@ -89,6 +88,26 @@ public function testGetTotalsWithNoTaxApplied()
         self::assertEmpty($pricesResponse['applied_taxes']);
     }
 
+    /**
+     * The totals calculation is based on quote address.
+     * But the totals should be calculated even if no address is set
+     *
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_customer_no_address.php
+     */
+    public function testGetCartTotalsWithNoAddressSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
+        $response = $this->sendRequestWithToken($query);
+
+        $pricesResponse = $response['cart']['prices'];
+        self::assertEquals(10, $pricesResponse['grand_total']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+        self::assertEmpty($pricesResponse['applied_taxes']);
+    }
+
     /**
      * Generates GraphQl query for retrieving cart totals
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
index d634bd0acbaf9..19ef071b5040d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
@@ -81,6 +81,26 @@ public function testGetTotalsWithNoTaxApplied()
         self::assertEmpty($pricesResponse['applied_taxes']);
     }
 
+    /**
+     * The totals calculation is based on quote address.
+     * But the totals should be calculated even if no address is set
+     *
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testGetCartTotalsWithNoAddressSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        $pricesResponse = $response['cart']['prices'];
+        self::assertEquals(10, $pricesResponse['grand_total']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+        self::assertEmpty($pricesResponse['applied_taxes']);
+    }
+
     /**
      * Generates GraphQl query for retrieving cart totals
      *
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address_rollback.php
new file mode 100644
index 0000000000000..83c80d736c16b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address_rollback.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
+
+/** @var $objectManager ObjectManager */
+$objectManager = Bootstrap::getObjectManager();
+$quote = $objectManager->create(Quote::class);
+$quote->load('test_order_1', 'reserved_order_id')->delete();
+
+/** @var QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(QuoteIdMask::class);
+$quoteIdMask->delete($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php
index a8a02f5fe87e5..e9cb45b546a4e 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php
@@ -59,8 +59,8 @@
 $quoteRepository->save($quote);
 
 /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+$quoteIdMask = $objectManager
+    ->get(\Magento\Quote\Model\QuoteIdMaskFactory::class)
     ->create();
 $quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
index 09d47f3cdca7b..78d5b0739d763 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
@@ -39,7 +39,7 @@
 )->setBillingAddress(
     $quoteAddress
 )->setCheckoutMethod(
-    'customer'
+    'guest'
 )->setReservedOrderId(
     'test_order_tax'
 )->addProduct(
@@ -55,8 +55,8 @@
 $quoteRepository->save($quote);
 
 /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+$quoteIdMask = $objectManager
+    ->get(\Magento\Quote\Model\QuoteIdMaskFactory::class)
     ->create();
 $quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);

From 7cca7811bcc6004c6b9ae826ccdbd22c6be27e1d Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sun, 10 Mar 2019 09:58:59 +0100
Subject: [PATCH 0472/1055] Missing fixture

---
 .../_files/quote_with_customer_no_address.php | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address.php

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address.php
new file mode 100644
index 0000000000000..ef030f8bcd923
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Model\Quote;
+
+require __DIR__ . '/../../Customer/_files/customer.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/products.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+$customer = $customerRepository->get('customer@example.com');
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+$quote->setStoreId(
+    1
+)->setIsActive(
+    true
+)->setIsMultiShipping(
+    false
+)->assignCustomer(
+    $customer
+)->setCheckoutMethod(
+    'customer'
+)->setReservedOrderId(
+    'test_order_1'
+)->addProduct(
+    $product
+);
+
+$quoteRepository = $objectManager->get(
+    \Magento\Quote\Api\CartRepositoryInterface::class
+);
+
+$quoteRepository->save($quote);
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager
+    ->get(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+    ->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();

From 198e1b31bc52300fc8930accb2c59836596e4784 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Sun, 10 Mar 2019 10:40:24 +0100
Subject: [PATCH 0473/1055] GraphQL-423: Created a first test. Set the right
 structure to the mutation

---
 .../Customer/SetShippingMethodsOnCartTest.php | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 736ea69440753..223863e57b538 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -7,7 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\Catalog\Model\Product;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -38,6 +40,10 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
      * @var QuoteIdToMaskedQuoteIdInterface
      */
     private $quoteIdToMaskedId;
+    /**
+     * @var \Magento\Quote\Model\Quote\Address\Rate
+     */
+    private $rate;
 
     /**
      * @inheritdoc
@@ -49,11 +55,41 @@ protected function setUp()
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->rate = $objectManager->get(\Magento\Quote\Model\Quote\Address\Rate::class);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @throws \Exception
+     */
     public function testShippingMethodWithVirtualProduct()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_virtual_product', 'reserved_order_id');
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate_flatrate',
+            '1'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
     public function testShippingMethodWithSimpleProduct()
@@ -135,18 +171,18 @@ private function prepareMutationQuery(
   setShippingMethodsOnCart(input: 
     {
       cart_id: "$maskedQuoteId", 
-      shipping_addresses: [{
+      shipping_methods: [{
         cart_address_id: $shippingAddressId
-        shipping_method: {
-          method_code: "$shippingMethodCode"
-          carrier_code: "$shippingCarrierCode"
-        }
+        method_code: "$shippingMethodCode"
+        carrier_code: "$shippingCarrierCode"
       }]
-      }) {
-    
+    } ) 
+    {
     cart {
-      cart_id,
       shipping_addresses {
+        address_id
+        firstname
+        lastname
         selected_shipping_method {
           carrier_code
           method_code

From ceace793a08a14054c3f88f57488fc435da339c6 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Sun, 10 Mar 2019 20:32:00 +0100
Subject: [PATCH 0474/1055] GraphQL-423: Added more test cases for
 SetShippingMethod test. Part I finished. Half of the way

---
 .../Customer/SetShippingMethodsOnCartTest.php | 220 +++++++++++++++++-
 1 file changed, 210 insertions(+), 10 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 223863e57b538..238cff96185d7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -7,7 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Quote\Model\Quote\Address\Rate;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
@@ -40,11 +42,17 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
      * @var QuoteIdToMaskedQuoteIdInterface
      */
     private $quoteIdToMaskedId;
+
     /**
-     * @var \Magento\Quote\Model\Quote\Address\Rate
+     * @var Rate
      */
     private $rate;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @inheritdoc
      */
@@ -55,13 +63,13 @@ protected function setUp()
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->rate = $objectManager->get(\Magento\Quote\Model\Quote\Address\Rate::class);
+        $this->rate = $objectManager->get(Rate::class);
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
      * @throws \Exception
      */
     public function testShippingMethodWithVirtualProduct()
@@ -92,39 +100,227 @@ public function testShippingMethodWithVirtualProduct()
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testShippingMethodWithSimpleProduct()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        /** @var Product $product */
+        $product = $this->productRepository->get('simple');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $quote->addProduct($product, 1);
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $shippingAddress->getId()
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testShippingMethodWithSimpleProductWithoutAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $shippingAddress->getId()
+        );
+
+        self::expectExceptionMessage(
+            'The shipping address is missing. Set the address and try again.'
+        );
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodWithMissedRequiredParameters()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_1', 1);
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            '',
+            '',
+            '1'
+        );
+
+        self::expectExceptionMessage(
+            'Required parameter "carrier_code" is missing.'
+        );
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetNonExistentShippingMethod()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        /** @var Product $product */
+        $product = $this->productRepository->get('simple');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $quote->addProduct($product, 1);
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'non-existed-method-code',
+            'non-existed-carrier-code',
+            $shippingAddress->getId()
+        );
+
+        self::expectExceptionMessage(
+            'Carrier with such method not found: non-existed-carrier-code, non-existed-method-code'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodIfAddressIsNotBelongToCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        /** @var Product $product */
+        $product = $this->productRepository->get('simple');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $quote->addProduct($product, 1);
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            '2'
+        );
+
+        self::expectExceptionMessage(
+            'Could not find a cart address with ID "2"'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
+     * @throws \Exception
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testSetShippingMethodToNonExistentCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            '1'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToGuestCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('guest_quote');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'guest_quote', 'reserved_order_id');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $quote->getShippingAddress()->getId()
+        );
+
+        $this->graphQlQuery($mutation);
     }
 
     public function testSetShippingMethodToAnotherCustomerCart()
@@ -197,6 +393,10 @@ private function prepareMutationQuery(
 QUERY;
     }
 
+    private function addShippingMethodToQuote(Quote $quote)
+    {
+    }
+
     /**
      * @param string $reversedQuoteId
      * @return string

From 052f404098d36cb658066b6ae8b408e223f76c3d Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Mon, 11 Mar 2019 11:50:10 +0400
Subject: [PATCH 0475/1055] MAGETWO-96127: Catalog grid page number resets
 after Save and Close action

- Update automated test script
---
 .../Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml | 5 +++--
 .../Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml | 6 ++++++
 .../Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
index 5e6fb4c989c7d..fda1b0284f782 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
@@ -32,6 +32,7 @@
         <after>
             <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
             <waitForPageLoad stepKey="waitForProductIndexPage"/>
+            <click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="clickPrevPageOrderGrid"/>
             <actionGroup ref="adminDataGridDeleteCustomPerPage" stepKey="deleteCustomAddedPerPage">
                 <argument name="perPage" value="Const.one"/>
             </actionGroup>
@@ -46,8 +47,8 @@
         <actionGroup ref="adminDataGridSelectCustomPerPage" stepKey="select1OrderPerPage">
             <argument name="perPage" value="Const.one"/>
         </actionGroup>
-        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="1" stepKey="seeOnFirstPageOrderGrid"/>
-        <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid" after="seeOnFirstPageOrderGrid"/>
+
+        <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
             <argument name="product" value="$$product2$$"/>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
index 46417a842c9c2..d291cecfb8917 100644
--- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
@@ -23,9 +23,12 @@
         </arguments>
         <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
         <click selector="{{AdminDataGridPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomPerPage"/>
+        <waitForElementVisible selector="{{AdminDataGridPaginationSection.perPageInput}}" time="30" stepKey="waitForInputVisible"/>
         <fillField selector="{{AdminDataGridPaginationSection.perPageInput}}" userInput="{{perPage}}" stepKey="fillCustomPerPage"/>
         <click selector="{{AdminDataGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown1"/>
+        <seeElement selector="{{AdminDataGridPaginationSection.perPageDropDownItem(perPage)}}" stepKey="seeDropDownItem"/>
     </actionGroup>
 
     <actionGroup name="adminDataGridDeleteCustomPerPage">
@@ -34,7 +37,10 @@
         </arguments>
         <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown1"/>
         <click selector="{{AdminDataGridPaginationSection.perPageEditCustomValue(perPage)}}" stepKey="clickToEditCustomPerPage"/>
+        <waitForElementVisible selector="{{AdminDataGridPaginationSection.perPageDeleteCustomValue(perPage)}}" time="30" stepKey="waitForDeleteButtonVisible"/>
         <click selector="{{AdminDataGridPaginationSection.perPageDeleteCustomValue(perPage)}}" stepKey="clickToDeleteCustomPerPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown"/>
+        <dontSeeElement selector="{{AdminDataGridPaginationSection.perPageDropDownItem(perPage)}}" stepKey="dontSeeDropDownItem"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
index 17d20305233b4..3f4fbb20eec29 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
@@ -11,8 +11,9 @@
     <section name="AdminDataGridPaginationSection">
         <element name="perPageDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
         <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{var1}}']" parameterized="true"/>
-        <element name="perPageInput" type="input" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//input"/>
-        <element name="perPageApplyInput" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//button"/>
+        <element name="perPageInput" type="input" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li[@class='_edit']//div[@class='selectmenu-item-edit']//input"/>
+        <element name="perPageApplyInput" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li[@class='_edit']//div[@class='selectmenu-item-edit']//button"/>
+        <element name="perPageDropDownItem" type="button" selector="//*[@class='selectmenu-items _active']//button[@class='selectmenu-item-action' and text()='{{var}}']" timeout="30" parameterized="true"/>
         <element name="perPageEditCustomValue" type="button" selector="//div[@class='selectmenu-items _active']//div[@class='selectmenu-item']//button[text()='{{var1}}']/following-sibling::button[@class='action-edit']" parameterized="true"/>
         <element name="perPageDeleteCustomValue" type="button" selector="//div[@class='selectmenu-items _active']//div[@class='selectmenu-item']//button[text()='{{var2}}']/parent::div/preceding-sibling::div/button[@class='action-delete']" parameterized="true"/>
         <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>

From 07c0fbecda260f97ba4c8eb5298ff99ed63e12a7 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Mon, 11 Mar 2019 10:57:54 +0200
Subject: [PATCH 0476/1055] Test coverage: Add product to Cart with wrong cart
 hash

---
 .../Quote/AddSimpleProductToCartTest.php      | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
index d5bdb942e9b2c..34e73070945d6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
@@ -81,6 +81,45 @@ public function testAddProductIfQuantityIsNotAvailable()
     }
   }
 }
+QUERY;
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "wrong_cart_hash"
+     */
+    public function testAddProductWithWrongCartHash()
+    {
+        $sku = 'simple';
+        $qty = 1;
+
+        $maskedQuoteId = 'wrong_cart_hash';
+
+        $query = <<<QUERY
+mutation {  
+  addSimpleProductsToCart(
+    input: {
+      cart_id: "{$maskedQuoteId}"
+      cartItems: [
+        {
+          data: {
+            qty: $qty
+            sku: "$sku"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      items {
+        qty
+      }
+    }
+  }
+}
 QUERY;
 
         $this->graphQlQuery($query);

From c5d1d62e10b3e024bd3d4295745a4440b062f9a7 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 11 Mar 2019 11:31:28 +0200
Subject: [PATCH 0477/1055] MAGETWO-96416: Clicking on a Root Category causes
 all other Root Categories to be expanded to the top-level categories

---
 .../Test/Mftf/Section/AdminCategorySidebarTreeSection.xml    | 1 +
 app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml    | 1 -
 ...dminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml | 5 +++--
 ...AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
index 14e714cb2b6b7..fba28b3feaff1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -16,5 +16,6 @@
         <element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>
         <element name="lastCreatedCategory" type="block" selector=".x-tree-root-ct li li:last-child" />
         <element name="treeContainer" type="block" selector=".tree-holder" />
+        <element name="expandRootCategory" type="text" selector="img.x-tree-elbow-end-plus"/>
     </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 4fb008eb422d3..ff6167ffc10e0 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -109,7 +109,6 @@
         <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
         <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />
         <element name="ButtonToShow" type="multiselect" selector="select[name='parameters[show_buttons][]']"/>
-        <element name="ExpandRootCategory" type="text" selector="img.x-tree-elbow-end-plus"/>
         <!--Compare on Storefront-->
         <element name="ProductName" type="text" selector=".product.name.product-item-name" />
         <element name="CompareBtn" type="button" selector=".action.tocompare"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
index 89f0439bd65b4..393e25e474f12 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
@@ -46,8 +46,9 @@
         <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Category Link Block Template" stepKey="selectTemplate" />
         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectCategoryBtn" />
         <waitForLoadingMaskToDisappear stepKey="wait3"/>
-        <click selector="{{WidgetSection.ExpandRootCategory}}" stepKey="expandRootCategory" />
-        <click userInput="$$createPreReqCategory.name$$" stepKey="selectPreCreateCategory" />
+        <click selector="{{AdminCategorySidebarTreeSection.expandRootCategory}}" stepKey="expandRootCategory" />
+        <waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
+        <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCreateCategory" />
         <waitForElementNotVisible selector="{{WidgetSection.SelectCategoryTitle}}" stepKey="waitForSlideoutCloses1" />
         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget" />
         <waitForElementNotVisible selector="{{WidgetSection.InsertWidgetTitle}}" stepKey="waitForSlideOutCloses2" />
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
index 3b79770badca4..9ee9d27de477a 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
@@ -50,7 +50,8 @@
         <selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="Product Link Block Template" stepKey="selectTemplate" />
         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
         <waitForLoadingMaskToDisappear stepKey="wait4"/>
-        <click selector="{{WidgetSection.ExpandRootCategory}}" stepKey="expandRootCategory" />
+        <click selector="{{AdminCategorySidebarTreeSection.expandRootCategory}}" stepKey="expandRootCategory" />
+        <waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
         <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
         <waitForLoadingMaskToDisappear stepKey="waitLoadingMask" />
         <click selector="{{WidgetSection.PreCreateProduct('$$createPreReqProduct.name$$')}}" stepKey="selectPreProduct" />

From 348eeb6d5769882b91c90cc0fe40c49c95af9279 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 11 Mar 2019 12:30:48 +0200
Subject: [PATCH 0478/1055] ENGCOM-4438: Static test fix.

---
 .../Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
index c8edefa00cc86..c8e2d356b3ffb 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
@@ -7,13 +7,15 @@
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Sitemap\Controller\Adminhtml\Sitemap;
 use Magento\Store\Model\App\Emulation;
 use Magento\Framework\App\ObjectManager;
 
 /**
  * Generate sitemap file
  */
-class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
+class Generate extends Sitemap implements HttpGetActionInterface
 {
     /** @var \Magento\Store\Model\App\Emulation $appEmulation */
     private $appEmulation;

From f46d5b0fe00356cb2d16ab5cffe8fd9eebd86fdb Mon Sep 17 00:00:00 2001
From: Ansari <ziyaurrahman@krishtechnolabs.com>
Date: Mon, 11 Mar 2019 16:29:05 +0530
Subject: [PATCH 0479/1055] Spelling Correction

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b86c7b79a0cbd..671071828b494 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -489,7 +489,7 @@ Tests:
     * Fixed an issue where found records in global search in Backend could not be selected via keyboard
     * Fixed an issue where Category menu items went out of screen when page side was reached
     * Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
-    * Fixed an issue where popup header was our of window range while creating group product
+    * Fixed an issue where popup header was out of window range while creating group product
     * Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
     * Fixed an ability to edit the Order from Admin panel
     * Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout

From ace7f4c3f568e8dee4c6b1d6f9d06428368d53e2 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Mon, 11 Mar 2019 13:59:54 +0300
Subject: [PATCH 0480/1055] MAGETWO-58219: Product Attribute Option Values for
 storeview instead of admin on product creation

- Removed area check in data provider
---
 .../DataProvider/Product/Form/Modifier/Eav.php   | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

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 c96fe54a87620..8326c3b531892 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -35,7 +35,6 @@
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\CompositeConfigProcessor;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory as AttributeCollectionFactory;
-use Magento\Framework\App\State;
 
 /**
  * Class Eav
@@ -214,11 +213,6 @@ class Eav extends AbstractModifier
      */
     private $scopeConfig;
 
-    /**
-     * @var State
-     */
-    private $state;
-
     /**
      * Eav constructor.
      * @param LocatorInterface $locator
@@ -243,7 +237,6 @@ class Eav extends AbstractModifier
      * @param CompositeConfigProcessor|null $wysiwygConfigProcessor
      * @param ScopeConfigInterface|null $scopeConfig
      * @param AttributeCollectionFactory $attributeCollectionFactory
-     * @param State $state
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -268,8 +261,7 @@ public function __construct(
         $attributesToEliminate = [],
         CompositeConfigProcessor $wysiwygConfigProcessor = null,
         ScopeConfigInterface $scopeConfig = null,
-        AttributeCollectionFactory $attributeCollectionFactory = null,
-        State $state = null
+        AttributeCollectionFactory $attributeCollectionFactory = null
     ) {
         $this->locator = $locator;
         $this->catalogEavValidationRules = $catalogEavValidationRules;
@@ -296,8 +288,6 @@ public function __construct(
         ->get(ScopeConfigInterface::class);
         $this->attributeCollectionFactory = $attributeCollectionFactory
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeCollectionFactory::class);
-        $this->state = $state ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(State::class);
     }
 
     /**
@@ -686,9 +676,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         // TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done
         $attributeModel = $this->getAttributeModel($attribute);
         if ($attributeModel->usesSource()) {
-            $options = ($this->state->getAreaCode() == \Magento\Framework\App\Area::AREA_ADMINHTML)
-                ? $attributeModel->getSource()->getAllOptions(true, true)
-                : $attributeModel->getSource()->getAllOptions();
+            $options = $attributeModel->getSource()->getAllOptions(true, true);
             $meta = $this->arrayManager->merge($configPath, $meta, [
                 'options' => $this->convertOptionsValueToString($options),
             ]);

From c26ce0e8290bfffe9e4257355be106f8b0e7b60e Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <d.cheshun@atwix.com>
Date: Mon, 11 Mar 2019 13:07:44 +0200
Subject: [PATCH 0481/1055] Fix static test

---
 .../Adminhtml/Product/Attribute/Edit/Tab/Advanced.php     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index 564969d9bb913..1b6756968662f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -4,11 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Product attribute add/edit form main tab
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
 use Magento\Backend\Block\Widget\Form\Generic;
@@ -18,6 +13,8 @@
 use Magento\Framework\App\ObjectManager;
 
 /**
+ * Product attribute add/edit form main tab
+ *
  * @api
  * @since 100.0.2
  */
@@ -73,6 +70,7 @@ public function __construct(
      * Adding product form elements for editing attribute
      *
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD)
      */
     protected function _prepareForm()

From 2f42295614f85355f029e6346278e2e24708ecd2 Mon Sep 17 00:00:00 2001
From: dharmesh vaja <dharmesh.vaja@rocketbazaar.com>
Date: Mon, 11 Mar 2019 18:22:06 +0530
Subject: [PATCH 0482/1055] Updated code

---
 app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php | 3 ++-
 1 file changed, 2 insertions(+), 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 9c511efd22c4b..eeef2076d6ae4 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -93,7 +93,7 @@ public function testGetChildHtml()
         /** @var \PHPUnit_Framework_MockObject_MockObject */
         $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setOrder', 'setCustomerFilter', 'load'])
+            ->setMethods(['setOrder', 'setCustomerFilter', 'load','addFieldToFilter'])
             ->getMock();
 
         $layout->expects($this->atLeastOnce())->method('getChildName')->with('NameInLayout', 'pager')
@@ -108,6 +108,7 @@ public function testGetChildHtml()
             ->willReturnSelf();
         $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
             ->willReturnSelf();
+        $addressCollection->expects(static::any())->method('addFieldToFilter')->willReturnSelf();
         $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
             ->willReturn($addressCollection);
         $block->expects($this->atLeastOnce())->method('setCollection')->with($addressCollection)->willReturnSelf();

From 311d739e70129a9566ffdba36dab76fac5392130 Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Mon, 11 Mar 2019 08:23:29 -0500
Subject: [PATCH 0483/1055] MC-4436: Convert CreateSearchTermEntityTest to MFTF

---
 ...chTermEntityTest.xml => AdminCreateSearchTermEntityTest.xml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename app/code/Magento/CatalogSearch/Test/Mftf/Test/{CreateSearchTermEntityTest.xml => AdminCreateSearchTermEntityTest.xml} (98%)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/CreateSearchTermEntityTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCreateSearchTermEntityTest.xml
similarity index 98%
rename from app/code/Magento/CatalogSearch/Test/Mftf/Test/CreateSearchTermEntityTest.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCreateSearchTermEntityTest.xml
index a710f3dd8fa5c..2b425f34f8a5b 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/CreateSearchTermEntityTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCreateSearchTermEntityTest.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="CreateSearchTermTest">
+    <test name="AdminCreateSearchTermEntityTest">
         <annotations>
             <stories value="Search terms"/>
             <title value="Create search term test"/>

From 2363896edb0a8d7707a2f71862cf8d0de6423f4a Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Mon, 11 Mar 2019 15:34:43 +0200
Subject: [PATCH 0484/1055] mutations add<Product Type>ProductsToCart dosn't
 check if the cart is active

---
 .../QuoteGraphQl/Model/Cart/GetCartForUser.php    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index 33c91b03ee375..fa2b924d44bf5 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -85,12 +85,15 @@ public function execute(string $cartHash, ?int $customerId): Quote
             );
         }
 
-        try {
-            return $this->cartRepository->getActiveForCustomer($customerId);
-        } catch (\Exception $e) {
-            throw new GraphQlNoSuchEntityException(
-                __('Current customer does not have an active cart.')
-            );
+        if ($customerId) {
+            try {
+                return $this->cartRepository->getActiveForCustomer($customerId);
+            } catch (\Exception $e) {
+                throw new GraphQlNoSuchEntityException(
+                    __($e->getMessage())
+                );
+            }
         }
+        return $cart;
     }
 }

From e3b875b4796616f164ba98fead8c741cf37c3ae3 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 11 Mar 2019 16:08:58 +0200
Subject: [PATCH 0485/1055] Fix static test.

---
 .../module/data-grid/data-grid-header/_data-grid-filters.less   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
index ef4481bdd520b..e37e08f3b667d 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-filters.less
@@ -99,7 +99,7 @@
     }
 
     .action-menu {
-        max-height: 3.85rem * @data-grid-search-control-action-menu-item__quantity; // ToDo UI: change static item height
+        max-height: 3.85rem * @data-grid-search-control-action-menu-item__quantity; // @todo: change static item height
         overflow-y: auto;
         z-index: @data-grid-search-menu__z-index;
     }

From 034a86293611956dd2e3ae90a44817755a247076 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Mon, 11 Mar 2019 17:27:57 +0300
Subject: [PATCH 0486/1055] MAGETWO-64838: Unable to create order from store
 front if customer address custom attribute is required.

- Added additial checks before call attribute preprocessors;
---
 .../CustomAttribute/PreprocessorInterface.php |  7 ++++
 .../Webapi/ServiceInputProcessor.php          | 34 +++++++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
index 26a13ebcc07b7..820936abd49ba 100644
--- a/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
@@ -26,4 +26,11 @@ public function shouldBeProcessed($key, $attribute);
      * @param mixed $attribute
      */
     public function process($key, &$attribute);
+
+    /**
+     * Get list of affected attributes for the current preprocessor
+     *
+     * @return array
+     */
+    public function getAffectedAttributes();
 }
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index 45f2a8b931101..a116e0be8649f 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -78,6 +78,11 @@ class ServiceInputProcessor implements ServicePayloadConverterInterface
      */
     private $customAttributePreprocessors;
 
+    /**
+     * @var array
+     */
+    private $attributesPreprocessorsMap = [];
+
     /**
      * Initialize dependencies.
      *
@@ -296,9 +301,12 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
     {
         $result = [];
         $dataObjectClassName = ltrim($dataObjectClassName, '\\');
+        $attributesPreprocessorMap = $this->getAttributesPreprocessorsMap();
 
         foreach ($customAttributesValueArray as $key => $customAttribute) {
-            $this->runCustomAttributePreprocessors($key, $customAttribute);
+            if($key && is_array($customAttribute) && array_key_exists($key, $attributesPreprocessorMap)) {
+                $this->runCustomAttributePreprocessors($key, $customAttribute, $attributesPreprocessorMap[$key]);
+            }
             if (!is_array($customAttribute)) {
                 $customAttribute = [AttributeValue::ATTRIBUTE_CODE => $key, AttributeValue::VALUE => $customAttribute];
             }
@@ -339,6 +347,24 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
         return $result;
     }
 
+    /**
+     * Get map of preprocessors related to the custom attributes
+     *
+     * @return array
+     */
+    private function getAttributesPreprocessorsMap()
+    {
+        if (!$this->attributesPreprocessorsMap) {
+            foreach ($this->customAttributePreprocessors as $attributePreprocessor) {
+                foreach ($attributePreprocessor->getAffectedAttributes() as $attributeKey) {
+                    $this->attributesPreprocessorsMap[$attributeKey][] = get_class($attributePreprocessor);
+                }
+            }
+        }
+
+        return $this->attributesPreprocessorsMap;
+    }
+
     /**
      * Prepare attribute value by loaded attribute preprocessors
      *
@@ -346,10 +372,12 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
      * @param mixed $customAttribute
      * @return bool
      */
-    private function runCustomAttributePreprocessors($key, &$customAttribute)
+    private function runCustomAttributePreprocessors($key, &$customAttribute, $preprocessorlsList)
     {
         foreach ($this->customAttributePreprocessors as $attributePreprocessor) {
-            if ($attributePreprocessor->shouldBeProcessed($key, $customAttribute)) {
+            if (array_key_exists(get_class($attributePreprocessor), $preprocessorlsList)
+                && $attributePreprocessor->shouldBeProcessed($key, $customAttribute)
+            ) {
                 $attributePreprocessor->process($key, $customAttribute);
             }
         }

From fddee1591157e284595fff3ebfb031470c5478b2 Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@adobe.com>
Date: Mon, 11 Mar 2019 09:40:55 -0500
Subject: [PATCH 0487/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Backend/ConsumerWebsiteAssign.php         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
index b47d65e310070..15f9e4833b269 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
@@ -39,11 +39,6 @@ class ConsumerWebsiteAssign
      */
     private $serializer;
 
-    /**
-     * @var \Magento\Framework\Bulk\OperationManagementInterface
-     */
-    private $operationManagement;
-
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
      */
@@ -54,31 +49,36 @@ class ConsumerWebsiteAssign
      */
     private $entityManager;
 
+    /**
+     * @var \Magento\MessageQueue\Api\Data\PoisonPillInterface
+     */
+    private $poisonPill;
+
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
-     * @param \Magento\Framework\Bulk\OperationManagementInterface $operationManagement
      * @param \Magento\Catalog\Model\Product\Action $action
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Serialize\SerializerInterface $serializer
      * @param EntityManager $entityManager
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface $poisonPill
      */
     public function __construct(
         \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
-        \Magento\Framework\Bulk\OperationManagementInterface $operationManagement,
         \Magento\Catalog\Model\Product\Action $action,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Serialize\SerializerInterface $serializer,
-        EntityManager $entityManager
+        EntityManager $entityManager,
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $poisonPill
     ) {
         $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
         $this->productAction = $action;
         $this->logger = $logger;
         $this->serializer = $serializer;
-        $this->operationManagement = $operationManagement;
         $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
         $this->entityManager = $entityManager;
+        $this->poisonPill = $poisonPill;
     }
 
     /**
@@ -94,6 +94,7 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
         try {
             $serializedData = $operation->getSerializedData();
             $data = $this->serializer->unserialize($serializedData);
+            $this->poisonPill->put();
             $this->execute($data);
         } catch (\Zend_Db_Adapter_Exception $e) {
             $this->logger->critical($e->getMessage());

From 6b0ebf49055d0ee4bb371ffc23186eef2eb02fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20F=C3=BChr?= <d.fuehr@techdivision.com>
Date: Mon, 11 Mar 2019 15:48:37 +0100
Subject: [PATCH 0488/1055] amend consecutive exception handling

- support masking of root cause in frontend
- remove stack trace for consecutive exception to comply to default behaviour
---
 app/code/Magento/Quote/Model/QuoteManagement.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index b10777f816fdf..e1058c98271c1 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -12,7 +12,6 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\StateException;
-use Magento\Framework\Phrase;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Model\Quote\Address\ToOrder as ToOrderConverter;
 use Magento\Quote\Model\Quote\Address\ToOrderAddress as ToOrderAddressConverter;
@@ -548,15 +547,12 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
                     ]
                 );
             } catch (\Exception $consecutiveException) {
-                $message = new Phrase(
-                    "An exception occurred on 'sales_model_service_quote_submit_failure' event: %1\n%2",
-                    [
-                        $consecutiveException->getMessage(),
-                        $consecutiveException->getTraceAsString()
-                    ]
+                $message = sprintf(
+                    "An exception occurred on 'sales_model_service_quote_submit_failure' event: %s",
+                    $consecutiveException->getMessage()
                 );
 
-                throw new LocalizedException($message, $e);
+                throw new \Exception($message, 0, $e);
             }
             throw $e;
         }

From 0408d5f7afc2713eb8be54e7dab2be6148990e09 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Mon, 11 Mar 2019 17:49:55 +0300
Subject: [PATCH 0489/1055] MAGETWO-64838: Unable to create order from store
 front if customer address custom attribute is required.

- code refactoring;
---
 .../Magento/Framework/Webapi/ServiceInputProcessor.php    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index a116e0be8649f..d6d70eeec1eb6 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -357,7 +357,7 @@ private function getAttributesPreprocessorsMap()
         if (!$this->attributesPreprocessorsMap) {
             foreach ($this->customAttributePreprocessors as $attributePreprocessor) {
                 foreach ($attributePreprocessor->getAffectedAttributes() as $attributeKey) {
-                    $this->attributesPreprocessorsMap[$attributeKey][] = get_class($attributePreprocessor);
+                    $this->attributesPreprocessorsMap[$attributeKey][] = $attributePreprocessor;
                 }
             }
         }
@@ -374,10 +374,8 @@ private function getAttributesPreprocessorsMap()
      */
     private function runCustomAttributePreprocessors($key, &$customAttribute, $preprocessorlsList)
     {
-        foreach ($this->customAttributePreprocessors as $attributePreprocessor) {
-            if (array_key_exists(get_class($attributePreprocessor), $preprocessorlsList)
-                && $attributePreprocessor->shouldBeProcessed($key, $customAttribute)
-            ) {
+        foreach ($preprocessorlsList as $attributePreprocessor) {
+            if ($attributePreprocessor->shouldBeProcessed($key, $customAttribute)) {
                 $attributePreprocessor->process($key, $customAttribute);
             }
         }

From 02f8c3834e8d3fbc4bf760711ec784eb1f7b9553 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 11 Mar 2019 17:08:50 +0200
Subject: [PATCH 0490/1055] Fix functional test.

---
 .../User/Test/TestStep/CloseErrorAlertStep.php   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
index b8a3fce5de214..51d48058c8ae5 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/CloseErrorAlertStep.php
@@ -43,11 +43,15 @@ public function __construct(
     public function run()
     {
         $modalMessage = $this->dashboard->getModalMessage();
-        $this->browser->waitUntil(
-            function () use ($modalMessage) {
-                return $modalMessage->isVisible() ? true : null;
-            }
-        );
-        $modalMessage->acceptAlert();
+        try {
+            $this->browser->waitUntil(
+                function () use ($modalMessage) {
+                    return $modalMessage->isVisible() ? true : null;
+                }
+            );
+            $modalMessage->acceptAlert();
+        } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+            //There is no modal to accept.
+        }
     }
 }

From 21eeb476c8003fe457fda395e00f8d0ceea2ed21 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Mon, 11 Mar 2019 10:18:34 -0500
Subject: [PATCH 0491/1055] MC-13613: Product mass update

---
 app/code/Magento/Catalog/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 5c3ee3da8ca81..7174c35b191b6 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -7,6 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/framework-message-queue": "*",
         "magento/module-authorization": "*",
         "magento/module-asynchronous-operations": "*",
         "magento/module-backend": "*",

From 28b047ec570fce2752960668e5b4e6eda21593b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Mon, 11 Mar 2019 16:21:08 +0100
Subject: [PATCH 0492/1055] Move Magento\Sales\Model\Order\Address\Validator
 logic from construct to validate method

---
 .../Sales/Model/Order/Address/Validator.php   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Address/Validator.php b/app/code/Magento/Sales/Model/Order/Address/Validator.php
index 31cb5bb1f60ca..1b54dd2c127db 100644
--- a/app/code/Magento/Sales/Model/Order/Address/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Address/Validator.php
@@ -61,6 +61,16 @@ public function __construct(
         $this->countryFactory = $countryFactory;
         $this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
             ->get(EavConfig::class);
+    }
+
+    /**
+     *
+     * @param \Magento\Sales\Model\Order\Address $address
+     * @return array
+     */
+    public function validate(Address $address)
+    {
+        $warnings = [];
 
         if ($this->isTelephoneRequired()) {
             $this->required['telephone'] = 'Phone Number';
@@ -73,16 +83,7 @@ public function __construct(
         if ($this->isFaxRequired()) {
             $this->required['fax'] = 'Fax';
         }
-    }
 
-    /**
-     *
-     * @param \Magento\Sales\Model\Order\Address $address
-     * @return array
-     */
-    public function validate(Address $address)
-    {
-        $warnings = [];
         foreach ($this->required as $code => $label) {
             if (!$address->hasData($code)) {
                 $warnings[] = sprintf('"%s" is required. Enter and try again.', $label);

From 53bbfd22cf7242197b93f53189839f2f5018c7bd Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 11 Mar 2019 14:59:54 +0200
Subject: [PATCH 0493/1055] ENGCOM-4071: Static test fix.

---
 .../FillQuoteAddressIdInSalesOrderAddress.php | 44 ++++++++-----------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
index e1b517befccb4..f04dcb9ec2d49 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
@@ -8,16 +8,15 @@
 
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\State;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Sales\Model\Order\Address;
-use Magento\Sales\Model\OrderFactory;
-use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Sales\Setup\SalesSetupFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Setup\SalesSetupFactory;
 
+/**
+ * Fills quote_address_id in table sales_order_address if it is empty.
+ */
 class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, PatchVersionInterface
 {
     /**
@@ -25,11 +24,6 @@ class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, Patch
      */
     private $moduleDataSetup;
 
-    /**
-     * @var SalesSetupFactory
-     */
-    private $salesSetupFactory;
-
     /**
      * @var State
      */
@@ -41,29 +35,22 @@ class FillQuoteAddressIdInSalesOrderAddress implements DataPatchInterface, Patch
     private $eavConfig;
 
     /**
-     * PatchInitial constructor.
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     *
      * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param State $state
+     * @param Config $eavConfig
      */
     public function __construct(
         ModuleDataSetupInterface $moduleDataSetup,
-        SalesSetupFactory $salesSetupFactory,
         State $state,
-        Config $eavConfig,
-        AddressCollectionFactory $addressCollectionFactory,
-        OrderFactory $orderFactory,
-        QuoteFactory $quoteFactory
+        Config $eavConfig
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
-        $this->salesSetupFactory = $salesSetupFactory;
         $this->state = $state;
         $this->eavConfig = $eavConfig;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -87,7 +74,7 @@ public function fillQuoteAddressIdInSalesOrderAddress(ModuleDataSetupInterface $
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -97,7 +84,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -105,7 +92,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
@@ -113,8 +100,11 @@ public function getAliases()
     }
 
     /**
+     * Fill quote_address_id in sales_order_address by type.
+     *
      * @param ModuleDataSetupInterface $setup
      * @param string $addressType
+     * @throws \Zend_Db_Statement_Exception
      */
     private function fillQuoteAddressIdInSalesOrderAddressByType(ModuleDataSetupInterface $setup, $addressType)
     {
@@ -152,6 +142,8 @@ private function fillQuoteAddressIdInSalesOrderAddressByType(ModuleDataSetupInte
     }
 
     /**
+     * Process filling quote_address_id in sales_order_address in batch.
+     *
      * @param ModuleDataSetupInterface $setup
      * @param array $orderAddresses
      * @param string $addressType

From d4da3bdb8dc63fb8fc2d3d208a42699c0416faec Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Mon, 11 Mar 2019 10:36:06 -0500
Subject: [PATCH 0494/1055] MC-4343: Convert NavigateMenuTest to MFTF

---
 .../AdminNavigateMenuActionGroup.xml          | 21 +++++++++++++++++++
 .../Test/Mftf/Section/AdminMenuSection.xml    |  4 ++++
 2 files changed, 25 insertions(+)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
new file mode 100644
index 0000000000000..84864688321a0
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.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="NavigateMenuActionGroup">
+        <arguments>
+            <argument name="menuItem" type="string"/>
+            <argument name="submenuItem" type="string"/>
+            <argument name="title" type="string"/>
+        </arguments>
+        <click selector="{{AdminMenuSection.mainMenuItem(menuItem}}" stepKey="clickOnMenuItem"/>
+        <click selector="{{AdminMenuSection.submenuItem(submenuItem)}}" stepKey="clickOnSubmenuItem"/>
+        <see selector="{{AdminGridHeaders.title}}" userInput="{{title}}" stepKey="assertPageTitle"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index 278a738b60f0f..d9b4eee879dc8 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -21,5 +21,9 @@
         <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
         <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
         <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
+
+        <!-- Navigate menu selectors -->
+        <element name="mainMenuItem" type="button" selector="//li[contains(@class, 'level-0')]//span[text() ='{{var}}']/ancestor::a" parameterized="true" timeout="30"/>
+        <element name="submenuItem" type="button" selector="//span[text() ='{{var}}']/ancestor::a" parameterized="true" timeout="30"/>
     </section>
 </sections>

From 40aab1edc1abd3bc2237b8b838bd05bfcdc4125e Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Mon, 11 Mar 2019 10:40:54 -0500
Subject: [PATCH 0495/1055] Merge branch 'mtf-eol' into MC-4433

---
 .../Test/Mftf/ActionGroup/AdminProductActionGroup.xml        | 4 +---
 app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml      | 1 -
 .../Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml  | 5 -----
 .../Mftf/Section/StorefrontQuickSearchResultsSection.xml     | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 3a17b01f03a7d..be1af77723e6c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -104,14 +104,12 @@
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
 
-<<<<<<< HEAD
     <actionGroup name="toggleProductEnabled">
         <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="toggleEnabled"/>
-=======
+    </actionGroup>
     <!-- Save product but do not expect a success message -->
     <actionGroup name="SaveProductFormNoSuccessCheck" extends="saveProductForm">
         <remove keyForRemoval="seeSaveConfirmation"/>
->>>>>>> mtf-eol
     </actionGroup>
 
     <!--Upload image for product-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index e67c8d48fc790..2b3cf6c66d67f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -889,7 +889,6 @@
         <data key="attributeGroupId">13</data>
         <data key="sortOrder">0</data>
     </entity>
-<<<<<<< HEAD
     <entity name="productAlphabeticalA" type="product" extends="_defaultProduct">
         <data key="name" unique="suffix">AAA Product</data>
     </entity>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index 15fc737f43604..f6d9df63bf31c 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -33,11 +33,6 @@
         <see stepKey="checkName" selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productName}}"/>
     </actionGroup>
 
-    <!-- Asserts that search results do not contain nay results-->
-    <actionGroup name="StorefrontCheckSearchIsEmpty">
-        <see stepKey="checkEmpty" selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="Your search returned no results"/>
-    </actionGroup>
-
     <!-- Adds product from Quicksearch page and perform assertions-->
     <actionGroup name="StorefrontAddToCartFromQuickSearch">
         <arguments>
diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
index b2fcafdc35d5d..d827c60b3115b 100644
--- a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
@@ -20,6 +20,5 @@
         <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="//span[@class='price-wrapper ']/span[@class='price']"/>
-        <element name="messageSection" type="text" selector="div .message"/>
     </section>
 </sections>

From 5c7369e0cc487ac82ed66ffb630f14aaf7a88d4f Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Mon, 11 Mar 2019 10:47:05 -0500
Subject: [PATCH 0496/1055] MC-4425: Convert ImportProductsTest to MFTF

Updated story and zephyr test Ids as per review comments
---
 .../Test/AdminImportProductsWithAddUpdateBehaviorTest.xml     | 4 ++--
 .../Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
index f3238293e5713..ceb4e93e4e9aa 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithAddUpdateBehaviorTest.xml
@@ -11,11 +11,11 @@
     <test name="AdminImportProductsWithAddUpdateBehaviorTest">
         <annotations>
             <description value="Verify Magento native import products with add/update behavior."/>
-            <stories value="Verify Magento native import products with add/update behavior."/>
+            <stories value="Import Products"/>
             <features value="Import/Export"/>
             <title value="Verify Magento native import products with add/update behavior."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-47724"/>
+            <testCaseId value="MC-14077"/>
             <group value="importExport"/>
             <group value="mtf_migrated"/>
         </annotations>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
index d45b294a34e4f..d63a5546716b1 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithReplaceBehaviorTest.xml
@@ -11,11 +11,11 @@
     <test name="AdminImportProductsWithReplaceBehaviorTest" extends="AdminImportProductsWithAddUpdateBehaviorTest">
         <annotations>
             <description value="Verify Magento native import products with replace behavior."/>
-            <stories value="Verify Magento native import products with replace behavior."/>
+            <stories value="Import Products"/>
             <features value="Import/Export"/>
             <title value="Verify Magento native import products with replace behavior."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-47719"/>
+            <testCaseId value="MC-14076"/>
             <group value="importExport"/>
             <group value="mtf_migrated"/>
         </annotations>

From ff0271c3539706b9dae240bc4f86c339a1dd0f5f Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@adobe.com>
Date: Mon, 11 Mar 2019 13:26:46 -0500
Subject: [PATCH 0497/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 .../Adminhtml/Product/Action/Attribute/Save.php       | 11 ++++++++++-
 .../Model/Attribute/Backend/ConsumerWebsiteAssign.php | 11 +----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 63182dd5624e6..e6bdca02061ef 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -42,6 +42,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      */
     private $userContext;
 
+    /**
+     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
@@ -50,6 +55,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * @param \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService
      * @param \Magento\Framework\Serialize\SerializerInterface $serializer
      * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut
      */
     public function __construct(
         Action\Context $context,
@@ -58,7 +64,8 @@ public function __construct(
         \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory,
         \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService,
         \Magento\Framework\Serialize\SerializerInterface $serializer,
-        \Magento\Authorization\Model\UserContextInterface $userContext
+        \Magento\Authorization\Model\UserContextInterface $userContext,
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut
     ) {
         parent::__construct($context, $attributeHelper);
         $this->bulkManagement = $bulkManagement;
@@ -66,6 +73,7 @@ public function __construct(
         $this->identityService = $identityService;
         $this->serializer = $serializer;
         $this->userContext = $userContext;
+        $this->pillPut = $pillPut;
     }
 
     /**
@@ -190,6 +198,7 @@ private function publish(
                     $productIdsChunk,
                     $bulkUuid
                 );
+                $this->pillPut->put();
             }
 
             if ($attributesData) {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
index 15f9e4833b269..32ba39d9afd98 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/ConsumerWebsiteAssign.php
@@ -49,11 +49,6 @@ class ConsumerWebsiteAssign
      */
     private $entityManager;
 
-    /**
-     * @var \Magento\MessageQueue\Api\Data\PoisonPillInterface
-     */
-    private $poisonPill;
-
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
@@ -61,7 +56,6 @@ class ConsumerWebsiteAssign
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Serialize\SerializerInterface $serializer
      * @param EntityManager $entityManager
-     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface $poisonPill
      */
     public function __construct(
         \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
@@ -69,8 +63,7 @@ public function __construct(
         \Magento\Catalog\Model\Product\Action $action,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Serialize\SerializerInterface $serializer,
-        EntityManager $entityManager,
-        \Magento\MessageQueue\Api\PoisonPillPutInterface $poisonPill
+        EntityManager $entityManager
     ) {
         $this->productFlatIndexerProcessor = $productFlatIndexerProcessor;
         $this->productAction = $action;
@@ -78,7 +71,6 @@ public function __construct(
         $this->serializer = $serializer;
         $this->productPriceIndexerProcessor = $productPriceIndexerProcessor;
         $this->entityManager = $entityManager;
-        $this->poisonPill = $poisonPill;
     }
 
     /**
@@ -94,7 +86,6 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
         try {
             $serializedData = $operation->getSerializedData();
             $data = $this->serializer->unserialize($serializedData);
-            $this->poisonPill->put();
             $this->execute($data);
         } catch (\Zend_Db_Adapter_Exception $e) {
             $this->logger->critical($e->getMessage());

From 0d0122caebc3ec25137e76b94d9de45db2d89cec Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Mon, 11 Mar 2019 14:20:03 -0500
Subject: [PATCH 0498/1055] MC-4872: Convert CreateStoreGroupEntityTest to MFTF

---
 .../AdminCreateNewStoreGroupActionGroup.xml   | 28 ++++++++
 .../Mftf/Section/AdminStoresGridSection.xml   |  2 +-
 ...ithCustomWebsiteAndDefaultCategoryTest.xml | 58 +++++++++++++++++
 ...upWithCustomWebsiteAndRootCategoryTest.xml | 64 +++++++++++++++++++
 ...thDefaultWebsiteAndDefaultCategoryTest.xml | 51 +++++++++++++++
 5 files changed, 202 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndDefaultCategoryTest.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndRootCategoryTest.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithDefaultWebsiteAndDefaultCategoryTest.xml

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
index 7f1a63d3db6f2..d9a36b8413dbc 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
@@ -42,4 +42,32 @@
         <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage"/>
     </actionGroup>
+    <actionGroup name="AssertStoreGroupInGrid">
+        <arguments>
+            <argument name="storeGroupName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
+    </actionGroup>
+    <actionGroup name="AssertStoreGroupForm">
+        <arguments>
+            <argument name="website" type="string"/>
+            <argument name="storeGroupName" type="string"/>
+            <argument name="storeGroupCode" type="string"/>
+            <argument name="rootCategory" type="string"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitTillAdminSystemStoreGroupPage"/>
+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabStoreGroupIdFromCurrentUrl"/>
+        <seeInCurrentUrl url="system_store/editGroup/group_id/{$grabStoreGroupIdFromCurrentUrl}" stepKey="seeStoreGroupId"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website}}" stepKey="seeAssertWebsite"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupName"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="seeAssertStoreGroupCode"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="{{rootCategory}}" stepKey="seeAssertRootCategory"/>
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index ce6a210db413b..ac0f00e64dd4e 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -20,7 +20,7 @@
         <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
-        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
+        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[{{rownum}}]" parameterized="true"/>
         <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
         <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
         <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndDefaultCategoryTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndDefaultCategoryTest.xml
new file mode 100644
index 0000000000000..8e8f31eaca865
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndDefaultCategoryTest.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateStoreGroupWithCustomWebsiteAndDefaultCategoryTest">
+        <annotations>
+            <stories value="Create Store Group"/>
+            <title value="Create Store Group with Custom Website and Default Category"/>
+            <description value="Test log in to Stores and Create Store Group with Custom Website and Default Category Test"/>
+            <testCaseId value="MC-14300"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create website-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create custom store group with custom website and default category and verify AssertStoreGroupSuccessSaveMessage-->
+        <actionGroup ref="CreateCustomStore" stepKey="createCustomStoreGroup">
+            <argument name="website" value="{{customWebsite.name}}"/>
+            <argument name="store" value="{{customStoreGroup.name}}"/>
+            <argument name="rootCategory" value="Default Category"/>
+        </actionGroup>
+
+        <!--Search created store group(from above step) in grid and verify AssertStoreGroupInGrid message-->
+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeCreatedStoreGroupInGrid">
+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+        </actionGroup>
+
+        <!--Go to store group form page and verify AssertStoreGroupForm-->
+        <actionGroup ref="AssertStoreGroupForm" stepKey="seeCreatedStoreGroupForm">
+            <argument name="website" value="{{customWebsite.name}}"/>
+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+            <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            <argument name="rootCategory" value="Default Category"/>
+        </actionGroup>
+        <!--Also verify absence of delete button on store group form page(AssertStoreGroupNoDeleteButton)-->
+        <dontSee selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="AssertStoreGroupNoDeleteButton"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndRootCategoryTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndRootCategoryTest.xml
new file mode 100644
index 0000000000000..18f9822145dec
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithCustomWebsiteAndRootCategoryTest.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateStoreGroupWithCustomWebsiteAndRootCategoryTest">
+        <annotations>
+            <stories value="Create Store Group"/>
+            <title value="Create Store Group with Custom Website and Root Category"/>
+            <description value="Test log in to Stores and Create Store Group with Custom Website and Root Category Test"/>
+            <testCaseId value="MC-14299"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create root category-->
+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
+            <createData entity="SimpleRootSubCategory" stepKey="category">
+                <requiredEntity createDataKey="rootCategory"/>
+            </createData>
+            <!--Create website-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete website-->
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+            <!--Delete root category-->
+            <deleteData stepKey="deleteRootCategory" createDataKey="rootCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create custom store group with custom website and root category and verify AssertStoreGroupSuccessSaveMessage-->
+        <actionGroup ref="CreateCustomStore" stepKey="createCustomStoreGroup">
+            <argument name="website" value="{{customWebsite.name}}"/>
+            <argument name="store" value="{{customStoreGroup.name}}"/>
+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
+        </actionGroup>
+
+        <!--Search created store group(from above step) in grid and verify AssertStoreGroupInGrid-->
+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeCreatedStoreGroupInGrid">
+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+        </actionGroup>
+
+        <!--Go to store group form page and verify AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm-->
+        <actionGroup ref="AssertStoreGroupForm" stepKey="seeCreatedStoreGroupInForm">
+            <argument name="website" value="{{customWebsite.name}}"/>
+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+            <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithDefaultWebsiteAndDefaultCategoryTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithDefaultWebsiteAndDefaultCategoryTest.xml
new file mode 100644
index 0000000000000..ddc5d061c1db2
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupWithDefaultWebsiteAndDefaultCategoryTest.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateStoreGroupWithDefaultWebsiteAndDefaultCategoryTest">
+        <annotations>
+            <stories value="Create Store Group"/>
+            <title value="Create Store Group with Default Website and Default Category"/>
+            <description value="Test log in to Stores and Create Store Group with Default Website and Default Category Test"/>
+            <testCaseId value="MC-14298"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteStoreGroup">
+                <argument name="storeGroupName" value="SecondStoreGroupUnique.name"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create custom store group with default website and default category and verify AssertStoreGroupSuccessSaveMessage-->
+        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewCustomStoreGroup">
+            <argument name="website" value="{{_defaultWebsite.name}}"/>
+            <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+            <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
+        </actionGroup>
+
+        <!--Search created store group(from above step) in grid and verify AssertStoreGroupInGrid-->
+        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeCreatedStoreGroupInGrid">
+            <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+        </actionGroup>
+
+        <!--Go to store group form page and verify AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm-->
+        <actionGroup ref="AssertStoreGroupForm" stepKey="seeCreatedStoreGroupForm">
+            <argument name="website" value="{{_defaultWebsite.name}}"/>
+            <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+            <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
+            <argument name="rootCategory" value="Default Category"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file

From 06693faebc22a9c62f53dac54e51634ad1f8f3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Bajsarowicz?= <lukasz.bajsarowicz@strix.net>
Date: Mon, 11 Mar 2019 23:13:10 +0100
Subject: [PATCH 0499/1055] Fix AdminChangeProductAttributeSet test

---
 .../Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
index 3027416ee520b..bcfab6ccfdf1f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSet.xml
@@ -34,7 +34,7 @@
             <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
 
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-            <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$$createAttributeSet.attribute_set_id$$}}/" stepKey="onAttributeSetEdit"/>
+            <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$$createAttributeSet.attribute_set_id$$/" stepKey="onAttributeSetEdit"/>
             <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
                 <argument name="group" value="Product Details"/>
                 <argument name="attribute" value="$$createProductAttribute.attribute_code$$"/>

From 924dca297c1ac696e1362ec2e76a23676d87efa0 Mon Sep 17 00:00:00 2001
From: tuyennn <thinghost76@gmail.com>
Date: Tue, 12 Mar 2019 09:57:52 +0700
Subject: [PATCH 0500/1055] issues-21521: Fix Broken Tax Rate Search Filter
 Admin grid

---
 app/code/Magento/Tax/etc/di.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index 096f8359fadd3..3b46b0f9e258c 100644
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -143,6 +143,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
@@ -154,6 +155,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>

From fa9b420971ebb3dc2129eae30934a11953e7d452 Mon Sep 17 00:00:00 2001
From: dharmesh vaja <dharmesh.vaja@rocketbazaar.com>
Date: Tue, 12 Mar 2019 10:38:19 +0530
Subject: [PATCH 0501/1055] Update Code

---
 app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php | 3 ++-
 1 file changed, 2 insertions(+), 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 eeef2076d6ae4..47f96b132b3db 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -138,7 +138,7 @@ public function testGetAdditionalAddresses()
         /** @var \PHPUnit_Framework_MockObject_MockObject */
         $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setOrder', 'setCustomerFilter', 'load', 'getIterator'])
+            ->setMethods(['setOrder', 'setCustomerFilter', 'load', 'getIterator','addFieldToFilter'])
             ->getMock();
         $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
         $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
@@ -158,6 +158,7 @@ public function testGetAdditionalAddresses()
             ->willReturnSelf();
         $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
             ->willReturnSelf();
+        $addressCollection->expects(static::any())->method('addFieldToFilter')->willReturnSelf();
         $addressCollection->expects($this->atLeastOnce())->method('getIterator')
             ->willReturn(new \ArrayIterator($collection));
         $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')

From 9dee0e111dc25b3ea45619370b876014ca855f0d Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Tue, 12 Mar 2019 07:59:18 +0200
Subject: [PATCH 0502/1055] Currency misspelled in graphql attributes

---
 app/code/Magento/DirectoryGraphQl/etc/schema.graphqls     | 4 ++--
 .../testsuite/Magento/GraphQl/Directory/CurrencyTest.php  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
index 40ef6975fad8b..f2bc576f95e8e 100644
--- a/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
@@ -10,8 +10,8 @@ type Query {
 type Currency {
     base_currency_code: String
     base_currency_symbol: String
-    default_display_currecy_code: String
-    default_display_currecy_symbol: String
+    default_display_currency_code: String
+    default_display_currency_symbol: String
     available_currency_codes: [String]
     exchange_rates: [ExchangeRate]
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php
index 1ff0b53dda0bb..ad5d71cb08605 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Directory/CurrencyTest.php
@@ -21,8 +21,8 @@ public function testGetCurrency()
     currency {
         base_currency_code
         base_currency_symbol
-        default_display_currecy_code
-        default_display_currecy_symbol
+        default_display_currency_code
+        default_display_currency_symbol
         available_currency_codes
         exchange_rates {
             currency_to
@@ -36,8 +36,8 @@ public function testGetCurrency()
         $this->assertArrayHasKey('currency', $result);
         $this->assertArrayHasKey('base_currency_code', $result['currency']);
         $this->assertArrayHasKey('base_currency_symbol', $result['currency']);
-        $this->assertArrayHasKey('default_display_currecy_code', $result['currency']);
-        $this->assertArrayHasKey('default_display_currecy_symbol', $result['currency']);
+        $this->assertArrayHasKey('default_display_currency_code', $result['currency']);
+        $this->assertArrayHasKey('default_display_currency_symbol', $result['currency']);
         $this->assertArrayHasKey('available_currency_codes', $result['currency']);
         $this->assertArrayHasKey('exchange_rates', $result['currency']);
     }

From 649fad680d12c1b4a8f0248dbf84293a5de344e2 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 12 Mar 2019 11:38:10 +0200
Subject: [PATCH 0503/1055] ENGCOM-4071: Upgrade fail fix.

---
 .../Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
index f04dcb9ec2d49..c05d2d01a1f14 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
@@ -181,7 +181,7 @@ private function fillQuoteAddressIdInSalesOrderAddressProcessBatch(
                 'quote_address_id' => $quoteAddresses[$orderAddress['quote_id']]['address_id'] ?? null,
             ];
             $where = [
-                'orderAddressId' => $orderAddress['entity_id']
+                'entity_id' => $orderAddress['entity_id']
             ];
 
             $salesConnection->update($salesOrderAddressTable, $bind, $where);

From f406c28b8d4a9a86320ca9874973f74b917afc6f Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Tue, 12 Mar 2019 15:13:55 +0530
Subject: [PATCH 0504/1055] Corrected test case method name

---
 .../Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 880d6aa0f406f..1d937251dcb40 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -174,7 +174,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      */
-    public function testSettBillingAddressToCustomerCart()
+    public function testSetBillingAddressToCustomerCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
 

From 524eef39230cd60d2a4f32f6827c6f238d574957 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 12 Mar 2019 12:20:49 +0200
Subject: [PATCH 0505/1055] Fix static tests.

---
 .../web/css/source/actions/_actions-select.less    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
index 544ab2fadd624..1c45fe6946ba0 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-select.less
@@ -7,6 +7,14 @@
 //  Actions -> Action select
 //  _____________________________________________
 
+//
+//  Variables
+//  _____________________________________________
+
+@_dropdown__padding-right: @action__height;
+@_triangle__height: @button-marker-triangle__height;
+@_triangle__width: @button-marker-triangle__width;
+
 //  Action select have the same visual styles and functionality as native <select>
 .action-select-wrap {
     @_action-select__border-color: @button__border-color;
@@ -18,9 +26,9 @@
 
     .action-select {
         .action-toggle-triangle(
-        @_dropdown__padding-right: @_action-select-toggle__size;
-        @_triangle__height: @button-marker-triangle__height;
-        @_triangle__width: @button-marker-triangle__width;
+        @_dropdown__padding-right;
+        @_triangle__height;
+        @_triangle__width;
         );
         .lib-text-overflow-ellipsis();
 

From 7c55811a43ae0a9d80cc3c6544c42088bfe0d790 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak2ram@gmail.com>
Date: Tue, 12 Mar 2019 17:22:27 +0530
Subject: [PATCH 0506/1055] Resolve Issue : Search REST API returns wrong
 total_count

---
 .../Search/Adapter/Mysql/Adapter.php          | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
index f4d83ece134cf..501136f76752f 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
@@ -49,6 +49,16 @@ class Adapter implements AdapterInterface
      */
     private $temporaryStorageFactory;
 
+    /**
+     * Query Select Parts to be skipped when prepare query for count
+     *
+     * @var array
+     */
+    private $countSqlSkipParts = [
+        \Magento\Framework\DB\Select::LIMIT_COUNT => true,
+        \Magento\Framework\DB\Select::LIMIT_OFFSET => true,
+    ];
+
     /**
      * @param Mapper $mapper
      * @param ResponseFactory $responseFactory
@@ -86,7 +96,7 @@ public function query(RequestInterface $request)
         $response = [
             'documents' => $documents,
             'aggregations' => $aggregations,
-            'total' => count($documents)
+            'total' => $this->getSize($query)
         ];
         return $this->responseFactory->create($response);
     }
@@ -115,4 +125,36 @@ private function getConnection()
     {
         return $this->resource->getConnection();
     }
+
+    /**
+     * Get rows size
+     *
+     * @return int
+     */
+    private function getSize($query)
+    {
+        $sql = $this->getSelectCountSql($query);
+        $parentSelect = $this->getConnection()->select();
+        $parentSelect->from(['core_select' => $sql]);
+        $parentSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
+        $parentSelect->columns('COUNT(*)');
+        $totalRecords = $this->getConnection()->fetchOne($parentSelect);
+        return intval($totalRecords);
+    }
+
+    /**
+     * Reset limit and offset
+     *
+     * @return Select
+     */
+    private function getSelectCountSql($query)
+    {
+        foreach ($this->countSqlSkipParts as $part => $toSkip) {
+            if ($toSkip) {
+                $query->reset($part);
+            }
+        }
+        return $query;
+    }
+
 }

From 7df1f1690fefb72e36d91808921c9912efa3a703 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Tue, 12 Mar 2019 14:57:57 +0300
Subject: [PATCH 0507/1055] MAGETWO-64838: Unable to create order from store
 front if customer address custom attribute is required

- Fixed static tests;
---
 .../Framework/Webapi/ServiceInputProcessor.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index d6d70eeec1eb6..96f06e93a0411 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -301,12 +301,9 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
     {
         $result = [];
         $dataObjectClassName = ltrim($dataObjectClassName, '\\');
-        $attributesPreprocessorMap = $this->getAttributesPreprocessorsMap();
 
         foreach ($customAttributesValueArray as $key => $customAttribute) {
-            if($key && is_array($customAttribute) && array_key_exists($key, $attributesPreprocessorMap)) {
-                $this->runCustomAttributePreprocessors($key, $customAttribute, $attributesPreprocessorMap[$key]);
-            }
+            $this->runCustomAttributePreprocessors($key, $customAttribute);
             if (!is_array($customAttribute)) {
                 $customAttribute = [AttributeValue::ATTRIBUTE_CODE => $key, AttributeValue::VALUE => $customAttribute];
             }
@@ -370,13 +367,16 @@ private function getAttributesPreprocessorsMap()
      *
      * @param string $key
      * @param mixed $customAttribute
-     * @return bool
      */
-    private function runCustomAttributePreprocessors($key, &$customAttribute, $preprocessorlsList)
+    private function runCustomAttributePreprocessors($key, &$customAttribute)
     {
-        foreach ($preprocessorlsList as $attributePreprocessor) {
-            if ($attributePreprocessor->shouldBeProcessed($key, $customAttribute)) {
-                $attributePreprocessor->process($key, $customAttribute);
+        $preprocessorsMap = $this->getAttributesPreprocessorsMap();
+        if ($key && is_array($customAttribute) && array_key_exists($key, $preprocessorsMap)) {
+            $preprocessorsList = $preprocessorsMap[$key];
+            foreach ($preprocessorsList as $attributePreprocessor) {
+                if ($attributePreprocessor->shouldBeProcessed($key, $customAttribute)) {
+                    $attributePreprocessor->process($key, $customAttribute);
+                }
             }
         }
     }

From 23e7e36ca80b59899fc67a5288c3860d13dfca67 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 12 Mar 2019 14:01:07 +0200
Subject: [PATCH 0508/1055] ENGCOM-4461: Static test fix.

---
 .../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 f847b8aff9206..54ba530092cc0 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
@@ -393,8 +393,8 @@
         .field.price {
             .with-addon {
                 .input-text {
-                    width: 100%;
                     flex-basis: auto;
+                    width: 100%;
                 }
             }
         }
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 6d832e93a1df3..bd8ddde98c506 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
@@ -614,8 +614,8 @@
         .field.price {
             .with-addon {
                 .input-text {
-                    width: 100%;
                     flex-basis: auto;
+                    width: 100%;
                 }
             }
         }

From 4f19d038cf47cca7664cf9664ee667573200e2da Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Tue, 12 Mar 2019 18:39:04 +0530
Subject: [PATCH 0509/1055] Corrected Mutation Query for
 SetShippingMethodsOnCartTest

---
 .../Quote/Guest/SetShippingMethodsOnCartTest.php  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index f159cb6f6151e..b452c2cd9d6d2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -113,7 +113,7 @@ public function testSetMultipleShippingMethods()
      * @param string $maskedQuoteId
      * @param string $shippingMethodCode
      * @param string $shippingCarrierCode
-     * @param string $shippingAddressId
+     * @param int $shippingAddressId
      * @return string
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
@@ -121,21 +121,20 @@ private function prepareMutationQuery(
         string $maskedQuoteId,
         string $shippingMethodCode,
         string $shippingCarrierCode,
-        string $shippingAddressId
+        int $shippingAddressId
     ) : string {
         return <<<QUERY
 mutation {
   setShippingMethodsOnCart(input: 
     {
       cart_id: "$maskedQuoteId", 
-      shipping_addresses: [{
+      shipping_methods: [{
         cart_address_id: $shippingAddressId
-        shipping_method: {
-          method_code: "$shippingMethodCode"
-          carrier_code: "$shippingCarrierCode"
-        }
+        carrier_code: "$shippingCarrierCode"
+        method_code: "$shippingMethodCode"
       }]
-      }) {
+    }) {
+
     cart {
       shipping_addresses {
         selected_shipping_method {

From a7a14d040a3fcfbb8245585cbe851ec1f83d0029 Mon Sep 17 00:00:00 2001
From: Eduard Chitoraga <e.chitoraga@atwix.com>
Date: Tue, 12 Mar 2019 15:13:29 +0200
Subject: [PATCH 0510/1055] Update Mysql.php

---
 lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 86266ec23fe47..59d9ec169309b 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2154,7 +2154,6 @@ public function createTable(Table $table)
      */
     public function createTemporaryTable(\Magento\Framework\DB\Ddl\Table $table)
     {
-        $columns = $table->getColumns();
         $sqlFragment    = array_merge(
             $this->_getColumnsDefinition($table),
             $this->_getIndexesDefinition($table),

From 55d65923ea48d0647bc4b9782ef1c5e3fc80e3e8 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Tue, 12 Mar 2019 09:35:42 -0500
Subject: [PATCH 0511/1055] ENGCOM-4389: Elasticsearch6 implementation  -
 Travis CI Stabilized

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e75e8f1a52dd1..76885ebab2896 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,6 @@ cache:
     - $HOME/node_modules
     - $HOME/yarn.lock
 before_install:
-  - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.6.1.deb && sudo dpkg -i --force-confnew elasticsearch-6.6.1.deb && sudo service elasticsearch restart
   - ./dev/travis/before_install.sh
 install: composer install --no-interaction
 before_script: ./dev/travis/before_script.sh

From a7d0cd284b398dc9feadb458b546853157ab0549 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Tue, 12 Mar 2019 09:35:42 -0500
Subject: [PATCH 0512/1055] ENGCOM-4389: Elasticsearch6 implementation  -
 Travis CI Stabilized

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e75e8f1a52dd1..76885ebab2896 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,6 @@ cache:
     - $HOME/node_modules
     - $HOME/yarn.lock
 before_install:
-  - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.6.1.deb && sudo dpkg -i --force-confnew elasticsearch-6.6.1.deb && sudo service elasticsearch restart
   - ./dev/travis/before_install.sh
 install: composer install --no-interaction
 before_script: ./dev/travis/before_script.sh

From 05019081918c5c6ce1b91e8a3cd75a57591cc731 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 12 Mar 2019 17:01:01 +0200
Subject: [PATCH 0513/1055] ENGCOM-4460: Static test fix.

---
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php  | 4 ++--
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php  | 4 ++--
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php     | 4 ++--
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Info.php     | 4 ++--
 .../Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
index 41ce705c77607..40882ae00dae1 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -5,13 +5,13 @@
  */
 
 /**
- * Wishlist for item column in customer wishlist
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Model for item column in customer wishlist.
+ *
  * @api
  * @deprecated
  * @since 100.0.2
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
index f63d083bf56b6..53f67626e956d 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -5,13 +5,13 @@
  */
 
 /**
- * Wishlist block customer item cart column
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Wishlist block customer item cart column.
+ *
  * @api
  * @deprecated
  * @since 100.0.2
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
index 1fc73c05f6f86..c4c786961694b 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -5,13 +5,13 @@
  */
 
 /**
- * Edit item in customer wishlist table
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Edit item in customer wishlist table.
+ *
  * @api
  * @deprecated
  * @since 100.0.2
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
index e6067392bae48..b7eaf53fc23b5 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -5,13 +5,13 @@
  */
 
 /**
- * Wishlist block customer item cart column
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Wishlist block customer item cart column.
+ *
  * @api
  * @deprecated
  * @since 100.0.2
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
index 724ffd90f87db..09f5014edead6 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -5,13 +5,13 @@
  */
 
 /**
- * Delete item column in customer wishlist table
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Delete item column in customer wishlist table
+ *
  * @api
  * @deprecated
  * @since 100.0.2

From d2cb7c89990cb52f39f823c7b849ac749833e6c6 Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@adobe.com>
Date: Tue, 12 Mar 2019 10:06:45 -0500
Subject: [PATCH 0514/1055] MC-13613: Product mass update

- MC-5665 Execution of heavy admin operations in asynchronous flow part2
---
 app/code/Magento/MessageQueue/Model/CallbackInvoker.php    | 1 +
 .../MessageQueue/Model/ResourceModel/PoisonPill.php        | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
index 33229c6432c5a..1234228dad72d 100644
--- a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
+++ b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
@@ -57,6 +57,7 @@ public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
                 $message = $queue->dequeue();
             } while ($message === null && (sleep(1) === 0));
             if (false === $this->poisonPillCompare->isLatest($this->poisonPill)) {
+                $queue->reject($message);
                 exit(0);
             }
             $callback($message);
diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
index b6149be04c471..ee3d09ec3eaed 100644
--- a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
@@ -58,9 +58,10 @@ protected function _construct()
      */
     public function put(): int
     {
-        /** @var PoisonPillInterface $poisonPill */
-        $poisonPill = $this->poisonPillFactory->create();
-        return $this->save($poisonPill)->getConnection()->lastInsertId();
+        $connection = $this->getConnection();
+        $table = $this->getMainTable();
+        $connection->insert($table, []);
+        return (int)$connection->lastInsertId($table);
     }
 
     /**

From ce21910264fbf31cdddc6c9e9670ba14548e88b9 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 12 Mar 2019 11:08:05 -0500
Subject: [PATCH 0515/1055] MC-13613: Product mass update

---
 app/code/Magento/Catalog/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 7174c35b191b6..74e7f40b1f062 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -7,7 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/framework-message-queue": "*",
+        "magento/module-message-queue": "*",
         "magento/module-authorization": "*",
         "magento/module-asynchronous-operations": "*",
         "magento/module-backend": "*",

From ea97714998c8203ea2c8ec4e359537ecedb1b98a Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Tue, 12 Mar 2019 11:52:11 -0500
Subject: [PATCH 0516/1055] MC-4868: Convert UpdateStoreGroupEntityTest to MFTF

Addressing review comments
---
 .../AdminCreateNewStoreGroupActionGroup.xml   | 47 -------------------
 .../AssertStoreGroupFormActionGroup.xml       | 25 ++++++++++
 .../AssertStoreGroupInGridActionGroup.xml     | 23 +++++++++
 ...reGroupAcceptWarningMessageActionGroup.xml | 22 +++++++++
 ...pAcceptAlertAndVerifyStoreViewFormTest.xml | 12 ++---
 ...teStoreGroupAndVerifyStoreViewFormTest.xml |  6 +--
 6 files changed, 79 insertions(+), 56 deletions(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupFormActionGroup.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/EditCustomStoreGroupAcceptWarningMessageActionGroup.xml

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
index e9fe38bee790a..7f1a63d3db6f2 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
@@ -42,51 +42,4 @@
         <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage"/>
     </actionGroup>
-    <actionGroup name="AssertStoreGroupInGrid">
-        <arguments>
-            <argument name="storeGroupName" type="string"/>
-        </arguments>
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
-        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
-        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
-    </actionGroup>
-    <actionGroup name="AssertStoreGroupForm">
-        <arguments>
-            <argument name="website" type="string"/>
-            <argument name="storeGroupName" type="string"/>
-            <argument name="storeGroupCode" type="string"/>
-            <argument name="rootCategory" type="string"/>
-        </arguments>
-        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
-        <waitForPageLoad stepKey="waitTillAdminSystemStoreGroupPage"/>
-        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabStoreGroupIdFromCurrentUrl"/>
-        <seeInCurrentUrl url="system_store/editGroup/group_id/{$grabStoreGroupIdFromCurrentUrl}" stepKey="seeStoreGroupId"/>
-        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website}}" stepKey="seeAssertWebsite"/>
-        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupName"/>
-        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="seeAssertStoreGroupCode"/>
-        <seeInField selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="{{rootCategory}}" stepKey="seeAssertRootCategory"/>
-    </actionGroup>
-    <actionGroup name="CreateCustomStoreGroupAcceptWarningMessage">
-        <arguments>
-            <argument name="website" type="string"/>
-            <argument name="store" type="string"/>
-            <argument name="category" type="string"/>
-        </arguments>
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <waitForPageLoad stepKey="waitForSystemStorePage"/>
-        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickFirstRow"/>
-        <selectOption userInput="{{website}}" selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" stepKey="selectMainWebsite"/>
-        <fillField userInput="{{store}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
-        <fillField userInput="{{store}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
-        <selectOption userInput="{{category}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreCategory"/>
-        <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveButton" />
-        <waitForPageLoad stepKey="waitForWarningMessageToAppear"/>
-        <click selector="{{AdminStoreGroupActionsSection.okButton}}" stepKey="seeAssertAlertWarningMessage"/>
-        <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGrpTextFieldToBeVisible"/>
-        <see userInput="You saved the store." stepKey="seeAssertSaveSuccessMessage"/>
-    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupFormActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupFormActionGroup.xml
new file mode 100644
index 0000000000000..a8b8b7bb6d07f
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupFormActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Admin creates new Store group -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStoreGroupFormActionGroup">
+        <arguments>
+            <argument name="website" type="string"/>
+            <argument name="storeGroupName" type="string"/>
+            <argument name="storeGroupCode" type="string"/>
+            <argument name="rootCategory" type="string"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitTillAdminSystemStoreGroupPage"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website}}" stepKey="seeAssertWebsite"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupName"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="seeAssertStoreGroupCode"/>
+        <seeInField selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="{{rootCategory}}" stepKey="seeAssertRootCategory"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml
new file mode 100644
index 0000000000000..b96d7d222770c
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Admin creates new Store group -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStoreGroupInGridActionGroup">
+        <arguments>
+            <argument name="storeGroupName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/EditCustomStoreGroupAcceptWarningMessageActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/EditCustomStoreGroupAcceptWarningMessageActionGroup.xml
new file mode 100644
index 0000000000000..8889795c8acbf
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/EditCustomStoreGroupAcceptWarningMessageActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Admin creates new Store group -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="EditCustomStoreGroupAcceptWarningMessageActionGroup" extends="CreateCustomStore">
+        <arguments>
+            <argument name="website" type="string"/>
+            <argument name="store" type="string"/>
+            <argument name="rootCategory" type="string"/>
+        </arguments>
+        <remove keyForRemoval="selectCreateStore"/>
+        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickFirstRow" before="selectMainWebsite"/>
+        <waitForPageLoad stepKey="waitForWarningMessageToAppear" before="seeAssertAlertWarningMessage" />
+        <click selector="{{AdminStoreGroupActionsSection.okButton}}" stepKey="seeAssertAlertWarningMessage" before="waitForStoreGridReload"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
index 29b7d37de7c3d..0ced17ab835ab 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
@@ -31,7 +31,7 @@
                 <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
             <!--Create custom store group-->
-            <actionGroup ref="CreateCustomStore" stepKey="updateCustomStoreGroup">
+            <actionGroup ref="CreateCustomStore" stepKey="createCustomStoreGroup">
                 <argument name="website" value="{{_defaultWebsite.name}}"/>
                 <argument name="store" value="{{staticStoreGroup.name}}"/>
                 <argument name="rootCategory" value="Default Category"/>
@@ -48,25 +48,25 @@
         </after>
 
         <!--Open created Store group in grid-->
-        <actionGroup ref="AssertStoreGroupInGrid" stepKey="openCreatedStoreGroupInGrid">
+        <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="openCreatedStoreGroupInGrid">
             <argument name="storeGroupName" value="{{staticStoreGroup.name}}"/>
         </actionGroup>
         <click selector="{{AdminStoresGridSection.firstRow('1')}}" stepKey="clickFirstRow"/>
         <waitForPageLoad stepKey="AdminSystemStoreGroupPageToOpen"/>
         <!--Update created Store group as per requirement and accept alert message-->
-        <actionGroup ref="CreateCustomStoreGroupAcceptWarningMessage" stepKey="updateCustomStoreGroup">
+        <actionGroup ref="EditCustomStoreGroupAcceptWarningMessageActionGroup" stepKey="updateCustomStoreGroup">
             <argument name="website" value="{{customWebsite.name}}"/>
             <argument name="store" value="{{customStoreGroup.name}}"/>
-            <argument name="category" value="$$rootCategory.name$$"/>
+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
         </actionGroup>
 
         <!--Search updated store group(from above step) in grid and verify AssertStoreGroupInGrid-->
-        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeUpdatedStoreGroupInGrid">
+        <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="seeUpdatedStoreGroupInGrid">
             <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
         </actionGroup>
 
         <!--Verify updated website name and updated websitecode on website form (AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm)-->
-        <actionGroup ref="AssertStoreGroupForm" stepKey="seeUpdatedStoreGroupForm">
+        <actionGroup ref="AssertStoreGroupFormActionGroup" stepKey="seeUpdatedStoreGroupForm">
             <argument name="website" value="{{customWebsite.name}}"/>
             <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
             <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
index 783694b63bbd2..8bc926b321eb1 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
@@ -38,7 +38,7 @@
         </after>
 
         <!--Open created Store group in grid-->
-        <actionGroup ref="AssertStoreGroupInGrid" stepKey="openCreatedStoreGroupInGrid">
+        <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="openCreatedStoreGroupInGrid">
             <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
         </actionGroup>
         <click selector="{{AdminStoresGridSection.firstRow('1')}}" stepKey="clickFirstRow"/>
@@ -51,12 +51,12 @@
         </actionGroup>
 
         <!--Search updated store group(from above step) in grid and verify AssertStoreGroupInGrid-->
-        <actionGroup ref="AssertStoreGroupInGrid" stepKey="seeUpdatedStoreGroupInGrid">
+        <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="seeUpdatedStoreGroupInGrid">
             <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
         </actionGroup>
 
         <!--Verify updated website name and updated websitecode on website form (AssertStoreGroupForm and AssertStoreGroupOnStoreViewForm)-->
-        <actionGroup ref="AssertStoreGroupForm" stepKey="seeUpdatedStoreGroupForm">
+        <actionGroup ref="AssertStoreGroupFormActionGroup" stepKey="seeUpdatedStoreGroupForm">
             <argument name="website" value="{{_defaultWebsite.name}}"/>
             <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
             <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>

From f9a88cb28316605184a4dcc268cff3366151ae2a Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Tue, 12 Mar 2019 11:59:59 -0500
Subject: [PATCH 0517/1055] ENGCOM-4389: Elasticsearch6 implementation  - Fixed
 removing out of stock items from ES index

---
 .../Magento/Elasticsearch/Model/Config.php    | 16 ++++--
 app/code/Magento/Elasticsearch/etc/di.xml     |  8 +++
 .../Magento/Elasticsearch6/Model/Config.php   | 56 -------------------
 .../Model/DataProvider/Suggestions.php        |  2 +-
 .../Model/DataProvider/SuggestionsTest.php    |  2 +-
 app/code/Magento/Elasticsearch6/etc/di.xml    |  8 +++
 6 files changed, 29 insertions(+), 63 deletions(-)
 delete mode 100644 app/code/Magento/Elasticsearch6/Model/Config.php

diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php
index dc08a72a9feb3..387db07c62f90 100644
--- a/app/code/Magento/Elasticsearch/Model/Config.php
+++ b/app/code/Magento/Elasticsearch/Model/Config.php
@@ -25,8 +25,6 @@ class Config implements ClientOptionsInterface
      */
     const ENGINE_NAME = 'elasticsearch';
 
-    private const ENGINE_NAME_5 = 'elasticsearch5';
-
     /**
      * Elasticsearch Entity type
      */
@@ -64,23 +62,31 @@ class Config implements ClientOptionsInterface
     private $engineResolver;
 
     /**
-     * Constructor
+     * Available Elasticsearch engines.
      *
+     * @var array
+     */
+    private $engineList;
+
+    /**
      * @param ScopeConfigInterface $scopeConfig
      * @param ClientResolver|null $clientResolver
      * @param EngineResolverInterface|null $engineResolver
      * @param string|null $prefix
+     * @param array $engineList
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         ClientResolver $clientResolver = null,
         EngineResolverInterface $engineResolver = null,
-        $prefix = null
+        $prefix = null,
+        $engineList = []
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class);
         $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolverInterface::class);
         $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
+        $this->engineList = $engineList;
     }
 
     /**
@@ -138,7 +144,7 @@ public function getSearchConfigData($field, $storeId = null)
      */
     public function isElasticsearchEnabled()
     {
-        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME, self::ENGINE_NAME_5]);
+        return in_array($this->engineResolver->getCurrentSearchEngine(), $this->engineList);
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 7e219bb2f918f..23a1e76a30cfe 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -13,6 +13,14 @@
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider" />
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">elasticsearch</item>
+                <item name="elasticsearch5" xsi:type="string">elasticsearch5</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver">
         <arguments>
             <argument name="fieldMappers" xsi:type="array">
diff --git a/app/code/Magento/Elasticsearch6/Model/Config.php b/app/code/Magento/Elasticsearch6/Model/Config.php
deleted file mode 100644
index 1a989e2705fdd..0000000000000
--- a/app/code/Magento/Elasticsearch6/Model/Config.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Elasticsearch6\Model;
-
-use Magento\Framework\Search\EngineResolverInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\AdvancedSearch\Model\Client\ClientResolver;
-
-/**
- * Elasticsearch6 config model
- */
-class Config extends \Magento\Elasticsearch\Model\Config
-{
-    /**
-     * Search engine name
-     */
-    private const ENGINE_NAME_6 = 'elasticsearch6';
-
-    /**
-     * @var EngineResolverInterface
-     */
-    private $engineResolver;
-
-    /**
-     * Constructor
-     *
-     * @param ScopeConfigInterface $scopeConfig
-     * @param ClientResolver|null $clientResolver
-     * @param EngineResolverInterface|null $engineResolver
-     * @param string|null $prefix
-     */
-    public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\AdvancedSearch\Model\Client\ClientResolver $clientResolver,
-        \Magento\Framework\Search\EngineResolverInterface $engineResolver,
-        $prefix = null
-    ) {
-        parent::__construct($scopeConfig, $clientResolver, $engineResolver, $prefix);
-        $this->engineResolver = $engineResolver;
-    }
-
-    /**
-     * Return true if third party search engine is used
-     *
-     * @return bool
-     */
-    public function isElasticsearchEnabled()
-    {
-        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME_6]);
-    }
-}
diff --git a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
index 77e1270f54fc2..d05471734bb8f 100644
--- a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
+++ b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Search\Model\QueryInterface;
 use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
-use Magento\Elasticsearch6\Model\Config;
+use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
 use Magento\Search\Model\QueryResultFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
index 957edc559fdcb..b3c60b70ffa8e 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php
@@ -67,7 +67,7 @@ class SuggestionsTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->config = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Config::class)
+        $this->config = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
             ->disableOriginalConstructor()
             ->setMethods(['isElasticsearchEnabled'])
             ->getMock();
diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index df71f3c3158d3..4532e5020b665 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -6,6 +6,14 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="string">elasticsearch6</item>
+            </argument>
+        </arguments>
+    </type>
+
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">

From cd9f0f9c61b267887f36bfbcf1a049f6a70d415e Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Tue, 12 Mar 2019 12:14:50 -0500
Subject: [PATCH 0518/1055] MC-4865: Convert UpdateStoreEntityTest to MFTF

Addressing review comments
---
 .../AdminCreateStoreViewActionGroup.xml       | 26 -------------------
 .../AssertStoreViewFormActionGroup.xml        | 25 ++++++++++++++++++
 .../AssertStoreViewInGridActionGroup.xml      | 23 ++++++++++++++++
 .../Mftf/Test/AdminUpdateStoreViewTest.xml    |  6 ++---
 4 files changed, 51 insertions(+), 29 deletions(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index b6855b72e0f27..d5ebb9b79fe07 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -62,30 +62,4 @@
         <waitForElementVisible selector="{{errorMessageSelector}}" stepKey="waitForErrorMessage"/>
         <see selector="{{errorMessageSelector}}" userInput="{{errorMessage}}" stepKey="seeErrorMessage"/>
     </actionGroup>
-    <actionGroup name="AssertStoreViewInGrid">
-        <arguments>
-            <argument name="storeViewName" type="string"/>
-        </arguments>
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
-        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
-        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForStoreToLoad"/>
-        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewInGridMessage"/>
-    </actionGroup>
-    <actionGroup name="AssertStoreViewForm">
-        <arguments>
-            <argument name="storeDropdown" type="string"/>
-            <argument name="storeViewName" type="string"/>
-            <argument name="storeViewCode" type="string"/>
-            <argument name="status" type="string"/>
-        </arguments>
-        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
-        <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
-        <seeInField selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{storeDropdown}}" stepKey="seeAssertStore"/>
-        <seeInField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewName"/>
-        <seeInField selector="{{AdminNewStoreSection.storeCodeTextField}}" userInput="{{storeViewCode}}" stepKey="seeAssertStoreViewCode"/>
-        <seeInField selector="{{AdminNewStoreSection.statusDropdown}}" userInput="{{status}}" stepKey="seeAssertStatus"/>
-    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml
new file mode 100644
index 0000000000000..92ebbc3950131
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStoreViewFormActionGroup">
+        <arguments>
+            <argument name="storeDropdown" type="string"/>
+            <argument name="storeViewName" type="string"/>
+            <argument name="storeViewCode" type="string"/>
+            <argument name="status" type="string"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
+        <seeInField selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{storeDropdown}}" stepKey="seeAssertStore"/>
+        <seeInField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewName"/>
+        <seeInField selector="{{AdminNewStoreSection.storeCodeTextField}}" userInput="{{storeViewCode}}" stepKey="seeAssertStoreViewCode"/>
+        <seeInField selector="{{AdminNewStoreSection.statusDropdown}}" userInput="{{status}}" stepKey="seeAssertStatus"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
new file mode 100644
index 0000000000000..b4f290227cd4e
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStoreViewInGridActionGroup">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewInGridMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml
index 963afb7ff482b..054ee789fbdc5 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreViewTest.xml
@@ -36,7 +36,7 @@
             </after>
 
             <!--Search created store view in grid-->
-            <actionGroup ref="AssertStoreViewInGrid" stepKey="searchCreatedStoreViewInGrid">
+            <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchCreatedStoreViewInGrid">
                 <argument name="storeViewName" value="{{storeViewData.name}}"/>
             </actionGroup>
             <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
@@ -51,12 +51,12 @@
             </actionGroup>
 
             <!--Search updated store view in grid and verify AssertStoreViewInGridMessage-->
-            <actionGroup ref="AssertStoreViewInGrid" stepKey="verifyUpdatedStoreViewInGrid">
+            <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="verifyUpdatedStoreViewInGrid">
                 <argument name="storeViewName" value="{{SecondStoreUnique.name}}"/>
             </actionGroup>
 
             <!--Go to store view form page and verify AssertStoreForm-->
-            <actionGroup ref="AssertStoreViewForm" stepKey="verifyStoreViewForm">
+            <actionGroup ref="AssertStoreViewFormActionGroup" stepKey="verifyStoreViewForm">
                 <argument name="storeDropdown" value="{{_defaultStoreGroup.name}}"/>
                 <argument name="storeViewName" value="{{SecondStoreUnique.name}}"/>
                 <argument name="storeViewCode" value="{{SecondStoreUnique.code}}"/>

From f40faed9c2128a0018a50c9605b69e455d150138 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 12 Mar 2019 12:45:35 -0500
Subject: [PATCH 0519/1055] GraphQL-458: CustomerGraphQl module refactoring

---
 .../Model/Customer/CreateCustomerAccount.php  |  2 +
 .../Model/Customer/SaveCustomer.php           | 59 +++++++++++++++++++
 .../Model/Customer/UpdateCustomerAccount.php  | 46 +++------------
 .../Model/Cart/SetBillingAddressOnCart.php    |  4 --
 4 files changed, 70 insertions(+), 41 deletions(-)
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
index 75371b805e023..b7b66df042467 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
@@ -88,6 +88,8 @@ public function execute(array $data): CustomerInterface
     }
 
     /**
+     * Create account
+     *
      * @param array $data
      * @return CustomerInterface
      * @throws LocalizedException
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php
new file mode 100644
index 0000000000000..f8b7947f09ba7
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Customer\Api\Data\CustomerInterface;
+
+/**
+ * Save customer
+ */
+class SaveCustomer
+{
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Save customer
+     *
+     * @param CustomerInterface $customer
+     * @param array $data
+     * @throws GraphQlAlreadyExistsException
+     * @throws GraphQlAuthenticationException
+     * @throws GraphQlInputException
+     */
+    public function execute(CustomerInterface $customer): void
+    {
+        try {
+            $this->customerRepository->save($customer);
+        } catch (AlreadyExistsException $e) {
+            throw new GraphQlAlreadyExistsException(
+                __('A customer with the same email address already exists in an associated website.'),
+                $e
+            );
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
index b58ea8f0d21ab..8601d586b3c95 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
@@ -7,9 +7,6 @@
 
 namespace Magento\CustomerGraphQl\Model\Customer;
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlAlreadyExistsException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -23,9 +20,9 @@
 class UpdateCustomerAccount
 {
     /**
-     * @var CustomerRepositoryInterface
+     * @var SaveCustomer
      */
-    private $customerRepository;
+    private $saveCustomer;
 
     /**
      * @var StoreManagerInterface
@@ -53,7 +50,7 @@ class UpdateCustomerAccount
     private $restrictedKeys;
 
     /**
-     * @param CustomerRepositoryInterface $customerRepository
+     * @param SaveCustomer $saveCustomer
      * @param StoreManagerInterface $storeManager
      * @param CheckCustomerPassword $checkCustomerPassword
      * @param DataObjectHelper $dataObjectHelper
@@ -61,14 +58,14 @@ class UpdateCustomerAccount
      * @param array $restrictedKeys
      */
     public function __construct(
-        CustomerRepositoryInterface $customerRepository,
+        SaveCustomer $saveCustomer,
         StoreManagerInterface $storeManager,
         CheckCustomerPassword $checkCustomerPassword,
         DataObjectHelper $dataObjectHelper,
         ChangeSubscriptionStatus $changeSubscriptionStatus,
         array $restrictedKeys = []
     ) {
-        $this->customerRepository = $customerRepository;
+        $this->saveCustomer = $saveCustomer;
         $this->storeManager = $storeManager;
         $this->checkCustomerPassword = $checkCustomerPassword;
         $this->dataObjectHelper = $dataObjectHelper;
@@ -87,26 +84,6 @@ public function __construct(
      * @throws GraphQlInputException
      */
     public function execute(CustomerInterface $customer, array $data): void
-    {
-        try {
-            $this->updateCustomer($customer, $data);
-        } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
-        }
-
-        if (isset($data['is_subscribed'])) {
-            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
-        }
-    }
-
-    /**
-     * @param CustomerInterface $customer
-     * @param array $data
-     * @throws GraphQlAlreadyExistsException
-     * @throws GraphQlAuthenticationException
-     * @throws GraphQlInputException
-     */
-    private function updateCustomer(CustomerInterface $customer, array $data): void
     {
         if (isset($data['email']) && $customer->getEmail() !== $data['email']) {
             if (!isset($data['password']) || empty($data['password'])) {
@@ -122,15 +99,10 @@ private function updateCustomer(CustomerInterface $customer, array $data): void
 
         $customer->setStoreId($this->storeManager->getStore()->getId());
 
-        try {
-            $this->customerRepository->save($customer);
-        } catch (AlreadyExistsException $e) {
-            throw new GraphQlAlreadyExistsException(
-                __('A customer with the same email address already exists in an associated website.'),
-                $e
-            );
-        } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()), $e);
+        $this->saveCustomer->execute($customer);
+
+        if (isset($data['is_subscribed'])) {
+            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
         }
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
index 0aafe0e7882d7..31524ea023222 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -9,8 +9,6 @@
 
 use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
 use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -67,8 +65,6 @@ public function __construct(
      * @param array $billingAddressInput
      * @return void
      * @throws GraphQlInputException
-     * @throws GraphQlAuthenticationException
-     * @throws GraphQlAuthorizationException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(ContextInterface $context, CartInterface $cart, array $billingAddressInput): void

From d3482b7724b6f1e82378a87c0344058af65b06d9 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Tue, 12 Mar 2019 20:06:51 +0200
Subject: [PATCH 0520/1055] magento/magento2#20785 Use batches and direct
 queries to fix sales address upgrade

---
 .../Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
index c05d2d01a1f14..a75690536e760 100644
--- a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
+++ b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
@@ -181,7 +181,7 @@ private function fillQuoteAddressIdInSalesOrderAddressProcessBatch(
                 'quote_address_id' => $quoteAddresses[$orderAddress['quote_id']]['address_id'] ?? null,
             ];
             $where = [
-                'entity_id' => $orderAddress['entity_id']
+                'entity_id = ?' => $orderAddress['entity_id']
             ];
 
             $salesConnection->update($salesOrderAddressTable, $bind, $where);

From a99c53ab69c8be65d86341c360b285a51c815532 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 12 Mar 2019 14:01:28 -0500
Subject: [PATCH 0521/1055] MC-13613: Product mass update

---
 .../Controller/Adminhtml/Product/Action/Attribute/Save.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index e6bdca02061ef..f63e5a681c42b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -198,7 +198,6 @@ private function publish(
                     $productIdsChunk,
                     $bulkUuid
                 );
-                $this->pillPut->put();
             }
 
             if ($attributesData) {
@@ -215,6 +214,7 @@ private function publish(
         }
 
         if (!empty($operations)) {
+            $this->pillPut->put();
             $result = $this->bulkManagement->scheduleBulk(
                 $bulkUuid,
                 $operations,

From 92f1f5785289b0f87a186a3e47642f9b88e9f940 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 12 Mar 2019 14:12:39 -0500
Subject: [PATCH 0522/1055] MC-13613: Product mass update

---
 app/code/Magento/Catalog/composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 74e7f40b1f062..7efd63fb7a4aa 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -8,7 +8,6 @@
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
         "magento/module-message-queue": "*",
-        "magento/module-authorization": "*",
         "magento/module-asynchronous-operations": "*",
         "magento/module-backend": "*",
         "magento/module-catalog-inventory": "*",

From 8743bbbffccde3cc6cd5265f6e725375cb02ad90 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Mon, 11 Mar 2019 23:55:58 +0100
Subject: [PATCH 0523/1055] GraphQL-423: Covered the cases what are left for
 SetShippingMethod test.

---
 .../Customer/SetShippingMethodsOnCartTest.php | 147 +++++++++++++++++-
 1 file changed, 141 insertions(+), 6 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 238cff96185d7..0209f0b99658d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote\Address\Rate;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\Quote;
@@ -53,6 +54,11 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
      */
     private $productRepository;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @inheritdoc
      */
@@ -62,6 +68,7 @@ protected function setUp()
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->quoteRepository = $objectManager->get(CartRepositoryInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
         $this->rate = $objectManager->get(Rate::class);
         $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
@@ -94,7 +101,7 @@ public function testShippingMethodWithVirtualProduct()
             $maskedQuoteId,
             'flatrate',
             'flatrate_flatrate',
-            '1'
+            $shippingAddress->getId()
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -323,29 +330,157 @@ public function testSetShippingMethodToGuestCart()
         $this->graphQlQuery($mutation);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToAnotherCustomerCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+
+        /** @var Quote $quote test01 */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $quote->getShippingAddress()->getId()
+        );
+
+        self::expectExceptionMessage(
+            'Carrier with such method not found: flatrate, flatrate'
+        );
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToNonExistentCartAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            '16800'
+        );
+        self::expectExceptionMessage(
+            'Could not find a cart address with ID "16800"'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToGuestCartAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('guest_quote');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'guest_quote', 'reserved_order_id');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $quote->getShippingAddress()->getId()
+        );
+
+        $this->graphQlQuery($mutation);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToAnotherCustomerCartAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $quote->getShippingAddress()->getId()
+        );
+
+        self::expectExceptionMessage(
+            'Carrier with such method not found: flatrate, flatrate'
+        );
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetMultipleShippingMethods()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $shippingAddressId = $quote->getShippingAddress()->getId();
+
+        $mutation = <<<MUTATION
+mutation {
+  setShippingMethodsOnCart(input: 
+    {
+      cart_id: "$maskedQuoteId", 
+      shipping_methods: [{
+          cart_address_id: $shippingAddressId
+          method_code: "flatrate"
+          carrier_code: "flatrate"
+        },
+        {
+          cart_address_id: $shippingAddressId
+          method_code: "ups"
+          carrier_code: "ups"
+      }]
+    }
+    ) {
+    cart {
+      shipping_addresses {
+        address_id
+        firstname
+        lastname
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+          amount
+        }
+      }
+    }
+  }
+}
+
+MUTATION;
+        self::expectExceptionMessage(
+            'You cannot specify multiple shipping methods.'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
     /**

From 112f4254513301451e4af005ac928ff9dc53915c Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Tue, 12 Mar 2019 21:00:08 +0100
Subject: [PATCH 0524/1055] GraphQL-423: Fixed some errors. Replaced save quote
 to save by quote repository. Worked on code style.

---
 .../Customer/SetShippingMethodsOnCartTest.php | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 0209f0b99658d..1a39d35005ee0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -9,15 +9,15 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Quote\Model\Quote\Address\Rate;
-use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
 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 setting shipping methods on cart for customer
@@ -30,34 +30,34 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var QuoteResource
+     * @var ProductRepositoryInterface
      */
-    private $quoteResource;
+    private $productRepository;
 
     /**
-     * @var QuoteFactory
+     * @var Rate
      */
-    private $quoteFactory;
+    private $rate;
 
     /**
-     * @var QuoteIdToMaskedQuoteIdInterface
+     * @var QuoteResource
      */
-    private $quoteIdToMaskedId;
+    private $quoteResource;
 
     /**
-     * @var Rate
+     * @var QuoteFactory
      */
-    private $rate;
+    private $quoteFactory;
 
     /**
-     * @var ProductRepositoryInterface
+     * @var CartRepositoryInterface
      */
-    private $productRepository;
+    private $quoteRepository;
 
     /**
-     * @var CartRepositoryInterface
+     * @var QuoteIdToMaskedQuoteIdInterface
      */
-    private $quoteRepository;
+    private $quoteIdToMaskedId;
 
     /**
      * @inheritdoc
@@ -65,13 +65,13 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->rate = $objectManager->get(Rate::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->quoteRepository = $objectManager->get(CartRepositoryInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->rate = $objectManager->get(Rate::class);
-        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -94,8 +94,9 @@ public function testShippingMethodWithVirtualProduct()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -132,8 +133,9 @@ public function testShippingMethodWithSimpleProduct()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -166,8 +168,9 @@ public function testShippingMethodWithSimpleProductWithoutAddress()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -228,8 +231,9 @@ public function testSetNonExistentShippingMethod()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -271,8 +275,9 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -295,13 +300,13 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
      */
     public function testSetShippingMethodToNonExistentCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('Non_existent_cart_reversed_quote_id');
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            '1'
+            '80900'
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -528,10 +533,6 @@ private function prepareMutationQuery(
 QUERY;
     }
 
-    private function addShippingMethodToQuote(Quote $quote)
-    {
-    }
-
     /**
      * @param string $reversedQuoteId
      * @return string

From 82dfd9103b1e5641d1a939a9f426ccf0d81557a4 Mon Sep 17 00:00:00 2001
From: Alex Calandra <calandra.aj@gmail.com>
Date: Tue, 12 Mar 2019 15:31:06 -0500
Subject: [PATCH 0525/1055] MQE-1477: Resolve Test Rerun Issues for Disable
 Wysiwyg Suite

- Removing Two tests from disabled wysiwyg suite
- Removing disable wysiwyg from one test
---
 .../Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml     | 1 -
 app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml  | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
index 05b7dfeeb3953..03edc69e6d625 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -16,7 +16,6 @@
             <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/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
index b4bcdaadf9a09..c3c92dc59c288 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -17,10 +17,8 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94229"/>
             <group value="Cms"/>
-            <group value="WYSIWYGDisabled"/>
         </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"/>
@@ -69,7 +67,6 @@
                 <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 a93688a779b72724c1354013d749acf933499505 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Tue, 12 Mar 2019 15:52:23 -0500
Subject: [PATCH 0526/1055] ENGCOM-4389: Elasticsearch6 implementation  - Fixed
 removing out of stock items from ES index

---
 app/code/Magento/Elasticsearch6/etc/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 4532e5020b665..9999c29c1a257 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -52,7 +52,7 @@
                 <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Client\ElasticsearchFactory</item>
             </argument>
             <argument name="clientOptions" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Config</item>
+                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch\Model\Config</item>
             </argument>
         </arguments>
     </type>

From 13aaa6814223f6a1a478686bc3238a38c623bddc Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Tue, 12 Mar 2019 15:54:23 -0500
Subject: [PATCH 0527/1055] ENGCOM-4389: Elasticsearch6 implementation  -
 Removed usage of unused class

---
 app/code/Magento/Elasticsearch6/etc/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index f9ee035972a35..4ece66ea1bbf3 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -52,7 +52,7 @@
                 <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Client\ElasticsearchFactory</item>
             </argument>
             <argument name="clientOptions" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Config</item>
+                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch\Model\Config</item>
             </argument>
         </arguments>
     </type>

From 7139cfaff95d6a7d2abe8aba27cec23c1af9e53e Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Tue, 12 Mar 2019 15:55:51 -0500
Subject: [PATCH 0528/1055] MC-4343: Convert NavigateMenuTest to MFTF

---
 ...dminSystemNotificationNavigateMenuTest.xml |   36 +
 ...AdminAdvancedReportingNavigateMenuTest.xml |   35 +
 .../AdminAssertPageTitleActionGroup.xml       |   17 +
 .../AdminNavigateMenuActionGroup.xml          |    6 +-
 .../Test/Mftf/Section/AdminMenuSection.xml    |    4 +-
 .../AdminContentScheduleNavigateMenuTest.xml  |   36 +
 .../Test/AdminDashboardNavigateMenuTest.xml   |   33 +
 .../Test/Mftf/Test/AdminNavigateMenuTest.xml  | 1505 -----------------
 .../AdminStoresAllStoresNavigateMenuTest.xml  |   36 +
 ...minStoresConfigurationNavigateMenuTest.xml |   36 +
 ...nSystemCacheManagementNavigateMenuTest.xml |   36 +
 ...AdminCatalogCategoriesNavigateMenuTest.xml |   36 +
 .../AdminCatalogProductsNavigateMenuTest.xml  |   36 +
 .../AdminStoresAttributeSetNavigateMenu.xml   |   36 +
 .../AdminStoresProductNavigateMenuTest.xml    |   36 +
 ...ketingCatalogPriceRuleNavigateMenuTest.xml |   36 +
 ...inMarketingSearchTermsNavigateMenuTest.xml |   36 +
 ...dminReportsSearchTermsNavigateMenuTest.xml |   36 +
 ...oresTermsAndConditionsNavigateMenuTest.xml |   36 +
 .../AdminContentBlocksNavigateMenuTest.xml    |   36 +
 .../AdminContentPagesNavigateMenuTest.xml     |   36 +
 ...minStoresCurrencyRatesNavigateMenuTest.xml |   36 +
 ...nStoresCurrencySymbolsNavigateMenuTest.xml |   36 +
 ...nCustomersAllCustomersNavigateMenuTest.xml |   36 +
 ...ustomersCustomerGroupsNavigateMenuTest.xml |   36 +
 ...dminCustomersNowOnlineNavigateMenuTest.xml |   36 +
 ...arketingEmailTemplatesNavigateMenuTest.xml |   36 +
 .../Test/AdminExportPageNavigateMenuTest.xml  |   36 +
 .../AdminSystemImportNavigateMenuTest.xml     |   36 +
 ...nSystemIndexManagementNavigateMenuTest.xml |   36 +
 ...dminSystemIntegrationsNavigateMenuTest.xml |   36 +
 ...rketingNewsletterQueueNavigateMenuTest.xml |   36 +
 ...gNewsletterSubscribersNavigateMenuTest.xml |   36 +
 ...tingNewsletterTemplateNavigateMenuTest.xml |   37 +
 ...wsletterProblemReportsNavigateMenuTest.xml |   36 +
 ...eportsPayPalSettlementNavigateMenuTest.xml |   36 +
 ...SalesBillingAgreementsNavigateMenuTest.xml |   36 +
 ...nReportsAbandonedCartsNavigateMenuTest.xml |   36 +
 ...dminReportsBestsellersNavigateMenuTest.xml |   36 +
 .../AdminReportsCouponsNavigateMenuTest.xml   |   36 +
 .../AdminReportsDownloadsNavigateMenuTest.xml |   36 +
 .../AdminReportsInvoicedNavigateMenuTest.xml  |   36 +
 .../AdminReportsLowStockNavigateMenuTest.xml  |   36 +
 .../Test/AdminReportsNewNavigateMenuTest.xml  |   36 +
 ...AdminReportsOrderCountNavigateMenuTest.xml |   36 +
 ...AdminReportsOrderTotalNavigateMenuTest.xml |   36 +
 .../AdminReportsOrderedNavigateMenuTest.xml   |   36 +
 .../AdminReportsOrdersNavigateMenuTest.xml    |   36 +
 ...nReportsProductsInCartNavigateMenuTest.xml |   36 +
 ...portsRefreshStatisticsNavigateMenuTest.xml |   37 +
 .../Test/AdminReportsTaxNavigateMenuTest.xml  |   36 +
 .../AdminReportsViewsNavigateMenuTest.xml     |   36 +
 .../AdminMarketingReviewsNavigateMenuTest.xml |   36 +
 ...dminReportsByCustomersNavigateMenuTest.xml |   36 +
 ...AdminReportsByProductsNavigateMenuTest.xml |   36 +
 .../AdminStoresRatingNavigateMenuTest.xml     |   36 +
 .../AdminSalesCreditMemosNavigateMenuTest.xml |   36 +
 .../AdminSalesInvoicesNavigateMenuTest.xml    |   36 +
 .../Test/AdminSalesOrdersNavigateMenuTest.xml |   36 +
 .../AdminSalesShipmentsNavigateMenuTest.xml   |   36 +
 ...AdminSalesTransactionsNavigateMenuTest.xml |   36 +
 ...AdminStoresOrderStatusNavigateMenuTest.xml |   36 +
 ...arketingCartPriceRulesNavigateMenuTest.xml |   36 +
 .../AdminMarketingSiteMapNavigateMenuTest.xml |   36 +
 .../AdminStoresTaxRulesNavigateMenuTest.xml   |   36 +
 ...StoresTaxZonesAndRatesNavigateMenuTest.xml |   36 +
 ...emImportExportTaxRatesNavigateMenuTest.xml |   36 +
 .../AdminContentThemesNavigateMenuTest.xml    |   36 +
 ...inMarketingUrlRewritesNavigateMenuTest.xml |   36 +
 .../AdminSystemAllUsersNavigateMenuTest.xml   |   36 +
 ...AdminSystemLockedUsersNavigateMenuTest.xml |   36 +
 ...temManageEncryptionKeyNavigateMenuTest.xml |   36 +
 .../AdminSystemUserRolesNavigateMenuTest.xml  |   36 +
 ...nSystemCustomVariablesNavigateMenuTest.xml |   36 +
 .../AdminContentWidgetsNavigateMenuTest.xml   |   36 +
 75 files changed, 2575 insertions(+), 1511 deletions(-)
 create mode 100644 app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertPageTitleActionGroup.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
 delete mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenu.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
 create mode 100644 app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml
 create mode 100644 app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml

diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
new file mode 100644
index 0000000000000..c886a7c67de2a
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemNotificationNavigateMenuTest">
+        <annotations>
+            <features value="AdminNotification"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system notification navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Notifications"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14125"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemNotificationPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-adminnotification"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Notifications"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
new file mode 100644
index 0000000000000..6452bd0554f00
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
@@ -0,0 +1,35 @@
+<?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="AdminAdvancedReportingNavigateMenuTest">
+        <annotations>
+            <features value="Analytics"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin advanced reporting navigate menu test"/>
+            <description value="Admin should be able to navigate through advanced reporting admin menu to BI reports page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14152"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateAdvancedReportingPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="advanced-reporting"/>
+        </actionGroup>
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertPageTitleActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertPageTitleActionGroup.xml
new file mode 100644
index 0000000000000..42ffb4b7421ac
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAssertPageTitleActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="AdminAssertPageTitleActionGroup">
+        <arguments>
+            <argument name="title" type="string"/>
+        </arguments>
+        <see selector="{{AdminGridHeaders.title}}" userInput="{{title}}" stepKey="assertPageTitle"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
index 84864688321a0..3dec005529911 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
@@ -8,14 +8,12 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="NavigateMenuActionGroup">
+    <actionGroup name="AdminNavigateMenuActionGroup">
         <arguments>
             <argument name="menuItem" type="string"/>
             <argument name="submenuItem" type="string"/>
-            <argument name="title" type="string"/>
         </arguments>
-        <click selector="{{AdminMenuSection.mainMenuItem(menuItem}}" stepKey="clickOnMenuItem"/>
+        <click selector="{{AdminMenuSection.mainMenuItem(menuItem)}}" stepKey="clickOnMenuItem"/>
         <click selector="{{AdminMenuSection.submenuItem(submenuItem)}}" stepKey="clickOnSubmenuItem"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="{{title}}" stepKey="assertPageTitle"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index d9b4eee879dc8..05c48e5519a23 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -23,7 +23,7 @@
         <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
 
         <!-- Navigate menu selectors -->
-        <element name="mainMenuItem" type="button" selector="//li[contains(@class, 'level-0')]//span[text() ='{{var}}']/ancestor::a" parameterized="true" timeout="30"/>
-        <element name="submenuItem" type="button" selector="//span[text() ='{{var}}']/ancestor::a" parameterized="true" timeout="30"/>
+        <element name="mainMenuItem" type="button" selector="//li[contains(@id, 'menu-magento') and contains(@id, '{{var}}')]" parameterized="true" timeout="30"/>
+        <element name="submenuItem" type="button" selector="//li[contains(@class, 'item') and contains(@class, '{{var}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml
new file mode 100644
index 0000000000000..d7d46790ff911
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminContentScheduleNavigateMenuTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin content schedule navigate menu test"/>
+            <description value="Admin should be able to navigate to Content > Schedule"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14117"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentSchedulePage">
+            <argument name="menuItem" value="backend-content"/>
+            <argument name="submenuItem" value="system-design-schedule"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Store Design Schedule"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
new file mode 100644
index 0000000000000..2cd2d79c8121d
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
@@ -0,0 +1,33 @@
+<?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="AdminDashboardNavigateMenuTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin dashboard navigate menu test"/>
+            <description value="Admin should be able to navigate to Dashboard"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14116"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <click selector="{{AdminMenuSection.mainMenuItem('backend-dashboard')}}" stepKey="clickOnMenuItem"/>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Dashboard"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml
deleted file mode 100644
index 37cec8e36bacb..0000000000000
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminNavigateMenuTest.xml
+++ /dev/null
@@ -1,1505 +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="NavigateMenuTest1">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 1"/>
-            <description value="Admin should be able to navigate to System > Notifications"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14125"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/notification/" stepKey="goToNotificationPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Notifications" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest2">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 2"/>
-            <description value="Admin should be able to navigate to Dashboard"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14116"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/dashboard/" stepKey="goToDashboardPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Dashboard" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest3">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 3"/>
-            <description value="Admin should be able to navigate to Content > Schedule"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14117"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/system_design/" stepKey="goToSchedulePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Store Design Schedule" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest4">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 4"/>
-            <description value="Admin should be able to navigate to Stores > All Stores"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14118"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/system_store/" stepKey="goToAllStoresPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Stores" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest5">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 5"/>
-            <description value="Admin should be able to navigate to Stores > Configuration"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14119"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/system_config/" stepKey="goToConfigurationPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Configuration" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest6">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 6"/>
-            <description value="Admin should be able to navigate to System > Cache Management"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14120"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/cache/" stepKey="goToCacheManagementPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Cache Management" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest9">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 9"/>
-            <description value="Admin should be able to navigate to Catalog > Products"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14130"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/catalog/product/" stepKey="goToCatalogProductsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Products" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest10">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 10"/>
-            <description value="Admin should be able to navigate to Catalog > Categories"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14131"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/catalog/category/" stepKey="goToCategoriesPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Default Category (ID: 2)" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest11">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 11"/>
-            <description value="Admin should be able to navigate to Stores > Product"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14132"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/catalog/product_attribute/" stepKey="goToProductAttributePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Product Attributes" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest12">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 12"/>
-            <description value="Admin should be able to navigate to Stores > Attribute Set"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14133"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/catalog/product_set/" stepKey="goToAttributeSetPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Attribute Sets" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest14">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 14"/>
-            <description value="Admin should be able to navigate to Marketing > Catalog Price Rule"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14134"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/catalog_rule/promo_catalog" stepKey="goToCatalogPriceRulePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Catalog Price Rule" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest15">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 15"/>
-            <description value="Admin should be able to navigate to Marketing > Search Terms"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14135"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/search/term/index/" stepKey="goToSearchTermsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Search Terms" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest16">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 16"/>
-            <description value="Admin should be able to navigate to Reports > Search Terms"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14136"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/search/term/report/" stepKey="goToSearchTermsReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Search Terms Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest17">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 17"/>
-            <description value="Admin should be able to navigate to Stores > Terms and Conditions"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14148"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/checkout/agreement/" stepKey="goToTermsAndConditionsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Terms and Conditions" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest18">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 18"/>
-            <description value="Admin should be able to navigate to Content > Pages"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14128"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/cms_page/" stepKey="goToContentPagesPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Pages" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest19">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 19"/>
-            <description value="Admin should be able to navigate to Content > Blocks"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14129"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/cms/block/" stepKey="goToContentBlocksPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Blocks" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest20">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 20"/>
-            <description value="Admin should be able to navigate to Stores > Currency Rates"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14150"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/system_currency/" stepKey="goToCurrencyRatesPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Currency Rates" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest21">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 21"/>
-            <description value="Admin should be able to navigate to Stores > Currency Symbols"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14151"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/system_currencysymbol/" stepKey="goToCurrencySymbolsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Currency Symbols" stepKey="assertPageTitle"/>
-    </test>
-
-    <test name="NavigateMenuTestAdvancedReporting">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test advanced reporting"/>
-            <description value="Admin should be able to navigate through advanced reporting admin menu to BI reports page"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14152"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="admin/analytics/reports/show/" stepKey="goToAdvancedReportingPage"/>
-        <seeInCurrentUrl url="https://advancedreporting.rjmetrics.com/report" stepKey="seeInCurrentUrlAdvancedreporting"/>
-    </test>
-
-    <test name="NavigateMenuTest22">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 22"/>
-            <description value="Admin should be able to navigate to Customers > All Customers"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14113"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/customer/index/" stepKey="goToAllCustomerPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Customers" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest23">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 23"/>
-            <description value="Admin should be able to navigate to Customers > Now Online"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14114"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/customer/online/" stepKey="goToNowOnlinePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Customers Now Online" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest24">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 24"/>
-            <description value="Admin should be able to navigate to Customers > Customer Groups"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14115"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/customer/group/" stepKey="goToCustomerGroupsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Customer Groups" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest29">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 29"/>
-            <description value="Admin should be able to navigate to Marketing > Email Templates"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14173"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/email_template/" stepKey="goToPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Email Templates" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest35">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 35"/>
-            <description value="Admin should be able to navigate to System > Import "/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14156"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/import/" stepKey="goToImportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Import" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest36">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 36"/>
-            <description value="Admin should be able to navigate to System > Export"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14157"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/export/" stepKey="goToExportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Export" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest37">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 37"/>
-            <description value="Admin should be able to navigate to System > Index Management"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14127"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/indexer/indexer/list/" stepKey="goToIndexManagementPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Index Management" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest38">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 38"/>
-            <description value="Admin should be able to navigate to System > Integrations"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14149"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/integration/" stepKey="goToIntegrationsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Integrations" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest46">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 46"/>
-            <description value="Admin should be able to navigate to Marketing > Newsletter Template"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14188"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/newsletter/template/" stepKey="goToNewsletterTemplatePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Newsletter Templates" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest47">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 47"/>
-            <description value="Admin should be able to navigate to Marketing > Newsletter Queue"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14189"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/newsletter/queue/" stepKey="goToNewsletterQueuePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Newsletter Queue" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest48">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 48"/>
-            <description value="Admin should be able to navigate to Marketing > Newsletter Subscribers"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14190"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/newsletter/subscriber/" stepKey="goToNewsletterSubscribersPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Newsletter Subscribers" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest49">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 49"/>
-            <description value="Admin should be able to navigate to Reports > Newsletter Problem Reports"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14191"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/newsletter/problem/" stepKey="goToNewsletterProblemsReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Newsletter Problems Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest50">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 50"/>
-            <description value="Admin should be able to navigate to Reports > PayPal Settlement"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14193"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/paypal/paypal_reports/" stepKey="goToPayPalSettlementReportsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="PayPal Settlement Reports" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest51">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 51"/>
-            <description value="Admin should be able to navigate to Sales > Billing Agreements"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14194"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/paypal/billing_agreement/" stepKey="goToBillingAgreementsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Billing Agreements" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest52">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 52"/>
-            <description value="Admin should be able to navigate to System > Locked Users"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14121"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/locks/" stepKey="goToLockedUsersPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Locked Users" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest53">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 53"/>
-            <description value="Admin should be able to navigate to System > Manage Encryption Key"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14122"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/crypt_key/" stepKey="goToManageEncryptionKeyPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Encryption Key" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest55">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 55"/>
-            <description value="Admin should be able to navigate to Reports > Products in Cart"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14158"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_shopcart/product/" stepKey="goToReportShopcartProductPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Products in Carts" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest56">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 56"/>
-            <description value="Admin should be able to navigate to Reports > Abandoned Carts"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14159"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_shopcart/abandoned/" stepKey="goToAbandonedCartsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Abandoned Carts" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest57">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 57"/>
-            <description value="Admin should be able to navigate to Reports > Orders"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14160"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_sales/sales/" stepKey="goToOrdersReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Orders Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest58">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 58"/>
-            <description value="Admin should be able to navigate to Reports > Tax"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14161"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_sales/tax/" stepKey="goToTaxReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Tax Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest59">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 59"/>
-            <description value="Admin should be able to navigate to Reports > Invoiced"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14162"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_sales/invoiced/" stepKey="goToInvoiceReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Invoice Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest60">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 60"/>
-            <description value="Admin should be able to navigate to Reports > Coupons"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14163"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_sales/coupons/" stepKey="goToCouponsReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Coupons Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest61">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 61"/>
-            <description value="Admin should be able to navigate to Reports > Order Total"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14164"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_customer/totals/" stepKey="goToOrderTotalReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Order Total Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest62">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 62"/>
-            <description value="Admin should be able to navigate to Reports > Order Count"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14165"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_customer/orders/" stepKey="goToOrderCountReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Order Count Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest63">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 63"/>
-            <description value="Admin should be able to navigate to Reports > New"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14166"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_customer/accounts/" stepKey="goToNewAccountsReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="New Accounts Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest64">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 64"/>
-            <description value="Admin should be able to navigate to Reports > Views"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14167"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_product/viewed/" stepKey="goToProductViewsReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Product Views Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest65">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 65"/>
-            <description value="Admin should be able to navigate to Reports > Bestsellers"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14168"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_sales/bestsellers/" stepKey="goToBestsellersReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Bestsellers Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest66">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 66"/>
-            <description value="Admin should be able to navigate to Reports > Low Stock"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14169"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_product/lowstock/" stepKey="goToLowStockReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Low Stock Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest67">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 67"/>
-            <description value="Admin should be able to navigate to Reports > Ordered"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14170"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_product/sold/" stepKey="goToOrderedProductsReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Ordered Products Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest68">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 68"/>
-            <description value="Admin should be able to navigate to Reports > Downloads"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14171"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_product/downloads/" stepKey="goToDownloadsReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Downloads Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest69">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 69"/>
-            <description value="Admin should be able to navigate to Reports > Refresh Statistics"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14172"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_statistics/" stepKey="goToRefreshStatisticsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Refresh Statistics" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest70">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 70"/>
-            <description value="Admin should be able to navigate to Marketing > Reviews"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14196"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/review/product/index/" stepKey="goToReviewsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Reviews" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest71">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 71"/>
-            <description value="Admin should be able to navigate to Reports > By Customers"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14197"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_review/customer/" stepKey="goToCustomerReviewsReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Customer Reviews Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest72">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 72"/>
-            <description value="Admin should be able to navigate to Reports > By Products"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14198"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/reports/report_review/product/" stepKey="goToProductReviewsReportPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Product Reviews Report" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest73">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 73"/>
-            <description value="Admin should be able to navigate to Stores > Rating"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14199"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/review/rating/" stepKey="goToStoresRatingPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Ratings" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest77">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 77"/>
-            <description value="Admin should be able to navigate to Sales > Orders"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14137"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/sales/order/" stepKey="goToSalesOrdersPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Orders" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest78">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 78"/>
-            <description value="Admin should be able to navigate to Sales > Invoices"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14138"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/sales/invoice/" stepKey="goToSalesInvoicesPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Invoices" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest79">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 79"/>
-            <description value="Admin should be able to navigate to Sales > Shipments"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14139"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/sales/shipment/" stepKey="goToSalesShipmentsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Shipments" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest80">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 80"/>
-            <description value="Admin should be able to navigate to Sales > Credit Memos"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14140"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/sales/creditmemo/" stepKey="goToSalesCreditMemosPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Credit Memos" stepKey="assertPageTitle"/>
-    </test>
-
-    <test name="NavigateMenuTest81">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 81"/>
-            <description value="Admin should be able to navigate to Sales > Transactions"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14141"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/sales/transactions/" stepKey="goToSalesTransactionsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Transactions" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest82">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 82"/>
-            <description value="Admin should be able to navigate to Stores > Order Status"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14142"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/sales/order_status/" stepKey="goToStoresOrderStatusPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Order Status" stepKey="assertPageTitle"/>
-    </test>
-
-    <test name="NavigateMenuTest83">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 83"/>
-            <description value="Admin should be able to navigate to Marketing > Cart Price Rules"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14143"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/sales_rule/promo_quote/" stepKey="goToCartPriceRulesPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Cart Price Rules" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest85">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 85"/>
-            <description value="Admin should be able to navigate to Marketing > Site Map"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14204"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/sitemap/" stepKey="goToSiteMapPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Site Map" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest87">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 87"/>
-            <description value="Admin should be able to navigate to Stores > Tax Rules"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14175"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/tax/rule/" stepKey="goToStoresTaxRulesPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Tax Rules" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest88">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 88"/>
-            <description value="Admin should be able to navigate to Stores > Tax Zones and Rates"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14176"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/tax/rate/" stepKey="goToTaxZonesAndRatesPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Tax Zones and Rates" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest89">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 89"/>
-            <description value="Admin should be able to navigate to System > Import/Export Tax Rates"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14177"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/tax/rate/importExport/" stepKey="goToImportExportTaxRatesPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Import and Export Tax Rates" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest90">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 90"/>
-            <description value="Admin should be able to navigate to Content > Themes"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14112"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/system_design_theme/" stepKey="goToSystemDesignThemePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Themes" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest91">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 91"/>
-            <description value="Admin should be able to navigate to Marketing > URL Rewrites"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14202"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/url_rewrite/index/" stepKey="goToMarketingUrlRewritePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="URL Rewrites" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest92">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 92"/>
-            <description value="Admin should be able to navigate to System > All Users"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14123"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/user/" stepKey="goToSystemUsersPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Users" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest93">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 93"/>
-            <description value="Admin should be able to navigate to System > User Roles"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14124"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/user_role/" stepKey="goToSystemUserRolesPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Roles" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest94">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 94"/>
-            <description value="Admin should be able to navigate to System > Custom Variables"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14126"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/system_variable/" stepKey="goToSystemVariablePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Custom Variables" stepKey="assertPageTitle"/>
-    </test>
-    <test name="NavigateMenuTest96">
-        <annotations>
-            <features value="Backend"/>
-            <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 96"/>
-            <description value="Admin should be able to navigate to Content > Widgets"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-14147"/>
-            <group value="menu"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="/admin/admin/widget_instance/" stepKey="goToContentWidgetsPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see selector="{{AdminGridHeaders.title}}" userInput="Widgets" stepKey="assertPageTitle"/>
-    </test>
-</tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml
new file mode 100644
index 0000000000000..1ae87eb90a176
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresAllStoresNavigateMenuTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores all stores navigate menu test"/>
+            <description value="Admin should be able to navigate to Stores > All Stores"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14118"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresAllStoresPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="system-store"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Stores"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml
new file mode 100644
index 0000000000000..fd2c5a6978f1d
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresConfigurationNavigateMenuTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores configuration navigate menu test"/>
+            <description value="Admin should be able to navigate to Stores > Configuration"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14119"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresConfigurationPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="system-config"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Configuration"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml
new file mode 100644
index 0000000000000..dd7a7318cc1df
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemCacheManagementNavigateMenuTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system cache management navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Cache Management"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14120"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemCacheManagementPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-cache"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Cache Management"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..141a5a53fb713
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminCatalogCategoriesNavigateMenuTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin catalog categories navigate menu test"/>
+            <description value="Admin should be able to navigate to Catalog > Categories"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14131"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCategoriesPage">
+            <argument name="menuItem" value="catalog-catalog"/>
+            <argument name="submenuItem" value="catalog-categories"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Default Category (ID: 2)"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..16fa1ecc0a6f2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminCatalogProductsNavigateMenuTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin catalog products navigate menu test"/>
+            <description value="Admin should be able to navigate to Catalog > Products"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14130"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCatalogProductsPage">
+            <argument name="menuItem" value="catalog-catalog"/>
+            <argument name="submenuItem" value="catalog-products"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Products"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenu.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenu.xml
new file mode 100644
index 0000000000000..f719040a3239a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenu.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresAttributeSetNavigateMenu">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores attribute set navigate menu"/>
+            <description value="Admin should be able to navigate to Stores > Attribute Set"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14133"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAttributeSetPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="catalog-attributes-sets"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Attribute Sets"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
new file mode 100644
index 0000000000000..3ede5a6be3212
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresProductNavigateMenuTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores product navigate menu test"/>
+            <description value="Admin should be able to navigate to Stores > Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14132"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToProductAttributePage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="catalog-attributes-attributes"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Product Attributes"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml
new file mode 100644
index 0000000000000..2344d2817907e
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminMarketingCatalogPriceRuleNavigateMenuTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin marketing catalog price rule navigate menu test"/>
+            <description value="Admin should be able to navigate to Marketing > Catalog Price Rule"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14134"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCatalogPriceRulePage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="promo-catalog"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Catalog Price Rule"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..031c31dd93595
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminMarketingSearchTermsNavigateMenuTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin marketing search terms navigate menu test"/>
+            <description value="Admin should be able to navigate to Marketing > Search Terms"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14135"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingSearchTermsPage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="search-terms"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Search Terms"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..bfcd8918e76bb
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsSearchTermsNavigateMenuTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports search terms navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Search Terms"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14136"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportSearchTermsPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-search-term"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Search Terms Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml b/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..8a1dee3041fe5
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresTermsAndConditionsNavigateMenuTest">
+        <annotations>
+            <features value="CheckoutAgreements"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores terms and conditions navigate menu test"/>
+            <description value="Admin should be able to navigate to Stores > Terms and Conditions"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14148"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresTermsAndConditionsPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="sales-checkoutagreement"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Terms and Conditions"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml
new file mode 100644
index 0000000000000..bf3d2321cd6cb
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminContentBlocksNavigateMenuTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin content blocks navigate menu test"/>
+            <description value="Admin should be able to navigate to Content > Blocks"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14129"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentBlocksPage">
+            <argument name="menuItem" value="backend-content"/>
+            <argument name="submenuItem" value="cms-block"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Blocks"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..bdc6721eefb7e
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminContentPagesNavigateMenuTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin content pages navigate menu test"/>
+            <description value="Admin should be able to navigate to Content > Pages"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14128"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentPagesPage">
+            <argument name="menuItem" value="backend-content"/>
+            <argument name="submenuItem" value="versionscms-page-page"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Pages"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..052485cb75d4c
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresCurrencyRatesNavigateMenuTest">
+        <annotations>
+            <features value="CurrencySymbol"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 20"/>
+            <description value="Admin should be able to navigate to Stores > Currency Rates"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14150"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresCurrencyRatesPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="system-currency-rates"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Currency Rates"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..10c21a227d59a
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresCurrencySymbolsNavigateMenuTest">
+        <annotations>
+            <features value="CurrencySymbol"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores currency symbols navigate menu test"/>
+            <description value="Admin should be able to navigate to Stores > Currency Symbols"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14151"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresCurrencySymbolsPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="system-currency-symbols"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Currency Symbols"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..381862cbdb06d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminCustomersAllCustomersNavigateMenuTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin customers all customers navigate menu test"/>
+            <description value="Admin should be able to navigate to Customers > All Customers"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14113"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAllCustomerPage">
+            <argument name="menuItem" value="customer-customer"/>
+            <argument name="submenuItem" value="customer-manage"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Customers"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..6c591120a8e9b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminCustomersCustomerGroupsNavigateMenuTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin customers customer groups navigate menu test"/>
+            <description value="Admin should be able to navigate to Customers > Customer Groups"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14115"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCustomerGroupsPage">
+            <argument name="menuItem" value="customer-customer"/>
+            <argument name="submenuItem" value="customer-group"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Customer Groups"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml
new file mode 100644
index 0000000000000..2f3d5eec309ed
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminCustomersNowOnlineNavigateMenuTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin customers now online navigate menu test"/>
+            <description value="Admin should be able to navigate to Customers > Now Online"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14114"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNowOnlinePage">
+            <argument name="menuItem" value="customer-customer"/>
+            <argument name="submenuItem" value="customer-online"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Customers Now Online"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml b/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..6abe94b685517
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminMarketingEmailTemplatesNavigateMenuTest">
+        <annotations>
+            <features value="Email"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin marketing email templates navigate menu test"/>
+            <description value="Admin should be able to navigate to Marketing > Email Templates"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14173"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingEmailTemplatesPage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="template"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Email Templates"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml
new file mode 100644
index 0000000000000..acb340ccbba4f
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminExportPageNavigateMenuTest">
+        <annotations>
+            <features value="ImportExport"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin export page navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Export"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14157"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToExportPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-convert-export"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Export"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml
new file mode 100644
index 0000000000000..8840767c48c2e
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemImportNavigateMenuTest">
+        <annotations>
+            <features value="ImportExport"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system import navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Import"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14156"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToImportPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-convert-import"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Import"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml b/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml
new file mode 100644
index 0000000000000..23edc4bc7311c
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemIndexManagementNavigateMenuTest">
+        <annotations>
+            <features value="Indexer"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system index management navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Index Management"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14127"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToIndexManagementPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-index"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Index Management"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..1a663421f7c0a
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemIntegrationsNavigateMenuTest">
+        <annotations>
+            <features value="Integration"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system integrations navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Integrations"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14149"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToIntegrationsPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-integrations"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Integrations"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml
new file mode 100644
index 0000000000000..a6e650b894900
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminMarketingNewsletterQueueNavigateMenuTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin marketing newsletter queue navigate menu test"/>
+            <description value="Admin should be able to navigate to Marketing > Newsletter Queue"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14189"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterQueuePage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="newsletter-queue"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Newsletter Queue"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..46e810559dedc
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminMarketingNewsletterSubscribersNavigateMenuTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="Menu Navigation"/>
+            <title value="Navigate menu test 48"/>
+            <description value="Admin should be able to navigate to Marketing > Newsletter Subscribers"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14190"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterSubscribersPage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="newsletter-subscriber"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Newsletter Subscribers"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml
new file mode 100644
index 0000000000000..cc371138bb071
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml
@@ -0,0 +1,37 @@
+<?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="AdminMarketingNewsletterTemplateNavigateMenuTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin marketing newsletter template navigate menu test"/>
+            <description value="Admin should be able to navigate to Marketing > Newsletter Template"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14188"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterTemplatePage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="newsletter-template"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Newsletter Templates"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..0bee062d89790
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsNewsletterProblemReportsNavigateMenuTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports newsletter problem reports navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Newsletter Problem Reports"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14191"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterProblemsReportPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="newsletter-problem"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Newsletter Problems Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
new file mode 100644
index 0000000000000..bbc7aca87f461
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsPayPalSettlementNavigateMenuTest">
+        <annotations>
+            <features value="Paypal"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports paypal settlement navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > PayPal Settlement"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14193"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToPayPalSettlementPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="salesroot-paypal-settlement-reports"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="PayPal Settlement Reports"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..da4091c8050d8
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSalesBillingAgreementsNavigateMenuTest">
+        <annotations>
+            <features value="Paypal"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin sales billing agreements navigate menu test"/>
+            <description value="Admin should be able to navigate to Sales > Billing Agreements"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14194"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToBillingAgreementsPage">
+            <argument name="menuItem" value="sales-sales"/>
+            <argument name="submenuItem" value="paypal-billing-agreement"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Billing Agreements"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..8d7a2f896f0fa
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsAbandonedCartsNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports abandoned carts navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Abandoned Carts"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14159"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAbandonedCartsPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-shopcart-abandoned"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Abandoned Carts"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..73445a89585f6
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsBestsellersNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports bestsellers navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Bestsellers"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14168"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsBestsellersPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-products-bestsellers"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Bestsellers Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..189295a0f9b96
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsCouponsNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports coupons navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Coupons"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14163"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsCouponsPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-salesroot-coupons"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Coupons Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..33506966a2f57
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsDownloadsNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports downloads navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Downloads"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14171"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsDownloadsPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-products-downloads"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Downloads Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
new file mode 100644
index 0000000000000..9e1397d679777
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsInvoicedNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports invoiced navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Invoiced"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14162"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsInvoicedPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-salesroot-invoiced"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Invoice Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
new file mode 100644
index 0000000000000..2947cb23f8219
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsLowStockNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports low stock navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Low Stock"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14169"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsLowStockPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-products-lowstock"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Low Stock Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
new file mode 100644
index 0000000000000..a40b8a71f6594
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsNewNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports new navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > New"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14166"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsNewPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-customers-accounts"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="New Accounts Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
new file mode 100644
index 0000000000000..3a15b7f1e4644
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsOrderCountNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports order count navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Order Count"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14165"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderCountPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-customers-orders"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Order Count Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
new file mode 100644
index 0000000000000..d491fd4e00a6a
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsOrderTotalNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports order total navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Order Total"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14164"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderTotalPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-customers-totals"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Order Total Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
new file mode 100644
index 0000000000000..81df84419d7d2
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsOrderedNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports ordered navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Ordered"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14170"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderedPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-products-sold"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Ordered Products Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..5f9de897e2039
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsOrdersNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports orders navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Orders"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14160"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrdersPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-salesroot-sales"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Orders Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
new file mode 100644
index 0000000000000..22aeaaa95703a
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsProductsInCartNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports products in cart navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Products in Cart"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14158"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsProductsInCartPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-shopcart-product"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Products in Carts"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..606a73970d532
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
@@ -0,0 +1,37 @@
+<?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="AdminReportsRefreshStatisticsNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports refresh statistics navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Refresh Statistics"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14172"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsRefreshStatisticsPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-statistics-refresh"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Refresh Statistics"/>
+        </actionGroup>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
new file mode 100644
index 0000000000000..d5150405564cd
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsTaxNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports tax navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Tax"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14161"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsTaxPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-salesroot-tax"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Tax Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..0dab0fd263a3c
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsViewsNavigateMenuTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports views navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > Views"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14167"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsViewsPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-products-viewed"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Product Views Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..eda40968f9ad5
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminMarketingReviewsNavigateMenuTest">
+        <annotations>
+            <features value="Review"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin marketing reviews navigate menu test"/>
+            <description value="Admin should be able to navigate to Marketing > Reviews"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14196"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingReviewsPage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="catalog-reviews-ratings-reviews-all"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Reviews"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..783ca2bf3ae72
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsByCustomersNavigateMenuTest">
+        <annotations>
+            <features value="Review"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports by customers navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > By Customers"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14197"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsByCustomersPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-review-customer"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Customer Reviews Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..68ca33113799f
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminReportsByProductsNavigateMenuTest">
+        <annotations>
+            <features value="Review"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin reports by products navigate menu test"/>
+            <description value="Admin should be able to navigate to Reports > By Products"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14198"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsByProductsPage">
+            <argument name="menuItem" value="reports-report"/>
+            <argument name="submenuItem" value="report-review-product"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Product Reviews Report"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
new file mode 100644
index 0000000000000..140441380946d
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresRatingNavigateMenuTest">
+        <annotations>
+            <features value="Review"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores rating navigate menu test"/>
+            <description value="Admin should be able to navigate to Stores > Rating"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14199"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresRatingPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="catalog-reviews-ratings-ratings"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Ratings"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
new file mode 100644
index 0000000000000..7f7423f4fab6c
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSalesCreditMemosNavigateMenuTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin sales credit memos navigate menu test"/>
+            <description value="Admin should be able to navigate to Sales > Credit Memos"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14140"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesCreditMemosPage">
+            <argument name="menuItem" value="sales-sales"/>
+            <argument name="submenuItem" value="sales-creditmemo"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Credit Memos"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..99a1fc4f1b94d
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSalesInvoicesNavigateMenuTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin sales invoices navigate menu test"/>
+            <description value="Admin should be able to navigate to Sales > Invoices"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14138"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesInvoicesPage">
+            <argument name="menuItem" value="sales-sales"/>
+            <argument name="submenuItem" value="sales-invoice"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Invoices"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..0a9c65068ce32
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSalesOrdersNavigateMenuTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin sales orders navigate menu test"/>
+            <description value="Admin should be able to navigate to Sales > Orders"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14137"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesOrderPage">
+            <argument name="menuItem" value="sales-sales"/>
+            <argument name="submenuItem" value="sales-order"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Orders"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..882ca3ee7adca
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSalesShipmentsNavigateMenuTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin sales shipments navigate menu test"/>
+            <description value="Admin should be able to navigate to Sales > Shipments"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14139"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesShipmentsPage">
+            <argument name="menuItem" value="sales-sales"/>
+            <argument name="submenuItem" value="sales-shipment"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Shipments"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..e53dc220c4890
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSalesTransactionsNavigateMenuTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin sales transactions navigate menu test"/>
+            <description value="Admin should be able to navigate to Sales > Transactions"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14141"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesTransactionsPage">
+            <argument name="menuItem" value="sales-sales"/>
+            <argument name="submenuItem" value="sales-transactions"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Transactions"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
new file mode 100644
index 0000000000000..c278638029791
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresOrderStatusNavigateMenuTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores order status navigate menu test"/>
+            <description value="Admin should be able to navigate to Stores > Order Status"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14142"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresOrderStatusPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="system-order-statuses"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Order Status"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..dced5468285b6
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminMarketingCartPriceRulesNavigateMenuTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin marketing cart price rules navigate menu test"/>
+            <description value="Admin should be able to navigate to Marketing > Cart Price Rules"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14143"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingCartPriceRulesPage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="promo-quote"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Cart Price Rules"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml
new file mode 100644
index 0000000000000..cc85bffa2f5b7
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminMarketingSiteMapNavigateMenuTest">
+        <annotations>
+            <features value="Sitemap"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin marketing site map navigate menu test"/>
+            <description value="Admin should be able to navigate to Marketing > Site Map"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14204"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingSiteMapPage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="catalog-sitemap"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Site Map"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..529fc5b24641b
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresTaxRulesNavigateMenuTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores tax rules navigate menu test"/>
+            <description value="Admin should be able to navigate to Stores > Tax Rules"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14175"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresTaxRulesPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="sales-tax-rules"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Tax Rules"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..15b41fe536b8a
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminStoresTaxZonesAndRatesNavigateMenuTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin stores tax  zones and rates navigate menu test"/>
+            <description value="Admin should be able to navigate to Stores > Tax Zones and Rates"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14176"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresTaxZonesAndRatesPage">
+            <argument name="menuItem" value="backend-stores"/>
+            <argument name="submenuItem" value="sales-tax-rates"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Tax Zones and Rates"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..4074b0017710a
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemImportExportTaxRatesNavigateMenuTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system import export tax rates navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Import/Export Tax Rates"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14177"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemImportExportTaxRatesPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-convert-tax"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Import and Export Tax Rates"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..97f8849588098
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminContentThemesNavigateMenuTest">
+        <annotations>
+            <features value="Theme"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin content themes navigate menu test"/>
+            <description value="Admin should be able to navigate to Content > Themes"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14112"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentThemesPage">
+            <argument name="menuItem" value="backend-content"/>
+            <argument name="submenuItem" value="system-design-theme"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Themes"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..b04c86914ba8d
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminMarketingUrlRewritesNavigateMenuTest">
+        <annotations>
+            <features value="UrlRewrite"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin marketing url rewrites navigate menu test"/>
+            <description value="Admin should be able to navigate to Marketing > URL Rewrites"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14202"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingURLRewritesPage">
+            <argument name="menuItem" value="backend-marketing"/>
+            <argument name="submenuItem" value="urlrewrite"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="URL Rewrites"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..e523889875cfe
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemAllUsersNavigateMenuTest">
+        <annotations>
+            <features value="User"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system all users navigate menu test"/>
+            <description value="Admin should be able to navigate to System > All Users"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14123"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemAllUsersPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-acl-users"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Users"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml
new file mode 100644
index 0000000000000..696b22e883bd1
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemLockedUsersNavigateMenuTest">
+        <annotations>
+            <features value="User"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system locked users navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Locked Users"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14121"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemLockedUsersPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-acl-locks"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Locked Users"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml
new file mode 100644
index 0000000000000..f76cf0c47012c
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemManageEncryptionKeyNavigateMenuTest">
+        <annotations>
+            <features value="User"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system manage encryption key navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Manage Encryption Key"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14122"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToManageEncryptionKeyPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-crypt-key"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Encryption Key"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..d4ae7d737d6f7
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemUserRolesNavigateMenuTest">
+        <annotations>
+            <features value="User"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system user roles navigate menu test"/>
+            <description value="Admin should be able to navigate to System > User Roles"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14124"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemUserRolesPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-acl-roles"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Roles"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml b/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml
new file mode 100644
index 0000000000000..fbe5c2173482c
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminSystemCustomVariablesNavigateMenuTest">
+        <annotations>
+            <features value="Variable"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin system custom variables navigate menu test"/>
+            <description value="Admin should be able to navigate to System > Custom Variables"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14126"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemCustomVariablesPage">
+            <argument name="menuItem" value="backend-system"/>
+            <argument name="submenuItem" value="system-variable"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Custom Variables"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml
new file mode 100644
index 0000000000000..6dd94d692435d
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminContentWidgetsNavigateMenuTest">
+        <annotations>
+            <features value="Widget"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin content widgets navigate menu test"/>
+            <description value="Admin should be able to navigate to Content > Widgets"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14147"/>
+            <group value="menu"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentWidgetsPage">
+            <argument name="menuItem" value="backend-content"/>
+            <argument name="submenuItem" value="cms-widget-instance"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="Widgets"/>
+        </actionGroup>
+    </test>
+</tests>

From 6a9e0ceb3a769bc878872213b27d10aeb0f385c4 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@magento.com>
Date: Tue, 12 Mar 2019 15:54:23 -0500
Subject: [PATCH 0529/1055] ENGCOM-4389: Elasticsearch6 implementation  -
 Removed usage of unused class

---
 app/code/Magento/Elasticsearch6/etc/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 4532e5020b665..9999c29c1a257 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -52,7 +52,7 @@
                 <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Client\ElasticsearchFactory</item>
             </argument>
             <argument name="clientOptions" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Config</item>
+                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch\Model\Config</item>
             </argument>
         </arguments>
     </type>

From 4de33372b198ef49f757decda398c12c72e1336e Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 12 Mar 2019 16:03:35 -0500
Subject: [PATCH 0530/1055] GraphQL-458: CustomerGraphQl module refactoring

---
 .../CustomerGraphQl/Model/Customer/ExtractCustomerData.php | 1 +
 .../CustomerGraphQl/Model/Resolver/ChangePassword.php      | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
index abe028051a07e..de37482aca056 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ExtractCustomerData.php
@@ -102,6 +102,7 @@ public function execute(CustomerInterface $customer): array
         }
         $customerData = array_merge($customerData, $customAttributes);
 
+        $customerData['model'] = $customer;
         return $customerData;
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
index b80c8a99ec59e..317b7725b0265 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
@@ -11,6 +11,7 @@
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerPassword;
 use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -81,8 +82,12 @@ public function resolve(
         $customerId = (int)$customer->getId();
 
         $this->checkCustomerPassword->execute($args['currentPassword'], $customerId);
-        $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']);
 
+        try {
+            $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
         return $this->extractCustomerData->execute($customer);
     }
 }

From c00821496598b1bf9ecf3e183f18a289dbb3b9c2 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Tue, 12 Mar 2019 16:27:00 -0500
Subject: [PATCH 0531/1055] MQE-1476: Deliver weekly PR

- Add mftf_migrated:yes tags
---
 .../BundleImportExport/Test/TestCase/ExportProductsTest.xml   | 1 +
 .../CatalogImportExport/Test/TestCase/ExportProductsTest.xml  | 4 ++++
 .../Test/TestCase/CreateSearchTermEntityTest.xml              | 1 +
 .../Test/TestCase/DeleteSearchTermEntityTest.xml              | 1 +
 .../Test/TestCase/MassDeleteSearchTermEntityTest.xml          | 1 +
 .../Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml    | 2 +-
 .../Test/TestCase/CreateDuplicateUrlProductEntity.xml         | 2 +-
 .../Test/TestCase/ExportProductsTest.xml                      | 3 +++
 .../GroupedImportExport/Test/TestCase/ExportProductsTest.xml  | 1 +
 .../Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml   | 2 +-
 .../app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml | 2 +-
 .../Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml   | 2 +-
 .../Test/TestCase/UpdateProductUrlRewriteEntityTest.xml       | 1 +
 13 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml
index 3ad8cff31eaf8..bfbe233b9dc1b 100644
--- a/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/BundleImportExport/Test/TestCase/ExportProductsTest.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\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
         <variation name="ExportProductsTestVariation4" summary="Export bundle products" ticketId="MAGETWO-30602">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">bundleProduct</item>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
index b94f21371496a..8fe25614d1d42 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.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\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
         <variation name="ExportProductsTestVariation1" summary="Export simple product and configured products with assigned images" ticketId="MAGETWO-46112">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
@@ -27,6 +28,7 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation2" summary="Export simple and configured products with custom options" ticketId="MAGETWO-46113, MAGETWO-46109">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
@@ -43,6 +45,7 @@
             <constraint name="Magento\CatalogImportExport\Test\Constraint\AssertExportProductDate" />
         </variation>
         <variation name="ExportProductsTestVariation3" summary="Export simple product with custom attribute" ticketId="MAGETWO-46121">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
@@ -58,6 +61,7 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation5" summary="Export simple product assigned to Main Website and configurable product assigned to Custom Website" ticketId="MAGETWO-46114">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="issue" xsi:type="string">>MC-13864 Consumer always read config from memory</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml
index 0437e0a5e999b..8c465544a3283 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/CreateSearchTermEntityTest.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\CatalogSearch\Test\TestCase\CreateSearchTermEntityTest" summary="Create Search Term" ticketId="MAGETWO-26165">
         <variation name="CreateSearchTermEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="searchTerm/data/query_text/value" xsi:type="string">catalogProductSimple::sku</data>
             <data name="searchTerm/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="searchTerm/data/redirect" xsi:type="string">http://example.com/</data>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml
index a9cc0dfd34f9f..8fdd7ef715521 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/DeleteSearchTermEntityTest.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\CatalogSearch\Test\TestCase\DeleteSearchTermEntityTest" summary="Delete Search Term" ticketId="MAGETWO-26491">
         <variation name="DeleteSearchTermEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="searchTerm/dataset" xsi:type="string">default</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermSuccessDeleteMessage" />
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermNotInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml
index 3bf4e521c4a04..3ef2b65c0224b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/MassDeleteSearchTermEntityTest.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\CatalogSearch\Test\TestCase\MassDeleteSearchTermEntityTest" summary="Mass Delete Search Term" ticketId="MAGETWO-26599">
         <variation name="MassDeleteSearchTermEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="searchTerms" xsi:type="string">catalogSearchQuery::default,catalogSearchQuery::default,catalogSearchQuery::default</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermSuccessMassDeleteMessage" />
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermMassActionsNotInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml
index 398054f1f0ed3..8b15da5ecd2ef 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlCategoryEntityTest.xml
@@ -14,7 +14,7 @@
             <data name="category/data/include_in_menu" xsi:type="string">Yes</data>
             <data name="category/data/name" xsi:type="string">Subcategory%isolation%</data>
             <data name="category/data/url_key" xsi:type="string">subcategory-%isolation%</data>
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1, mftf_migrated:yes</data>
             <constraint name="Magento\CatalogUrlRewrite\Test\Constraint\AssertCategoryUrlDuplicateErrorMessage" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml
index 1116821f756a9..8110ed1ed00b1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogUrlRewrite/Test/TestCase/CreateDuplicateUrlProductEntity.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\CatalogUrlRewrite\Test\TestCase\CreateDuplicateUrlProductEntity" summary="Create Simple Product" ticketId="MAGETWO-69427">
         <variation name="CreateDuplicateUrlProductEntityTestVariation1" summary="Create Duplicate Url Product">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S1, mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
index 93240586ec92c..15dcfd0a9e7e7 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.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\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
         <variation name="ExportProductsTestVariation7" summary="Export simple product and configured products with assigned images" ticketId="MAGETWO-46112">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/1" xsi:type="array">
                 <item name="fixture" xsi:type="string">configurableProduct</item>
@@ -30,6 +31,7 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation8" summary="Export simple and configured products with custom options" ticketId="MAGETWO-46113, MAGETWO-46109">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/1" xsi:type="array">
                 <item name="fixture" xsi:type="string">configurableProduct</item>
@@ -45,6 +47,7 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation9" summary="Export simple product assigned to Main Website and configurable product assigned to Custom Website" ticketId="MAGETWO-46114">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="issue" xsi:type="string">>MC-13864 Consumer always read config from memory</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/1" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml
index cffcdbf45a6dc..a110dc6a89f8c 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedImportExport/Test/TestCase/ExportProductsTest.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\CatalogImportExport\Test\TestCase\ExportProductsTest" summary="Export products">
         <variation name="ExportProductsTestVariation6" summary="Export grouped product with special price" ticketId="MAGETWO-46116">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">groupedProduct</item>
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml
index 5a547f69280e1..e35ef853d1b68 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateWebsiteEntityTest.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\Store\Test\TestCase\CreateWebsiteEntityTest" summary="Create Website" ticketId="MAGETWO-27665">
         <variation name="CreateWebsiteEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
             <data name="website/data/name" xsi:type="string">website_%isolation%</data>
             <data name="website/data/code" xsi:type="string">code_%isolation%</data>
             <constraint name="Magento\Store\Test\Constraint\AssertWebsiteSuccessSaveMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
index 306a9fd2024a4..cd37c555fdb1d 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.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\Store\Test\TestCase\DeleteStoreEntityTest" summary="Delete Store View" ticketId="MAGETWO-27942">
         <variation name="DeleteStoreEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="store/dataset" xsi:type="string">custom</data>
             <data name="createBackup" xsi:type="string">Yes</data>
             <constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessDeleteAndBackupMessages" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml
index ac857ad035f44..5db0e7f8baad4 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateWebsiteEntityTest.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\Store\Test\TestCase\UpdateWebsiteEntityTest" summary="Update Website" ticketId="MAGETWO-27690">
         <variation name="UpdateWebsiteEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="websiteOrigin/dataset" xsi:type="string">custom_website</data>
             <data name="website/data/name" xsi:type="string">website_upd%isolation%</data>
             <data name="website/data/code" xsi:type="string">code_upd%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml
index 60de554d594d2..8f12930aa417b 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateProductUrlRewriteEntityTest.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\UrlRewrite\Test\TestCase\UpdateProductUrlRewriteEntityTest" summary="Update Product URL Rewrites" ticketId="MAGETWO-24819">
         <variation name="UpdateProductUrlRewriteEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">product/%catalogProductSimple::product_100_dollar%</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">test_%isolation%.html</data>

From b8006ee5e1403a6f2da76d7634b128f93397ff60 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 12 Mar 2019 17:11:25 -0500
Subject: [PATCH 0532/1055] GraphQL-419: Test coverage:
 GetAvailablePaymentMethodsTest for Customer

---
 .../GetAvailablePaymentMethodsTest.php        | 36 ++++++++++++++-----
 .../GraphQl/Quote/Customer/GetCartTest.php    |  2 +-
 .../Quote/Customer/RemoveItemFromCartTest.php |  2 +-
 .../Quote/Customer/UpdateCartItemsTest.php    |  2 +-
 .../disable_all_active_payment_methods.php    | 24 ++++++-------
 ...le_all_active_payment_methods_rollback.php |  4 +--
 6 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index e5027119cbc6c..34cd6ae503c22 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -54,11 +54,11 @@ protected function setUp()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      */
-    public function testGetPaymentMethodsFromCustomerCart()
+    public function testGetCartWithPaymentMethods()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
-        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
-        $response      = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response);
         self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
@@ -70,6 +70,23 @@ public function testGetPaymentMethodsFromCustomerCart()
         );
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
+    public function testGetPaymentMethodsFromGuestCart()
+    {
+        $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId(
+            'test_order_with_virtual_product_without_address'
+        );
+        $query = $this->getQuery($guestQuoteMaskedId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
@@ -77,7 +94,7 @@ public function testGetPaymentMethodsFromCustomerCart()
     public function testGetPaymentMethodsFromAnotherCustomerCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
-        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
@@ -92,8 +109,8 @@ public function testGetPaymentMethodsFromAnotherCustomerCart()
     public function testGetPaymentMethodsIfPaymentsAreNotSet()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
-        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
-        $response      = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertEquals(0, count($response['cart']['available_payment_methods']));
     }
@@ -106,7 +123,7 @@ public function testGetPaymentMethodsIfPaymentsAreNotSet()
     public function testGetPaymentMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
@@ -115,9 +132,10 @@ public function testGetPaymentMethodsOfNonExistentCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getCartAvailablePaymentMethodsQuery(
+    private function getQuery(
         string $maskedQuoteId
-    ) : string {
+    ): string
+    {
         return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index fe9b7b3c49a7c..286742936da8e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -72,8 +72,8 @@ public function testGetCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      */
     public function testGetGuestCart()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
index 70ec646c10008..e80a2127ad420 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -129,7 +129,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      */
     public function testRemoveItemFromGuestCart()
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
index 632ee839834e0..74e7aa8b5d0a4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
@@ -156,7 +156,7 @@ public function testUpdateItemIfItemIsNotBelongToCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      */
     public function testUpdateItemInGuestCart()
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
index 762ea672614a8..37b67fbf6c44d 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
@@ -7,23 +7,17 @@
 
 use Magento\Config\Model\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 
-$processConfigData = function (Config $config, array $data) {
-    foreach ($data as $key => $value) {
-        $config->setDataByPath($key, $value);
-        $config->save();
-    }
-};
-
-$objectManager          = Bootstrap::getObjectManager();
-$paymentMethodList      = $objectManager->get(\Magento\Payment\Api\PaymentMethodListInterface::class);
-$rollbackConfigKey      = 'test/payment/disabled_payment_methods';
-$configData             = [];
+$objectManager = Bootstrap::getObjectManager();
+$paymentMethodList = $objectManager->get(\Magento\Payment\Api\PaymentMethodListInterface::class);
+$rollbackConfigKey = 'test/payment/disabled_payment_methods';
+$configData = [];
 $disabledPaymentMethods = [];
 
 // Get all active Payment Methods
-foreach ($paymentMethodList->getActiveList(\Magento\Store\Model\Store::DEFAULT_STORE_ID) as $paymentMethod) {
+foreach ($paymentMethodList->getActiveList(Store::DEFAULT_STORE_ID) as $paymentMethod) {
     $configData['payment/' . $paymentMethod->getCode() . '/active'] = 0;
     $disabledPaymentMethods[] = $paymentMethod->getCode();
 }
@@ -34,4 +28,8 @@
 $defConfig = $objectManager->create(Config::class);
 $defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
 
-$processConfigData($defConfig, $configData);
+foreach ($configData as $key => $value) {
+    $defConfig->setDataByPath($key, $value);
+    $defConfig->save();
+}
+
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
index ee81af139f4b4..4a56888058e4d 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
@@ -9,10 +9,10 @@
 use Magento\Framework\App\Config\Storage\WriterInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
-$objectManager     = Bootstrap::getObjectManager();
+$objectManager = Bootstrap::getObjectManager();
 $rollbackConfigKey = 'test/payment/disabled_payment_methods';
 
-$configWriter        = $objectManager->create(WriterInterface::class);
+$configWriter = $objectManager->create(WriterInterface::class);
 $rollbackConfigValue = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
     ->getStore(\Magento\Store\Model\Store::DEFAULT_STORE_ID)
     ->getConfig($rollbackConfigKey);

From 350d1f8783128719ce7d2cfb83197ee382ecbf4f Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 12 Mar 2019 17:25:53 -0500
Subject: [PATCH 0533/1055] GraphQL-429: Test coverage: nonExistentCart

---
 .../Customer/SetBillingAddressOnCartTest.php  | 18 ++---------
 .../Customer/SetPaymentMethodOnCartTest.php   | 18 ++---------
 .../Guest/SetBillingAddressOnCartTest.php     | 18 ++---------
 .../Guest/SetPaymentMethodOnCartTest.php      | 32 ++++++-------------
 4 files changed, 15 insertions(+), 71 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 06926e0a0b2e9..ccd328cea12ed 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -411,30 +411,16 @@ public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
     public function testSetBillingAddressOnNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getCartQuery($maskedQuoteId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @return string
-     */
-    private function getCartQuery(
-        string $maskedQuoteId
-    ) : string {
-        return <<<QUERY
+        $query = <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
     items {
       id
-      qty
-      product {
-        sku
-      }
     }
   }
 }
 QUERY;
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index a2bbbfe135fa1..91c98d2f13f47 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -159,30 +159,16 @@ public function testSetPaymentMethodToAnotherCustomerCart()
     public function testPaymentMethodOnNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getCartQuery($maskedQuoteId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @return string
-     */
-    private function getCartQuery(
-        string $maskedQuoteId
-    ) : string {
-        return <<<QUERY
+        $query = <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
     items {
       id
-      qty
-      product {
-        sku
-      }
     }
   }
 }
 QUERY;
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 0bb7c9741197f..8f8e5419a9ff2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -251,30 +251,16 @@ public function testSetBillingAddressFromAddressBook()
     public function testSetBillingAddressOnNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getCartQuery($maskedQuoteId);
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @return string
-     */
-    private function getCartQuery(
-        string $maskedQuoteId
-    ) : string {
-        return <<<QUERY
+        $query = <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
     items {
       id
-      qty
-      product {
-        sku
-      }
     }
   }
 }
 QUERY;
+        $this->graphQlQuery($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 5117fce04a915..fbfa53b7d6434 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -133,7 +133,15 @@ public function testSetPaymentMethodToCustomerCart()
     public function testSetPaymentOnNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getCartQuery($maskedQuoteId);
+        $query = <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+    }
+  }
+}
+QUERY;
         $this->graphQlQuery($query);
     }
 
@@ -166,28 +174,6 @@ private function prepareMutationQuery(
 QUERY;
     }
 
-    /**
-     * @param string $maskedQuoteId
-     * @return string
-     */
-    private function getCartQuery(
-        string $maskedQuoteId
-    ) : string {
-        return <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    items {
-      id
-      qty
-      product {
-        sku
-      }
-    }
-  }
-}
-QUERY;
-    }
-
     /**
      * @param string $reversedQuoteId
      * @param int $customerId

From 18ccbdd248f423cfb77b47cf14e20c9dd5ad0910 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 12 Mar 2019 17:50:23 -0500
Subject: [PATCH 0534/1055] GraphQL-458: CustomerGraphQl module refactoring

---
 app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php
index f8b7947f09ba7..1605c63b62f4c 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/SaveCustomer.php
@@ -38,7 +38,6 @@ public function __construct(
      * Save customer
      *
      * @param CustomerInterface $customer
-     * @param array $data
      * @throws GraphQlAlreadyExistsException
      * @throws GraphQlAuthenticationException
      * @throws GraphQlInputException

From bfbc5e95b74d0b96b86f3a13c978320c130971e0 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Tue, 12 Mar 2019 17:55:45 -0500
Subject: [PATCH 0535/1055] MAGETWO-98621: Special price not removing at
 website scope

---
 .../Eav/Model/Entity/AbstractEntity.php       |  8 +++--
 .../Model/ResourceModel/ProductTest.php       | 34 ++++++++++++++++---
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index d0a5e8de53ae9..1fd71e446e6bb 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -1683,14 +1683,16 @@ public function saveAttribute(DataObject $object, $attributeCode)
         $connection->beginTransaction();
 
         try {
-            $select = $connection->select()->from($table, 'value_id')->where($where);
-            $origValueId = $connection->fetchOne($select);
+            $select = $connection->select()->from($table, ['value_id', 'value'])->where($where);
+            $origRow = $connection->fetchRow($select);
+            $origValueId = $origRow['value_id'] ?? false;
+            $origValue = $origRow['value'] ?? null;
 
             if ($origValueId === false && $newValue !== null) {
                 $this->_insertAttribute($object, $attribute, $newValue);
             } elseif ($origValueId !== false && $newValue !== null) {
                 $this->_updateAttribute($object, $attribute, $origValueId, $newValue);
-            } elseif ($origValueId !== false && $newValue === null) {
+            } elseif ($origValueId !== false && $newValue === null && $origValue !== null) {
                 $connection->delete($table, $where);
             }
             $this->_processAttributeValues();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
index 7954e2c36227f..476f01eb277df 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
@@ -12,6 +12,11 @@
 
 class ProductTest extends TestCase
 {
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @var Product
      */
@@ -29,7 +34,8 @@ protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
 
-        $this->model = $this->objectManager->get(Product::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->model = $this->objectManager->create(Product::class);
     }
 
     /**
@@ -42,11 +48,29 @@ public function testGetAttributeRawValue()
         $sku = 'simple';
         $attribute = 'name';
 
-        /** @var ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get($sku);
-
+        $product = $this->productRepository->get($sku);
         $actual = $this->model->getAttributeRawValue($product->getId(), $attribute, null);
         self::assertEquals($product->getName(), $actual);
     }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store catalog/price/scope 1
+     */
+    public function testUpdateStoreSpecificSpecialPrice()
+    {
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get('simple', true, 1);
+        $this->assertEquals(5.99, $product->getSpecialPrice());
+
+        $product->setSpecialPrice('');
+        $this->model->save($product);
+        $product = $this->productRepository->get('simple', false, 1, true);
+        $this->assertEmpty($product->getSpecialPrice());
+
+        $product = $this->productRepository->get('simple', false, 0, true);
+        $this->assertEquals(5.99, $product->getSpecialPrice());
+    }
 }

From 5f3d0760a59e000df24b09111c845440f83b7128 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 12 Mar 2019 19:21:32 -0500
Subject: [PATCH 0536/1055] GraphQL-427: Test coverage:
 SetShippingAddressOnCartTest

---
 .../Customer/SetShippingAddressOnCartTest.php | 151 ++++++++++++------
 .../Guest/SetShippingAddressOnCartTest.php    | 138 ++++------------
 2 files changed, 139 insertions(+), 150 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 1d381bc944ec1..9e13476c57c32 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -49,8 +49,8 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      */
     public function testSetNewShippingAddress()
     {
@@ -107,46 +107,6 @@ public function testSetNewShippingAddress()
         $this->assertNewShippingAddressFields($shippingAddressResponse);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @dataProvider requestWithoutRequiredParamsDataProvider
-     * @param string $params
-     * @param string $expectedException
-     * @throws \Exception
-     */
-    public function testSetNewShippingAddressWithEmptyRequiredParams(string $params, string $expectedException)
-    {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
-
-        $query = <<<QUERY
-mutation {
-  setShippingAddressesOnCart(
-    input: {
-      cart_id: "$maskedQuoteId"
-      shipping_addresses: [
-        {
-          address: {
-            $params
-          }
-        }
-      ]
-    }
-  ) {
-    cart {
-      shipping_addresses {
-        city
-      }
-    }
-  }
-}
-QUERY;
-        $this->expectExceptionMessage(
-            $expectedException
-        );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
@@ -241,7 +201,7 @@ public function testSetShippingAddressFromAddressBook()
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a address with ID "100"
      */
-    public function testSetNotExistedShippingAddressFromAddressBook()
+    public function testSetNonExistentShippingAddressFromAddressBook()
     {
         $maskedQuoteId = $this->assignQuoteToCustomer();
 
@@ -356,7 +316,7 @@ public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
      */
-    public function testSetShippingAddressIfCustomerIsNotOwnerOfCart()
+    public function testSetShippingAddressToAnotherCustomerCart()
     {
         $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
 
@@ -388,19 +348,116 @@ public function testSetShippingAddressIfCustomerIsNotOwnerOfCart()
     }
 
     /**
-     * TODO: currently only the city param is required, do we need to add at least ZIP code?
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @param string $input
+     * @param string $message
+     * @throws \Exception
+     */
+    public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
+    {
+        $maskedQuoteId = $this->assignQuoteToCustomer();
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "{$maskedQuoteId}"
+      shipping_addresses: [
+        {
+          {$input}
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
      * @return array
      */
-    public function requestWithoutRequiredParamsDataProvider()
+    public function dataProviderUpdateWithMissedRequiredParameters()
     {
         return [
-            [
-                'save_in_address_book: false',
+            'shipping_addresses' => [
+                '',
+                'The shipping address must contain either "customer_address_id" or "address".',
+            ],
+            'missed_city' => [
+                'address: { save_in_address_book: false }',
                 'Field CartAddressInput.city of required type String! was not provided'
             ]
         ];
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage You cannot specify multiple shipping addresses.
+     */
+    public function testSetMultipleNewShippingAddresses()
+    {
+        $maskedQuoteId = $this->assignQuoteToCustomer();
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        },
+        {
+          address: {
+            firstname: "test firstname 2"
+            lastname: "test lastname 2"
+            company: "test company 2"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index 522091c1eb2bf..33aeb2b902a8f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -8,7 +8,6 @@
 namespace Magento\GraphQl\Quote\Guest;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Multishipping\Helper\Data;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
@@ -37,18 +36,12 @@ class SetShippingAddressOnCartTest extends GraphQlAbstract
      */
     private $quoteIdToMaskedId;
 
-    /**
-     * @var CustomerTokenServiceInterface
-     */
-    private $customerTokenService;
-
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
@@ -186,12 +179,12 @@ public function testSetShippingAddressFromAddressBook()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The shipping address must contain either "customer_address_id" or "address".
      */
-    public function testSetShippingAddressWithoutAddresses()
+    public function testSetShippingAddressToCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
 
         $query = <<<QUERY
 mutation {
@@ -199,29 +192,35 @@ public function testSetShippingAddressWithoutAddresses()
     input: {
       cart_id: "$maskedQuoteId"
       shipping_addresses: [
-        {}
+        {
+          customer_address_id: 1
+        }
       ]
     }
   ) {
     cart {
       shipping_addresses {
-        city
+        postcode
       }
     }
   }
 }
 QUERY;
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+
         $this->graphQlQuery($query);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @dataProvider requestWithoutRequiredParamsDataProvider
-     * @param string $params
-     * @param string $expectedException
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @param string $input
+     * @param string $message
      * @throws \Exception
      */
-    public function testSetNewShippingAddressWithEmptyRequiredParams(string $params, string $expectedException)
+    public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
 
@@ -229,12 +228,10 @@ public function testSetNewShippingAddressWithEmptyRequiredParams(string $params,
 mutation {
   setShippingAddressesOnCart(
     input: {
-      cart_id: "$maskedQuoteId"
+      cart_id: "{$maskedQuoteId}"
       shipping_addresses: [
         {
-          address: {
-            $params
-          }
+          {$input}
         }
       ]
     }
@@ -247,12 +244,27 @@ public function testSetNewShippingAddressWithEmptyRequiredParams(string $params,
   }
 }
 QUERY;
-        $this->expectExceptionMessage(
-            $expectedException
-        );
+        $this->expectExceptionMessage($message);
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters()
+    {
+        return [
+            'shipping_addresses' => [
+                '',
+                'The shipping address must contain either "customer_address_id" or "address".',
+            ],
+            'missed_city' => [
+                'address: { save_in_address_book: false }',
+                'Field CartAddressInput.city of required type String! was not provided'
+            ]
+        ];
+    }
+
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
@@ -307,54 +319,6 @@ public function testSetMultipleNewShippingAddresses()
   }
 }
 QUERY;
-        /** @var \Magento\Config\Model\ResourceModel\Config $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
-        $config->saveConfig(
-            Data::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE,
-            null,
-            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-            0
-        );
-        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-        $config->reinit();
-
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @expectedException \Exception
-     */
-    public function testSetShippingAddressIfCustomerIsNotOwnerOfCart()
-    {
-        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
-
-        $query = <<<QUERY
-mutation {
-  setShippingAddressesOnCart(
-    input: {
-      cart_id: "$maskedQuoteId"
-      shipping_addresses: [
-        {
-          customer_address_id: 1
-        }
-      ]
-    }
-  ) {
-    cart {
-      shipping_addresses {
-        postcode
-      }
-    }
-  }
-}
-QUERY;
-        $this->expectExceptionMessage(
-            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-        );
-
         $this->graphQlQuery($query);
     }
 
@@ -407,36 +371,4 @@ private function assignQuoteToCustomer(
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
-
-    /**
-     * TODO: currently only the city param is required, do we need to add at least ZIP code?
-     * @return array
-     */
-    public function requestWithoutRequiredParamsDataProvider()
-    {
-        return [
-            [
-                'save_in_address_book: false',
-                'Field CartAddressInput.city of required type String! was not provided'
-            ]
-        ];
-    }
-
-    public function tearDown()
-    {
-        /** @var \Magento\Config\Model\ResourceModel\Config $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Config\Model\ResourceModel\Config::class);
-
-        //default state of multishipping config
-        $config->saveConfig(
-            Data::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE,
-            1,
-            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-            0
-        );
-
-        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
-        $config = ObjectManager::getInstance()->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-        $config->reinit();
-    }
 }

From 31166c95234c3fb5fce096ea5328a3fe854bb730 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 12 Mar 2019 19:25:39 -0500
Subject: [PATCH 0537/1055] GraphQL-419: Test coverage:
 GetAvailablePaymentMethodsTest for Customer

---
 .../GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php  | 3 +--
 .../Payment/_files/disable_all_active_payment_methods.php      | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index 34cd6ae503c22..a7287ada093b8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -134,8 +134,7 @@ public function testGetPaymentMethodsOfNonExistentCart()
      */
     private function getQuery(
         string $maskedQuoteId
-    ): string
-    {
+    ): string {
         return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
index 37b67fbf6c44d..ac811e67c580a 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
@@ -32,4 +32,3 @@
     $defConfig->setDataByPath($key, $value);
     $defConfig->save();
 }
-

From 6df79895e723c6cc203a8caf485a1b8504923acd Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 12 Mar 2019 20:23:54 -0500
Subject: [PATCH 0538/1055] GraphQL-360: Unskip and fix
 testGetSimpleProductsFromCategory

---
 .../testsuite/Magento/GraphQl/Catalog/CategoryTest.php           | 1 -
 1 file changed, 1 deletion(-)

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 3edc4a797b3e5..cbce53325e9e6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -16,7 +16,6 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\TestFramework\ObjectManager;
 
-
 class CategoryTest extends GraphQlAbstract
 {
     /**

From fb4f930be721474c7aea8f16c59505e8685d1f62 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Tue, 12 Mar 2019 20:41:50 -0500
Subject: [PATCH 0539/1055] MC-15331: Unable to place order with authorize.net
 direct post credit card

---
 .../Magento/Authorizenet/Model/Directpost.php |   9 +-
 .../Authorizenet/Model/Directpost/Request.php | 119 +++++++++++++++---
 .../Model/Directpost/Response.php             |  72 +++++++++--
 .../Unit/Model/Directpost/RequestTest.php     |  80 ++++++++++++
 .../Unit/Model/Directpost/ResponseTest.php    |  78 +++++-------
 .../Authorizenet/etc/adminhtml/system.xml     |   4 +
 app/code/Magento/Authorizenet/etc/config.xml  |   1 +
 7 files changed, 292 insertions(+), 71 deletions(-)
 create mode 100644 app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php

diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
index 5bc9335d24439..946ec8ba01a0e 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost.php
@@ -546,15 +546,16 @@ public function setResponseData(array $postData)
     public function validateResponse()
     {
         $response = $this->getResponse();
-        //md5 check
-        if (!$this->getConfigData('trans_md5')
-            || !$this->getConfigData('login')
-            || !$response->isValidHash($this->getConfigData('trans_md5'), $this->getConfigData('login'))
+        $hashConfigKey = !empty($response->getData('x_SHA2_Hash')) ? 'signature_key' : 'trans_md5';
+
+        //hash check
+        if (!$response->isValidHash($this->getConfigData($hashConfigKey), $this->getConfigData('login'))
         ) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('The transaction was declined because the response hash validation failed.')
             );
         }
+
         return true;
     }
 
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request.php b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
index 357385e5c8c79..d518af4e04f55 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Request.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
@@ -8,6 +8,8 @@
 namespace Magento\Authorizenet\Model\Directpost;
 
 use Magento\Authorizenet\Model\Request as AuthorizenetRequest;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Intl\DateTimeFactory;
 
 /**
  * Authorize.net request model for DirectPost model
@@ -20,10 +22,35 @@ class Request extends AuthorizenetRequest
      */
     protected $_transKey = null;
 
+    /**
+     * Hexadecimal signature key.
+     *
+     * @var string
+     */
+    private $signatureKey = '';
+
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @param array $data
+     * @param DateTimeFactory $dateTimeFactory
+     */
+    public function __construct(
+        array $data = [],
+        DateTimeFactory $dateTimeFactory = null
+    ) {
+        $this->dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance()
+                ->get(DateTimeFactory::class);
+        parent::__construct($data);
+    }
+
     /**
      * Return merchant transaction key.
      *
-     * Needed to generate sign.
+     * Needed to generate MD5 sign.
      *
      * @return string
      */
@@ -35,7 +62,7 @@ protected function _getTransactionKey()
     /**
      * Set merchant transaction key.
      *
-     * Needed to generate sign.
+     * Needed to generate MD5 sign.
      *
      * @param string $transKey
      * @return $this
@@ -47,7 +74,7 @@ protected function _setTransactionKey($transKey)
     }
 
     /**
-     * Generates the fingerprint for request.
+     * Generates the MD5 fingerprint for request.
      *
      * @param string $merchantApiLoginId
      * @param string $merchantTransactionKey
@@ -67,7 +94,7 @@ public function generateRequestSign(
     ) {
         return hash_hmac(
             "md5",
-            $merchantApiLoginId . "^" . $fpSequence . "^" . $fpTimestamp . "^" . $amount . "^" . $currencyCode,
+            $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode,
             $merchantTransactionKey
         );
     }
@@ -82,7 +109,7 @@ public function setConstantData(\Magento\Authorizenet\Model\Directpost $paymentM
     {
         $this->setXVersion('3.1')->setXDelimData('FALSE')->setXRelayResponse('TRUE');
 
-        $this->setXTestRequest($paymentMethod->getConfigData('test') ? 'TRUE' : 'FALSE');
+        $this->setSignatureKey($paymentMethod->getConfigData('signature_key'));
 
         $this->setXLogin($paymentMethod->getConfigData('login'))
             ->setXMethod(\Magento\Authorizenet\Model\Authorizenet::REQUEST_METHOD_CC)
@@ -173,17 +200,81 @@ public function setDataFromOrder(
      */
     public function signRequestData()
     {
-        $fpTimestamp = time();
-        $hash = $this->generateRequestSign(
-            $this->getXLogin(),
-            $this->_getTransactionKey(),
-            $this->getXAmount(),
-            $this->getXCurrencyCode(),
-            $this->getXFpSequence(),
-            $fpTimestamp
-        );
+        $fpDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
+        $fpTimestamp = $fpDate->getTimestamp();
+
+        if (!empty($this->getSignatureKey())) {
+            $hash = $this->generateSha2RequestSign(
+                (string)$this->getXLogin(),
+                (string)$this->getSignatureKey(),
+                (string)$this->getXAmount(),
+                (string)$this->getXCurrencyCode(),
+                (string)$this->getXFpSequence(),
+                $fpTimestamp
+            );
+        } else {
+            $hash = $this->generateRequestSign(
+                $this->getXLogin(),
+                $this->_getTransactionKey(),
+                $this->getXAmount(),
+                $this->getXCurrencyCode(),
+                $this->getXFpSequence(),
+                $fpTimestamp
+            );
+        }
+
         $this->setXFpTimestamp($fpTimestamp);
         $this->setXFpHash($hash);
+
         return $this;
     }
+
+    /**
+     * Generates the SHA2 fingerprint for request.
+     *
+     * @param string $merchantApiLoginId
+     * @param string $merchantSignatureKey
+     * @param string $amount
+     * @param string $currencyCode
+     * @param string $fpSequence An invoice number or random number.
+     * @param int $fpTimestamp
+     * @return string The fingerprint.
+     */
+    private function generateSha2RequestSign(
+        string $merchantApiLoginId,
+        string $merchantSignatureKey,
+        string $amount,
+        string $currencyCode,
+        string $fpSequence,
+        int $fpTimestamp
+    ): string {
+        $message = $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode;
+
+        return strtoupper(hash_hmac('sha512', $message, pack('H*', $merchantSignatureKey)));
+    }
+
+    /**
+     * Return merchant hexadecimal signature key.
+     *
+     * Needed to generate SHA2 sign.
+     *
+     * @return string
+     */
+    private function getSignatureKey(): string
+    {
+        return $this->signatureKey;
+    }
+
+    /**
+     * Set merchant hexadecimal signature key.
+     *
+     * Needed to generate SHA2 sign.
+     *
+     * @param string $signatureKey
+     * @return void
+     */
+    private function setSignatureKey(string $signatureKey)
+    {
+        $this->signatureKey = $signatureKey;
+    }
 }
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Response.php b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
index 1c713a159c3ad..b5604a78cb9cd 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Response.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
@@ -27,25 +27,31 @@ class Response extends AuthorizenetResponse
      */
     public function generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
     {
-        if (!$amount) {
-            $amount = '0.00';
-        }
-
         return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
     }
 
     /**
      * Return if is valid order id.
      *
-     * @param string $merchantMd5
+     * @param string $storedHash
      * @param string $merchantApiLogin
      * @return bool
      */
-    public function isValidHash($merchantMd5, $merchantApiLogin)
+    public function isValidHash($storedHash, $merchantApiLogin)
     {
-        $hash = $this->generateHash($merchantMd5, $merchantApiLogin, $this->getXAmount(), $this->getXTransId());
+        if (empty($this->getData('x_amount'))) {
+            $this->setData('x_amount', '0.00');
+        }
 
-        return Security::compareStrings($hash, $this->getData('x_MD5_Hash'));
+        if (!empty($this->getData('x_SHA2_Hash'))) {
+            $hash = $this->generateSha2Hash($storedHash);
+            return Security::compareStrings($hash, $this->getData('x_SHA2_Hash'));
+        } elseif (!empty($this->getData('x_MD5_Hash'))) {
+            $hash = $this->generateHash($storedHash, $merchantApiLogin, $this->getXAmount(), $this->getXTransId());
+            return Security::compareStrings($hash, $this->getData('x_MD5_Hash'));
+        }
+
+        return false;
     }
 
     /**
@@ -57,4 +63,54 @@ public function isApproved()
     {
         return $this->getXResponseCode() == \Magento\Authorizenet\Model\Directpost::RESPONSE_CODE_APPROVED;
     }
+
+    /**
+     * Generates an SHA2 hash to compare against AuthNet's.
+     *
+     * @param string $signatureKey
+     * @return string
+     * @see https://support.authorize.net/s/article/MD5-Hash-End-of-Life-Signature-Key-Replacement
+     */
+    private function generateSha2Hash(string $signatureKey): string
+    {
+        $hashFields = [
+            'x_trans_id',
+            'x_test_request',
+            'x_response_code',
+            'x_auth_code',
+            'x_cvv2_resp_code',
+            'x_cavv_response',
+            'x_avs_code',
+            'x_method',
+            'x_account_number',
+            'x_amount',
+            'x_company',
+            'x_first_name',
+            'x_last_name',
+            'x_address',
+            'x_city',
+            'x_state',
+            'x_zip',
+            'x_country',
+            'x_phone',
+            'x_fax',
+            'x_email',
+            'x_ship_to_company',
+            'x_ship_to_first_name',
+            'x_ship_to_last_name',
+            'x_ship_to_address',
+            'x_ship_to_city',
+            'x_ship_to_state',
+            'x_ship_to_zip',
+            'x_ship_to_country',
+            'x_invoice_num',
+        ];
+
+        $message = '^';
+        foreach ($hashFields as $field) {
+            $message .= ($this->getData($field) ?? '') . '^';
+        }
+
+        return strtoupper(hash_hmac('sha512', $message, pack('H*', $signatureKey)));
+    }
 }
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php
new file mode 100644
index 0000000000000..94d8f3a0d27a7
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Authorizenet\Test\Unit\Model\Directpost;
+
+use Magento\Authorizenet\Model\Directpost\Request;
+use Magento\Framework\Intl\DateTimeFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class RequestTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DateTimeFactory|MockObject
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @var Request
+     */
+    private $requestModel;
+
+    protected function setUp()
+    {
+        $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dateTime = new \DateTime('2016-07-05 00:00:00', new \DateTimeZone('UTC'));
+        $this->dateTimeFactory->method('create')
+            ->willReturn($dateTime);
+
+        $this->requestModel = new Request([], $this->dateTimeFactory);
+    }
+
+    /**
+     * @param string $signatureKey
+     * @param string $expectedHash
+     * @dataProvider signRequestDataProvider
+     */
+    public function testSignRequestData(string $signatureKey, string $expectedHash)
+    {
+        /** @var \Magento\Authorizenet\Model\Directpost $paymentMethod */
+        $paymentMethod = $this->createMock(\Magento\Authorizenet\Model\Directpost::class);
+        $paymentMethod->method('getConfigData')
+            ->willReturnMap(
+                [
+                    ['test', null, true],
+                    ['login', null, 'login'],
+                    ['trans_key', null, 'trans_key'],
+                    ['signature_key', null, $signatureKey],
+                ]
+            );
+
+        $this->requestModel->setConstantData($paymentMethod);
+        $this->requestModel->signRequestData();
+        $signHash = $this->requestModel->getXFpHash();
+
+        $this->assertEquals($expectedHash, $signHash);
+    }
+
+    /**
+     * @return array
+     */
+    public function signRequestDataProvider()
+    {
+        return [
+            [
+                'signatureKey' => '3EAFCE5697C1B4B9748385C1FCD29D86F3B9B41C7EED85A3A01DFF65' .
+                    '70C8C29373C2A153355C3313CDF4AF723C0036DBF244A0821713A910024EE85547CEF37F',
+                'expectedHash' => '719ED94DF5CF3510CB5531E8115462C8F12CBCC8E917BD809E8D40B4FF06' .
+                    '1E14953554403DD9813CCCE0F31B184EB4DEF558E9C0747505A0C25420372DB00BE1'
+            ],
+            [
+                'signatureKey' => '',
+                'expectedHash' => '3656211f2c41d1e4c083606f326c0460'
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
index 15c7eecb09a69..ff4aa8b5ee361 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
@@ -13,53 +13,16 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Authorizenet\Model\Directpost\Response
      */
-    protected $responseModel;
+    private $responseModel;
 
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->responseModel = $objectManager->getObject(\Magento\Authorizenet\Model\Directpost\Response::class);
-    }
-
-    /**
-     * @param string $merchantMd5
-     * @param string $merchantApiLogin
-     * @param float|null $amount
-     * @param float|string $amountTestFunc
-     * @param string $transactionId
-     * @dataProvider generateHashDataProvider
-     */
-    public function testGenerateHash($merchantMd5, $merchantApiLogin, $amount, $amountTestFunc, $transactionId)
-    {
-        $this->assertEquals(
-            $this->generateHash($merchantMd5, $merchantApiLogin, $amountTestFunc, $transactionId),
-            $this->responseModel->generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
+        $this->responseModel = $objectManager->getObject(
+            \Magento\Authorizenet\Model\Directpost\Response::class
         );
     }
 
-    /**
-     * @return array
-     */
-    public function generateHashDataProvider()
-    {
-        return [
-            [
-                'merchantMd5' => 'FCD7F001E9274FDEFB14BFF91C799306',
-                'merchantApiLogin' => 'Magento',
-                'amount' => null,
-                'amountTestFunc' => '0.00',
-                'transactionId' => '1'
-            ],
-            [
-                'merchantMd5' => '8AEF4E508261A287C3E2F544720FCA3A',
-                'merchantApiLogin' => 'Magento2',
-                'amount' => 100.50,
-                'amountTestFunc' => 100.50,
-                'transactionId' => '2'
-            ]
-        ];
-    }
-
     /**
      * @param $merchantMd5
      * @param $merchantApiLogin
@@ -73,7 +36,8 @@ protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $trans
     }
 
     /**
-     * @param string $merchantMd5
+     * @param string $storedHash
+     * @param string $hashKey
      * @param string $merchantApiLogin
      * @param float|null $amount
      * @param string $transactionId
@@ -81,12 +45,21 @@ protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $trans
      * @param bool $expectedValue
      * @dataProvider isValidHashDataProvider
      */
-    public function testIsValidHash($merchantMd5, $merchantApiLogin, $amount, $transactionId, $hash, $expectedValue)
-    {
+    public function testIsValidHash(
+        string $storedHash,
+        string $hashKey,
+        string $merchantApiLogin,
+        $amount,
+        string $transactionId,
+        string $hash,
+        bool $expectedValue
+    ) {
         $this->responseModel->setXAmount($amount);
         $this->responseModel->setXTransId($transactionId);
-        $this->responseModel->setData('x_MD5_Hash', $hash);
-        $this->assertEquals($expectedValue, $this->responseModel->isValidHash($merchantMd5, $merchantApiLogin));
+        $this->responseModel->setData($hashKey, $hash);
+        $result = $this->responseModel->isValidHash($storedHash, $merchantApiLogin);
+
+        $this->assertEquals($expectedValue, $result);
     }
 
     /**
@@ -94,9 +67,14 @@ public function testIsValidHash($merchantMd5, $merchantApiLogin, $amount, $trans
      */
     public function isValidHashDataProvider()
     {
+        $signatureKey = '3EAFCE5697C1B4B9748385C1FCD29D86F3B9B41C7EED85A3A01DFF6570C8C' .
+            '29373C2A153355C3313CDF4AF723C0036DBF244A0821713A910024EE85547CEF37F';
+        $expectedSha2Hash = '368D48E0CD1274BF41C059138DA69985594021A4AD5B4C5526AE88C8F' .
+            '7C5769B13C5E1E4358900F3E51076FB69D14B0A797904C22E8A11A52AA49CDE5FBB703C';
         return [
             [
                 'merchantMd5' => 'FCD7F001E9274FDEFB14BFF91C799306',
+                'hashKey' => 'x_MD5_Hash',
                 'merchantApiLogin' => 'Magento',
                 'amount' => null,
                 'transactionId' => '1',
@@ -105,11 +83,21 @@ public function isValidHashDataProvider()
             ],
             [
                 'merchantMd5' => '8AEF4E508261A287C3E2F544720FCA3A',
+                'hashKey' => 'x_MD5_Hash',
                 'merchantApiLogin' => 'Magento2',
                 'amount' => 100.50,
                 'transactionId' => '2',
                 'hash' => '1F24A4EC9A169B2B2A072A5F168E16DC',
                 'expectedValue' => false
+            ],
+            [
+                'signatureKey' => $signatureKey,
+                'hashKey' => 'x_SHA2_Hash',
+                'merchantApiLogin' => 'Magento2',
+                'amount' => 100.50,
+                'transactionId' => '2',
+                'hash' => $expectedSha2Hash,
+                'expectedValue' => true
             ]
         ];
     }
diff --git a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
index 28bf6945c8b81..fc86c0d2dc68d 100644
--- a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
+++ b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
@@ -29,6 +29,10 @@
                     <label>Transaction Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
+                <field id="signature_key" translate="label" type="obscure" sortOrder="55" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Signature Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                </field>
                 <field id="trans_md5" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Merchant MD5</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
diff --git a/app/code/Magento/Authorizenet/etc/config.xml b/app/code/Magento/Authorizenet/etc/config.xml
index 02dca74023e22..60356460f553f 100644
--- a/app/code/Magento/Authorizenet/etc/config.xml
+++ b/app/code/Magento/Authorizenet/etc/config.xml
@@ -22,6 +22,7 @@
                 <title>Credit Card Direct Post (Authorize.Net)</title>
                 <trans_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <trans_md5 backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <signature_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <allowspecific>0</allowspecific>
                 <currency>USD</currency>
                 <create_order_before>1</create_order_before>

From 7471fea4e1176f2e3d49139bbee25feabdedc53a Mon Sep 17 00:00:00 2001
From: Oleksandr Shmyheliuk <oshmyheliuk@magento.com>
Date: Tue, 12 Mar 2019 22:54:27 -0500
Subject: [PATCH 0540/1055] MAGETWO-95675: Error during
 setup:static-content:deploy: Error while waiting for package deployed

---
 .../Deploy/Console/DeployStaticOptions.php    | 14 ++++++++
 .../Deploy/Service/DeployStaticContent.php    | 34 +++++++++++--------
 .../Unit/Service/DeployStaticContentTest.php  | 32 +++++++++++++++++
 3 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Deploy/Console/DeployStaticOptions.php b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
index 89cb3e4b30345..1c02d24f7e99c 100644
--- a/app/code/Magento/Deploy/Console/DeployStaticOptions.php
+++ b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Deploy\Console;
 
+use Magento\Deploy\Process\Queue;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 
@@ -57,6 +58,11 @@ class DeployStaticOptions
      */
     const JOBS_AMOUNT = 'jobs';
 
+    /**
+     * Key for max execution time option
+     */
+    const MAX_EXECUTION_TIME = 'max-execution-time';
+
     /**
      * Force run of static deploy
      */
@@ -150,6 +156,7 @@ public function getOptionsList()
      * Basic options
      *
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     private function getBasicOptions()
     {
@@ -216,6 +223,13 @@ private function getBasicOptions()
                 'Enable parallel processing using the specified number of jobs.',
                 self::DEFAULT_JOBS_AMOUNT
             ),
+            new InputOption(
+                self::MAX_EXECUTION_TIME,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The maximum expected execution time of deployment static process (in seconds).',
+                Queue::DEFAULT_MAX_EXEC_TIME
+            ),
             new InputOption(
                 self::SYMLINK_LOCALE,
                 null,
diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
index 66ec6e7418afd..854bf50e0af2f 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
@@ -85,24 +85,26 @@ public function deploy(array $options)
             return;
         }
 
-        $queue = $this->queueFactory->create(
-            [
-                'logger' => $this->logger,
-                'options' => $options,
-                'maxProcesses' => $this->getProcessesAmount($options),
-                'deployPackageService' => $this->objectManager->create(
-                    \Magento\Deploy\Service\DeployPackage::class,
-                    [
-                        'logger' => $this->logger
-                    ]
-                )
-            ]
-        );
+        $queueOptions = [
+            'logger' => $this->logger,
+            'options' => $options,
+            'maxProcesses' => $this->getProcessesAmount($options),
+            'deployPackageService' => $this->objectManager->create(
+                \Magento\Deploy\Service\DeployPackage::class,
+                [
+                    'logger' => $this->logger
+                ]
+            )
+        ];
+
+        if (isset($options[Options::MAX_EXECUTION_TIME])) {
+            $queueOptions['maxExecTime'] = (int)$options[Options::MAX_EXECUTION_TIME];
+        }
 
         $deployStrategy = $this->deployStrategyFactory->create(
             $options[Options::STRATEGY],
             [
-                'queue' => $queue
+                'queue' => $this->queueFactory->create($queueOptions)
             ]
         );
 
@@ -133,6 +135,8 @@ public function deploy(array $options)
     }
 
     /**
+     * Returns amount of parallel processes, returns zero if option wasn't set.
+     *
      * @param array $options
      * @return int
      */
@@ -142,6 +146,8 @@ private function getProcessesAmount(array $options)
     }
 
     /**
+     * Checks if need to refresh only version.
+     *
      * @param array $options
      * @return bool
      */
diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
index 75edc8cb4f6ee..396381960e544 100644
--- a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Deploy\Test\Unit\Service;
 
+use Magento\Deploy\Console\DeployStaticOptions;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Process\Queue;
 use Magento\Deploy\Service\Bundle;
@@ -221,4 +222,35 @@ public function deployDataProvider()
             ]
         ];
     }
+
+    public function testMaxExecutionTimeOptionPassed()
+    {
+        $options = [
+            DeployStaticOptions::MAX_EXECUTION_TIME => 100,
+            DeployStaticOptions::REFRESH_CONTENT_VERSION_ONLY => false,
+            DeployStaticOptions::JOBS_AMOUNT => 3,
+            DeployStaticOptions::STRATEGY => 'compact',
+            DeployStaticOptions::NO_JAVASCRIPT => true,
+            DeployStaticOptions::NO_HTML_MINIFY => true,
+        ];
+
+        $queueMock = $this->createMock(Queue::class);
+        $strategyMock = $this->createMock(CompactDeploy::class);
+        $this->queueFactory->expects($this->once())
+            ->method('create')
+            ->with([
+                'logger' => $this->logger,
+                'maxExecTime' => 100,
+                'maxProcesses' => 3,
+                'options' => $options,
+                'deployPackageService' => null
+            ])
+            ->willReturn($queueMock);
+        $this->deployStrategyFactory->expects($this->once())
+            ->method('create')
+            ->with('compact', ['queue' => $queueMock])
+            ->willReturn($strategyMock);
+
+        $this->service->deploy($options);
+    }
 }

From b62240110ec89edcefbb2f461c311086db9bc013 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Wed, 13 Mar 2019 11:26:19 +0530
Subject: [PATCH 0541/1055] Updated sort order

---
 app/code/Magento/Review/etc/adminhtml/menu.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index 72499b416cd17..7376329471921 100644
--- a/app/code/Magento/Review/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
         <add id="Magento_Review::catalog_reviews_ratings_ratings" title="Rating" translate="title" module="Magento_Review" sortOrder="60" parent="Magento_Backend::stores_attributes" action="review/rating/" resource="Magento_Review::ratings"/>
-        <add id="Magento_Review::catalog_reviews_ratings_pending" title="Pending Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="10" action="review/product/pending" resource="Magento_Review::pending"/>
-        <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="All Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="20" action="review/product/index" resource="Magento_Review::reviews_all"/>
+        <add id="Magento_Review::catalog_reviews_ratings_pending" title="Pending Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="20" action="review/product/pending" resource="Magento_Review::pending"/>
+        <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="All Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="10" action="review/product/index" resource="Magento_Review::reviews_all"/>
         <add id="Magento_Review::report_review" title="Reviews" translate="title" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
         <add id="Magento_Review::report_review_customer" title="By Customers" translate="title" sortOrder="10" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/customer" resource="Magento_Reports::review_customer"/>
         <add id="Magento_Review::report_review_product" title="By Products" translate="title" sortOrder="20" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/product" resource="Magento_Reports::review_product"/>

From 417fda4da93bdd11f83eec9c7ed27f2a84cc2a44 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Wed, 13 Mar 2019 11:27:01 +0530
Subject: [PATCH 0542/1055] Update acl.xml

---
 app/code/Magento/Review/etc/acl.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Review/etc/acl.xml b/app/code/Magento/Review/etc/acl.xml
index 6932f2535090c..46fdb20dee4a1 100644
--- a/app/code/Magento/Review/etc/acl.xml
+++ b/app/code/Magento/Review/etc/acl.xml
@@ -16,8 +16,8 @@
                 </resource>
                 <resource id="Magento_Backend::marketing">
                     <resource id="Magento_Backend::marketing_user_content">
-                        <resource id="Magento_Review::pending" title="Pending Reviews" translate="title" sortOrder="10"/>
-                        <resource id="Magento_Review::reviews_all" title="All Reviews" translate="title" sortOrder="20"/>
+                        <resource id="Magento_Review::pending" title="Pending Reviews" translate="title" sortOrder="20"/>
+                        <resource id="Magento_Review::reviews_all" title="All Reviews" translate="title" sortOrder="10"/>
                     </resource>
                 </resource>
             </resource>

From aa25ca575a2f379dc69f2b7edc77c15ebf60f118 Mon Sep 17 00:00:00 2001
From: Evgeny Petrov <evgeny_petrov@epam.com>
Date: Wed, 13 Mar 2019 10:01:26 +0300
Subject: [PATCH 0543/1055] MAGETWO-57934: [GitHub] Can't use "configurable" as
 group name in attribute sets M2.1 #6123

---
 app/code/Magento/Eav/Model/Entity/Attribute/Group.php       | 4 ++--
 .../Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
index 4570dfb2af5ec..2e55964560588 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
@@ -127,8 +127,8 @@ public function beforeSave()
                 );
                 $isReservedSystemName = in_array(strtolower($attributeGroupCode), $this->reservedSystemNames);
                 if (empty($attributeGroupCode) || $isReservedSystemName) {
-                    // in the following code sha1 is not used for security purposes
-                    $attributeGroupCode = sha1(strtolower($groupName));
+                    // in the following code md5 is not used for security purposes
+                    $attributeGroupCode = md5(strtolower($groupName));
                 }
                 $this->setAttributeGroupCode($attributeGroupCode);
             }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
index 986ab517ceca1..1584b922abaa9 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
@@ -68,9 +68,9 @@ public function attributeGroupCodeDataProvider()
     {
         return [
             ['General Group', 'general-group'],
-            ['configurable', sha1('configurable')],
-            ['configurAble', sha1('configurable')],
-            ['///', sha1('///')],
+            ['configurable', md5('configurable')],
+            ['configurAble', md5('configurable')],
+            ['///', md5('///')],
         ];
     }
 }

From bfea663290be803d2ced87e55376790a27d47001 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 13 Mar 2019 09:53:22 +0200
Subject: [PATCH 0544/1055] Currency misspelled in graphql attributes

---
 app/code/Magento/DirectoryGraphQl/etc/schema.graphqls | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
index f2bc576f95e8e..59c6a35e9a1ac 100644
--- a/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
@@ -10,8 +10,10 @@ type Query {
 type Currency {
     base_currency_code: String
     base_currency_symbol: String
+    default_display_currecy_code: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_code`.")
     default_display_currency_code: String
-    default_display_currency_symbol: String
+    default_display_currecy_symbol: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_symbol`.")
+    default_display_currency_symbol
     available_currency_codes: [String]
     exchange_rates: [ExchangeRate]
 }

From 3819dc1dcc2aa19c3811e33b88c8f31f599f8428 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 13 Mar 2019 10:58:31 +0200
Subject: [PATCH 0545/1055] Vitalii Boiko: fixed wrong proxing in the inventory
 observer

---
 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 8d57fab843f4c..51a5b46b59d22 100644
--- a/app/code/Magento/CatalogInventory/etc/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/di.xml
@@ -44,7 +44,7 @@
     </type>
     <type name="Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver">
         <arguments>
-            <argument name="resourceStock" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy</argument>
+            <argument name="resourceStockItem" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Layer">

From 46bbdd0e3d5796e427899b96c189888423cb55d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Wed, 13 Mar 2019 11:38:58 +0200
Subject: [PATCH 0546/1055] add choice class

---
 .../frontend/web/template/checkout/checkout-agreements.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
index db9da71ebf739..4b1a68624e547 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
@@ -8,7 +8,7 @@
     <div class="checkout-agreements fieldset" data-bind="visible: isVisible">
         <!-- ko foreach: agreements -->
             <!-- ko if: ($parent.isAgreementRequired($data)) -->
-            <div class="checkout-agreement field required">
+            <div class="checkout-agreement field choice required">
                 <input type="checkbox" class="required-entry"
                        data-bind="attr: {
                                     'id': $parent.getCheckboxId($parentContext, agreementId),

From a39e22181d94cdec03d40034da96264af32ef4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Wed, 13 Mar 2019 11:53:26 +0200
Subject: [PATCH 0547/1055] fix choice aligment

---
 .../web/css/source/module/checkout/_payments.less          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
index 5f8134193c67f..35445b0989e86 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -209,6 +209,13 @@
             .fieldset {
                 > .field {
                     margin: 0 0 @indent__base;
+                    
+                    &.choice {
+                        &:before {
+                            padding: 0;
+                            width: 0;
+                        }
+                    }
 
                     &.type {
                         .control {

From a546e142fa738eeb09e09499bd577e40749cc57c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 13 Mar 2019 13:13:55 +0200
Subject: [PATCH 0548/1055] ENGCOM-4481: Static test fix.

---
 .../Magento/Framework/Search/Adapter/Mysql/Adapter.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
index 501136f76752f..e1b423d738a20 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder;
 use Magento\Framework\Search\AdapterInterface;
 use Magento\Framework\Search\RequestInterface;
@@ -129,9 +130,10 @@ private function getConnection()
     /**
      * Get rows size
      *
+     * @param Select $query
      * @return int
      */
-    private function getSize($query)
+    private function getSize(Select $query): int
     {
         $sql = $this->getSelectCountSql($query);
         $parentSelect = $this->getConnection()->select();
@@ -139,22 +141,24 @@ private function getSize($query)
         $parentSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
         $parentSelect->columns('COUNT(*)');
         $totalRecords = $this->getConnection()->fetchOne($parentSelect);
+
         return intval($totalRecords);
     }
 
     /**
      * Reset limit and offset
      *
+     * @param Select $query
      * @return Select
      */
-    private function getSelectCountSql($query)
+    private function getSelectCountSql(Select $query): Select
     {
         foreach ($this->countSqlSkipParts as $part => $toSkip) {
             if ($toSkip) {
                 $query->reset($part);
             }
         }
+
         return $query;
     }
-
 }

From 6ebdde1f138cb5316b83dd437a5db329289ee8cb Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 13 Mar 2019 13:21:47 +0200
Subject: [PATCH 0549/1055] Currency misspelled in graphql attributes

---
 app/code/Magento/DirectoryGraphQl/etc/schema.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
index 59c6a35e9a1ac..8da1920f9a444 100644
--- a/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DirectoryGraphQl/etc/schema.graphqls
@@ -13,7 +13,7 @@ type Currency {
     default_display_currecy_code: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_code`.")
     default_display_currency_code: String
     default_display_currecy_symbol: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_symbol`.")
-    default_display_currency_symbol
+    default_display_currency_symbol: String
     available_currency_codes: [String]
     exchange_rates: [ExchangeRate]
 }

From 1cf01787820058222c9d05cdd64088ef18073b0a Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Wed, 13 Mar 2019 12:15:37 +0100
Subject: [PATCH 0550/1055] GraphQL-432: Replaced the places are using
 getMaskedQuoteId as method. Added new class to handle that.

---
 .../GetAvailablePaymentMethodsTest.php        | 23 +++++-------
 .../GraphQl/Quote/Customer/GetCartTest.php    | 31 ++++++++--------
 .../Customer/SetBillingAddressOnCartTest.php  | 23 +++++-------
 .../Customer/SetPaymentMethodOnCartTest.php   | 37 ++++++++++---------
 .../Customer/SetShippingMethodsOnCartTest.php | 20 ++++------
 .../Guest/GetAvailablePaymentMethodsTest.php  | 23 +++++-------
 .../GraphQl/Quote/Guest/GetCartTest.php       | 23 +++++-------
 .../Guest/SetBillingAddressOnCartTest.php     | 33 +++++++++--------
 .../Guest/SetPaymentMethodOnCartTest.php      | 35 +++++++++---------
 .../Guest/SetShippingMethodsOnCartTest.php    | 20 ++++------
 .../Quote/SetShippingAddressOnCartTest.php    | 24 ++++++------
 11 files changed, 137 insertions(+), 155 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index 5695aab6854d4..777dd5508c16a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -8,6 +8,7 @@
 namespace Magento\GraphQl\Quote\Customer;
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -24,6 +25,11 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var QuoteResource
      */
@@ -45,6 +51,7 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -53,10 +60,12 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetCartWithPaymentMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
 
         $query = <<<QUERY
 {
@@ -86,16 +95,4 @@ private function getHeaderMap(string $username = 'customer@example.com', string
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
         return $headerMap;
     }
-
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index fe9b7b3c49a7c..5407d1e90121d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -8,6 +8,7 @@
 namespace Magento\GraphQl\Quote\Customer;
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -19,6 +20,11 @@
  */
 class GetCartTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var QuoteResource
      */
@@ -42,6 +48,7 @@ class GetCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -50,10 +57,12 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
         $query = $this->getCartQuery($maskedQuoteId);
 
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -74,10 +83,12 @@ public function testGetCart()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetGuestCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
         $query = $this->getCartQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -89,10 +100,12 @@ public function testGetGuestCart()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
         $query = $this->getCartQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -136,18 +149,6 @@ private function getCartQuery(
 QUERY;
     }
 
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $username
      * @param string $password
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 1a93c011e80a8..2d7b2caf4363a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -8,6 +8,7 @@
 namespace Magento\GraphQl\Quote\Customer;
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -19,6 +20,11 @@
  */
 class SetBillingAddressOnCartTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var QuoteResource
      */
@@ -42,6 +48,7 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -307,10 +314,12 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetBillingAddressToGuestCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -459,18 +468,6 @@ private function getHeaderMap(string $username = 'customer@example.com', string
         return $headerMap;
     }
 
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $reversedQuoteId
      * @param int $customerId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index bbc77b6c39740..97be79d79eef8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\OfflinePayments\Model\Checkmo;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -25,6 +26,11 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var QuoteResource
      */
@@ -46,6 +52,7 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -54,11 +61,13 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentWithVirtualProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_virtual_product');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -71,11 +80,13 @@ public function testSetPaymentWithVirtualProduct()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentWithSimpleProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -109,7 +120,7 @@ public function testSetPaymentWithSimpleProductWithoutAddress()
     public function testSetNonExistingPaymentMethod()
     {
         $methodCode = 'noway';
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -118,11 +129,13 @@ public function testSetNonExistingPaymentMethod()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentMethodToGuestCart()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
 
@@ -136,11 +149,13 @@ public function testSetPaymentMethodToGuestCart()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentMethodToAnotherCustomerCart()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
 
@@ -178,18 +193,6 @@ private function prepareMutationQuery(
 QUERY;
     }
 
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $reversedQuoteId
      * @param int $customerId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 736ea69440753..c8d32ba796904 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -8,6 +8,7 @@
 namespace Magento\GraphQl\Quote\Customer;
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -19,6 +20,11 @@
  */
 class SetShippingMethodsOnCartTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var CustomerTokenServiceInterface
      */
@@ -45,6 +51,7 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -161,19 +168,6 @@ private function prepareMutationQuery(
 QUERY;
     }
 
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $reversedQuoteId
      * @param int $customerId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index a5a08aaf39fb1..084401cdf8915 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -10,6 +10,7 @@
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -18,6 +19,11 @@
  */
 class GetAvailablePaymentMethodsTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var QuoteResource
      */
@@ -39,6 +45,7 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -46,10 +53,12 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetCartWithPaymentMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 {
@@ -74,16 +83,4 @@ public function testGetCartWithPaymentMethods()
             $response['cart']['available_payment_methods'][1]['title']
         );
     }
-
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index b1d5e475c793e..8aa449906618b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -11,6 +11,7 @@
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -19,6 +20,11 @@
  */
 class GetCartTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var QuoteResource
      */
@@ -42,6 +48,7 @@ class GetCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -73,10 +80,12 @@ public function testGetCart()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
         $query = $this->getCartQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -119,18 +128,6 @@ private function getCartQuery(
 QUERY;
     }
 
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $reversedQuoteId
      * @param int $customerId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 880d6aa0f406f..7b7f673d04935 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -18,6 +19,11 @@
  */
 class SetBillingAddressOnCartTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var QuoteResource
      */
@@ -36,6 +42,7 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -43,10 +50,12 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetNewBillingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -99,10 +108,12 @@ public function testSetNewBillingAddress()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetNewBillingAddressWithUseForShippingParameter()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -173,10 +184,12 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSettBillingAddressToCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
 
         $query = <<<QUERY
 mutation {
@@ -221,7 +234,7 @@ public function testSettBillingAddressToCustomerCart()
      */
     public function testSetBillingAddressFromAddressBook()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -266,16 +279,4 @@ private function assertNewAddressFields(array $addressResponse, string $addressT
 
         $this->assertResponseFields($addressResponse, $assertionMap);
     }
-
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 7484b2af7569d..22592d78d5d09 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -11,6 +11,7 @@
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -19,6 +20,11 @@
  */
 class SetPaymentMethodOnCartTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var QuoteResource
      */
@@ -40,6 +46,7 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -47,11 +54,13 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentWithVirtualProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_virtual_product');
         $this->unAssignCustomerFromQuote('test_order_with_virtual_product');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
@@ -65,11 +74,13 @@ public function testSetPaymentWithVirtualProduct()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentWithSimpleProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
         $this->unAssignCustomerFromQuote('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
@@ -89,7 +100,7 @@ public function testSetPaymentWithSimpleProduct()
     public function testSetPaymentWithSimpleProductWithoutAddress()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
         $this->graphQlQuery($query);
@@ -103,7 +114,7 @@ public function testSetPaymentWithSimpleProductWithoutAddress()
     public function testSetNonExistingPaymentMethod()
     {
         $methodCode = 'noway';
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
         $this->unAssignCustomerFromQuote('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
@@ -112,11 +123,13 @@ public function testSetNonExistingPaymentMethod()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentMethodToCustomerCart()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
 
@@ -169,16 +182,4 @@ private function unAssignCustomerFromQuote(
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
-
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index f159cb6f6151e..07825922d718b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -10,6 +10,7 @@
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -18,6 +19,11 @@
  */
 class SetShippingMethodsOnCartTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReversedQuoteId
+     */
+    private $getMaskedQuoteIdByReversedQuoteId;
+
     /**
      * @var QuoteResource
      */
@@ -39,6 +45,7 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReversedQuoteId->execute(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -151,17 +158,4 @@ private function prepareMutationQuery(
 
 QUERY;
     }
-
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
index 9352111de8543..dcbf7220f24ec 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
@@ -24,38 +24,38 @@
 class SetShippingAddressOnCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var CustomerTokenServiceInterface
      */
-    private $quoteResource;
+    private $customerTokenService;
 
     /**
-     * @var QuoteFactory
+     * @var GetMaskedQuoteIdByReversedQuoteId
      */
-    private $quoteFactory;
+    private $getMaskedQuoteIdByReversedQuoteId;
 
     /**
-     * @var QuoteIdToMaskedQuoteIdInterface
+     * @var QuoteResource
      */
-    private $quoteIdToMaskedId;
+    private $quoteResource;
 
     /**
-     * @var GetMaskedQuoteIdByReversedQuoteId
+     * @var QuoteFactory
      */
-    private $getMaskedQuoteIdByReversedQuoteId;
+    private $quoteFactory;
 
     /**
-     * @var CustomerTokenServiceInterface
+     * @var QuoteIdToMaskedQuoteIdInterface
      */
-    private $customerTokenService;
+    private $quoteIdToMaskedId;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**

From 2d5f881ce37685bc6b1b34a778fb6ac4aa83f548 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 13 Mar 2019 14:38:37 +0300
Subject: [PATCH 0551/1055] MAGETWO-44165: [FT]
 Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest
 fails

- Migrate tests to mftf.
---
 .../Test/AdminCreateAndSwitchProductType.xml  | 109 +++++++++++++++++-
 1 file changed, 106 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
index e79f7f75cce3f..50c17cfc4b9ab 100755
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
@@ -53,9 +53,6 @@
             <testCaseId value="MC-10930"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MAGETWO-62808"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
@@ -83,4 +80,110 @@
             <argument name="optionName" value="$createConfigProductAttributeOption1.option[store_labels][1][label]$"/>
         </actionGroup>
     </test>
+    <test name="AdminCreateSimpleProductSwitchToConfigurableTest" extends="AdminCreateSimpleProductSwitchToVirtualTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Product Type Switching"/>
+            <title value="Admin should be able to switch a new product from simple to configurable"/>
+            <description value="After selecting a simple product when adding Admin should be switch to configurable implicitly"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-29398"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteAttribute" createDataKey="createConfigProductAttribute"/>
+        </after>
+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
+            <argument name="productType" value="simple"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <comment before="createConfiguration" stepKey="beforeCreateConfiguration" userInput="Adding Configuration to Product"/>
+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="createConfiguration" after="fillProductForm">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+        </actionGroup>
+        <actionGroup ref="saveConfiguredProduct" stepKey="saveProductForm"/>
+        <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product"  stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="VerifyOptionInProductStorefront" stepKey="verifyConfigurableOption" after="AssertProductInStorefrontProductPage">
+            <argument name="attributeCode" value="$createConfigProductAttribute.default_frontend_label$"/>
+            <argument name="optionName" value="$createConfigProductAttributeOption1.option[store_labels][1][label]$"/>
+        </actionGroup>
+    </test>
+    <test name="AdminCreateDownloadableProductSwitchToConfigurableTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Product Type Switching"/>
+            <title value="Admin should be able to switch a new product from downloadable to configurable"/>
+            <description value="After selecting a downloadable product when adding Admin should be switch to configurable implicitly"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-29398"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+        </before>
+        <after>
+            <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProduct">
+                <argument name="product" value="_defaultProduct"/>
+            </actionGroup>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetSearch"/>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData stepKey="deleteAttribute" createDataKey="createConfigProductAttribute"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <!-- Open Dropdown and select downloadable product option -->
+        <comment stepKey="beforeOpenProductFillForm" userInput="Selecting Product from the Add Product Dropdown"/>
+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
+            <argument name="productType" value="downloadable"/>
+        </actionGroup>
+
+        <scrollTo selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="scrollToDownloadableInfo" />
+        <wait stepKey="2" time="3"/>
+        <uncheckOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable"/>
+
+        <!-- Fill form for Downloadable Product Type -->
+        <comment stepKey="beforeFillProductForm" userInput="Filling Product Form"/>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <actionGroup ref="SetProductUrlKey" stepKey="setProductUrl">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <comment before="createConfiguration" stepKey="beforeCreateConfiguration" userInput="Adding Configuration to Product"/>
+        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="createConfiguration">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+        </actionGroup>
+        <actionGroup ref="saveConfiguredProduct" stepKey="saveProductForm"/>
+        <!-- Check that product was added with implicit type change -->
+        <comment stepKey="beforeVerify" userInput="Verify Product Type Assigned Correctly"/>
+        <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetSearch"/>
+        <actionGroup ref="filterProductGridByName" stepKey="searchForProduct">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product"  stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+        <actionGroup ref="VerifyOptionInProductStorefront" stepKey="verifyConfigurableOption">
+            <argument name="attributeCode" value="$createConfigProductAttribute.default_frontend_label$"/>
+            <argument name="optionName" value="$createConfigProductAttributeOption1.option[store_labels][1][label]$"/>
+        </actionGroup>
+    </test>
 </tests>

From 43f5bce81c3b13af13a88b24041d905fb98dfada Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Wed, 13 Mar 2019 17:14:51 +0530
Subject: [PATCH 0552/1055] Covered all the cases of SetShippingMethod for
 Guest

---
 .../Guest/SetShippingMethodsOnCartTest.php    | 400 +++++++++++++++++-
 ...ote_with_simple_product_saved_rollback.php |   2 +
 ...h_virtual_product_and_address_rollback.php |   4 +
 ...te_with_virtual_product_saved_rollback.php |   2 +
 .../_files/simple_product_rollback.php        |  24 ++
 5 files changed, 419 insertions(+), 13 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index b452c2cd9d6d2..e76974b5290e5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -12,6 +12,7 @@
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
 /**
  * Test for setting shipping methods on cart for guest
@@ -33,6 +34,11 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
      */
     private $quoteIdToMaskedId;
 
+    /**
+     * @var QuoteAddress
+     */
+    private $quoteAddress;
+
     /**
      * @inheritdoc
      */
@@ -42,71 +48,409 @@ protected function setUp()
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->quoteAddress = $objectManager->get(QuoteAddress::class);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
     public function testShippingMethodWithVirtualProduct()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'test_order_with_virtual_product_without_address';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+        $quoteAddressId = $this->getQuoteAddressIdByReversedQuoteId($reservedOrderId);
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        self::expectException(\Exception::class);
+        self::expectExceptionMessage('Carrier with such method not found: ' . $methodCode . ', ' . $methodCode . '');
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
     public function testShippingMethodWithSimpleProduct()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'test_order_with_simple_product_without_address';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+        $quoteAddressId = $this->getQuoteAddressIdByReversedQuoteId($reservedOrderId);
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+
+        $selectedShippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $selectedShippingMethod);
+        self::assertEquals($carrierCode, $selectedShippingMethod['selected_shipping_method']['carrier_code']);
+        self::assertEquals($methodCode, $selectedShippingMethod['selected_shipping_method']['method_code']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameter "cart_address_id" is missing.
+     */
     public function testShippingMethodWithSimpleProductWithoutAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'test_order_with_simple_product_without_address';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+        $quoteAddressId = 0;
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameter "method_code" is missing.
+     */
     public function testSetShippingMethodWithMissedRequiredParameters()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = '';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'test_order_with_simple_product_without_address';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+        $quoteAddressId = $this->getQuoteAddressIdByReversedQuoteId($reservedOrderId);
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
     public function testSetNonExistentShippingMethod()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'non-existed-method-code';
+        $carrierCode = 'non-carrier-method-code';
+        $reservedOrderId = 'guest_quote';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'guest_quote', 'reserved_order_id');
+        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        self::expectException(\Exception::class);
+        self::expectExceptionMessage('Carrier with such method not found: ' . $carrierCode . ', ' . $methodCode . '');
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     */
     public function testSetShippingMethodIfAddressIsNotBelongToCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'guest_quote';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_virtual_product', 'reserved_order_id');
+        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        self::expectException(\Exception::class);
+        self::expectExceptionMessage('The current user cannot use cart address with ID "' . $quoteAddressId . '"');
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     * @expectedExceptionMessage No such entity with cartId = 0
+     */
     public function testSetShippingMethodToNonExistentCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'non_existent_cart_reversed_quote_id';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+        $quoteAddressId = 1;
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
     public function testSetShippingMethodToGuestCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'guest_quote';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+
+        $selectedShippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $selectedShippingMethod);
+        self::assertEquals($carrierCode, $selectedShippingMethod['selected_shipping_method']['carrier_code']);
+        self::assertEquals($methodCode, $selectedShippingMethod['selected_shipping_method']['method_code']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     */
     public function testSetShippingMethodToAnotherCustomerCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'guest_quote';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        self::expectException(\Exception::class);
+        self::expectExceptionMessage(
+            'The current user cannot perform operations on cart "' . $maskedQuoteId . '"'
+        );
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
     public function testSetShippingMethodToNonExistentCartAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'guest_quote';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $quoteAddressId = 1963425585;
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        self::expectException(\Exception::class);
+        self::expectExceptionMessage(
+            'Could not find a cart address with ID "' . $quoteAddressId . '"'
+        );
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
     public function testSetShippingMethodToGuestCartAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'guest_quote';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+
+        $selectedShippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $selectedShippingMethod);
+        self::assertEquals($carrierCode, $selectedShippingMethod['selected_shipping_method']['carrier_code']);
+        self::assertEquals($methodCode, $selectedShippingMethod['selected_shipping_method']['method_code']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
     public function testSetShippingMethodToAnotherCustomerCartAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'test_order_1';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
+
+        $query = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+
+        self::expectException(\Exception::class);
+        self::expectExceptionMessage(
+            'The current user cannot perform operations on cart "' . $maskedQuoteId . '"'
+        );
+        $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage You cannot specify multiple shipping methods.
+     */
     public function testSetMultipleShippingMethods()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $reservedOrderId = 'guest_quote';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $shippingAddressId = (int) $quote->getShippingAddress()->getId();
+
+        $query = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input:
+    {
+      cart_id: "$maskedQuoteId",
+      shipping_methods: [{
+          cart_address_id: $shippingAddressId
+          method_code: "$methodCode"
+          carrier_code: "$carrierCode"
+        },
+        {
+          cart_address_id: $shippingAddressId
+          method_code: "ups"
+          carrier_code: "ups"
+      }]
+    }) {
+
+    cart {
+      shipping_addresses {
+        address_id
+        firstname
+        lastname
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+          amount
+        }
+      }
+    }
+  }
+}
+
+QUERY;
+
+        $this->graphQlQuery($query);
     }
 
     /**
@@ -163,4 +507,34 @@ private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): str
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return int
+     */
+    private function getQuoteAddressIdByReversedQuoteId(string $reversedQuoteId): int
+    {
+        $guestAddress = $this->quoteAddress->setData([
+            'firstname'=> 'John',
+            'lastname'=> 'Smith',
+            'company'=> 'Company Name',
+            'street'=> 'Green str, 67',
+            'city'=> 'CityM',
+            'region' => 'AL',
+            'postcode'=> 75477,
+            'telephone'=> 3468676,
+            'country_id'=> 'US',
+            'region_id' => 1
+        ]);
+
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        $quote->setBillingAddress($guestAddress);
+        $quote->setShippingAddress($guestAddress);
+        $quote->collectTotals();
+        $this->quoteResource->save($quote);
+
+        return (int) $quote->getShippingAddress()->getId();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
index 105a981ccfc84..39b758447221c 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
@@ -14,3 +14,5 @@
 /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
 $quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
 $quoteIdMask->delete($quote->getId());
+
+require 'simple_product_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php
index 2b906bdc022f5..52ce4b4006db8 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php
@@ -13,3 +13,7 @@
 /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
 $quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
 $quoteIdMask->delete($quote->getId());
+
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
+require __DIR__ . '/../../Customer/_files/customer_address_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_virtual_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php
index b3224bb527442..afcb7f56f8d1b 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved_rollback.php
@@ -14,3 +14,5 @@
 /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
 $quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
 $quoteIdMask->delete($quote->getId());
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_virtual_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
new file mode 100644
index 0000000000000..f03784519f371
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('simple', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 4bdc30ed09f7093c772d359daecd7980e9555e46 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Wed, 13 Mar 2019 17:32:33 +0530
Subject: [PATCH 0553/1055] Fixed issue of undefined variable: objectManager

---
 .../Magento/Checkout/_files/simple_product_rollback.php       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
index f03784519f371..43beafe822043 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 /** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);

From 80499c9fe0c0704c76d502cdcbb3b31a1b6903e3 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 13 Mar 2019 14:06:28 +0200
Subject: [PATCH 0554/1055] graphQl-430: added testReSetPaymentMethod for guest
 and customer

---
 .../Customer/SetPaymentMethodOnCartTest.php    | 17 +++++++++++++++++
 .../Quote/Guest/SetPaymentMethodOnCartTest.php | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index 91c98d2f13f47..c7da2144adb9e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -171,6 +171,23 @@ public function testPaymentMethodOnNonExistentCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_payment_saved.php
+     */
+    public function testReSetPayment()
+    {
+        /** @var \Magento\Quote\Model\Quote  $quote */
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_with_payment');
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index fbfa53b7d6434..182bbaf618505 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -145,6 +145,24 @@ public function testSetPaymentOnNonExistentCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_payment_saved.php
+     */
+    public function testReSetPayment()
+    {
+        /** @var \Magento\Quote\Model\Quote  $quote */
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_with_payment');
+        $this->unAssignCustomerFromQuote('test_order_1_with_payment');
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
+        self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode

From b6833428bf30d2ece3f9b0b2826474b50c636273 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Wed, 13 Mar 2019 16:22:22 +0400
Subject: [PATCH 0555/1055] MAGETWO-96127: Catalog grid page number resets
 after Save and Close action

- Update automated test script
---
 .../Mftf/ActionGroup/AdminProductGridActionGroup.xml     | 9 +++++++++
 .../AdminGridPageNumberAfterSaveAndCloseActionTest.xml   | 8 ++++++++
 .../ActionGroup/AdminDataGridPaginationActionGroup.xml   | 3 +--
 .../Test/Mftf/Section/AdminDataGridPaginationSection.xml | 1 +
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index c9d70319c2877..3d1bac7a86627 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -288,4 +288,13 @@
         <waitForPageLoad stepKey="waitForProductToLoad"/>
         <waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForProductTitle"/>
     </actionGroup>
+
+    <actionGroup name="emptyProductGridIfTheyExits">
+        <conditionalClick selector="{{AdminProductGridSection.multicheckDropdown}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="openMulticheckDropdown"/>
+        <conditionalClick selector="{{AdminProductGridSection.multicheckOption('Select All')}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="selectAllProductInFilteredGrid"/>
+        <conditionalClick selector="{{AdminProductGridSection.bulkActionDropdown}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="clickActionDropdown"/>
+        <conditionalClick selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="clickDeleteAction"/>
+        <wait time="2" stepKey="waitForConfirmModal"/>
+        <conditionalClick selector="{{AdminProductGridConfirmActionSection.ok}}" dependentSelector="{{AdminProductGridConfirmActionSection.ok}}" visible="true" stepKey="confirmProductDelete"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
index fda1b0284f782..3f5910caf7f39 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
@@ -20,6 +20,14 @@
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Clear product page-->
+            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
+            <waitForPageLoad stepKey="waitForProductIndexPage"/>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+            <actionGroup ref="emptyProductGridIfTheyExits" stepKey="deleteProductIfTheyExits"/>
             <createData stepKey="category1" entity="SimpleSubCategory"/>
             <createData stepKey="product1" entity="SimpleProduct">
                 <requiredEntity createDataKey="category1"/>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
index d291cecfb8917..fbb543a6cab92 100644
--- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
@@ -27,8 +27,7 @@
         <fillField selector="{{AdminDataGridPaginationSection.perPageInput}}" userInput="{{perPage}}" stepKey="fillCustomPerPage"/>
         <click selector="{{AdminDataGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
-        <click selector="{{AdminDataGridPaginationSection.perPageDropdown}}" stepKey="clickPerPageDropdown1"/>
-        <seeElement selector="{{AdminDataGridPaginationSection.perPageDropDownItem(perPage)}}" stepKey="seeDropDownItem"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.perPageDropDownValue}}" userInput="{{perPage}}" stepKey="seePerPageValueInDropDown"/>
     </actionGroup>
 
     <actionGroup name="adminDataGridDeleteCustomPerPage">
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
index 3f4fbb20eec29..8d3641366464e 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
@@ -20,5 +20,6 @@
         <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous" timeout="30"/>
         <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>
         <element name="totalPages" type="text" selector="div.admin__data-grid-pager > label"/>
+        <element name="perPageDropDownValue" type="input" selector=".selectmenu-value input" timeout="30"/>
     </section>
 </sections>

From 9dc26ccc47495eb33809cbdf180c848373251d9f Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 13 Mar 2019 14:35:16 +0200
Subject: [PATCH 0556/1055] ENGCOM-4481: Unit test fix.

---
 .../Search/Test/Unit/Adapter/Mysql/AdapterTest.php        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
index a35e1fd8b6151..fbb56361bfe71 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
@@ -161,10 +161,16 @@ public function testQuery()
         $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->connectionAdapter->expects($this->once())
+
+        $this->connectionAdapter->expects($this->exactly(2))
             ->method('select')
             ->willReturn($select);
 
+        $this->connectionAdapter->expects($this->once())
+            ->method('fetchOne')
+            ->with($select)
+            ->willReturn($selectResult['total']);
+
         $table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
             ->disableOriginalConstructor()
             ->getMock();

From 4d4a9825a9f6fc323adf35ece565c81706902b3a Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 13 Mar 2019 15:19:47 +0200
Subject: [PATCH 0557/1055] mutations add<Product Type>ProductsToCart dosn't
 check if the cart is active

---
 .../Model/Cart/GetCartForUser.php             | 16 ++++++---------
 .../GraphQl/Quote/Customer/GetCartTest.php    | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index fa2b924d44bf5..ba948e2c4fc75 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -69,6 +69,12 @@ public function execute(string $cartHash, ?int $customerId): Quote
             );
         }
 
+        if (!$cart->getIsActive()) {
+            throw new GraphQlNoSuchEntityException(
+                __('Current customer does not have an active cart.')
+            );
+        }
+
         $cartCustomerId = (int)$cart->getCustomerId();
 
         /* Guest cart, allow operations */
@@ -84,16 +90,6 @@ public function execute(string $cartHash, ?int $customerId): Quote
                 )
             );
         }
-
-        if ($customerId) {
-            try {
-                return $this->cartRepository->getActiveForCustomer($customerId);
-            } catch (\Exception $e) {
-                throw new GraphQlNoSuchEntityException(
-                    __($e->getMessage())
-                );
-            }
-        }
         return $cart;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index fe9b7b3c49a7c..ecda94cb15631 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -114,6 +114,26 @@ public function testGetNonExistentCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Current customer does not have an active cart.
+     */
+    public function testGetInactiveCart()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+        $quote->setCustomerId(1);
+        $quote->setIsActive(false);
+        $this->quoteResource->save($quote);
+        $maskedQuoteId =  $this->quoteIdToMaskedId->execute((int)$quote->getId());
+
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string

From 06fe10916fcc622bd081c1bd83179b02696e9d62 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Wed, 13 Mar 2019 08:21:53 -0500
Subject: [PATCH 0558/1055] MAGETWO-98643: [Magento Cloud] Translated Arabic
 URL's are returning 404's

---
 .../UrlRewrite/Model/Storage/DbStorage.php    | 109 +++++++++++++-----
 .../Model/UrlFinderInterfaceTest.php          |  71 ++++++++++++
 .../UrlRewrite/_files/url_rewrites.php        |  42 +++++++
 .../_files/url_rewrites_rollback.php          |  20 ++++
 4 files changed, 210 insertions(+), 32 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php
 create mode 100644 dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php

diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index d8ceb16d71fdc..2ac1bdd712114 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -105,42 +105,18 @@ protected function doFindOneByData(array $data)
             $result = null;
 
             $requestPath = $data[UrlRewrite::REQUEST_PATH];
-
-            $data[UrlRewrite::REQUEST_PATH] = [
+            $decodedRequestPath = urldecode($requestPath);
+            $data[UrlRewrite::REQUEST_PATH] = array_unique([
                 rtrim($requestPath, '/'),
                 rtrim($requestPath, '/') . '/',
-            ];
+                rtrim($decodedRequestPath, '/'),
+                rtrim($decodedRequestPath, '/') . '/',
+            ]);
 
             $resultsFromDb = $this->connection->fetchAll($this->prepareSelect($data));
-
-            if (count($resultsFromDb) === 1) {
-                $resultFromDb = current($resultsFromDb);
-                $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
-
-                // If request path matches the DB value or it's redirect - we can return result from DB
-                $canReturnResultFromDb = ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath
-                    || in_array((int)$resultFromDb[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true));
-
-                // Otherwise return 301 redirect to request path from DB results
-                $result = $canReturnResultFromDb ? $resultFromDb : [
-                    UrlRewrite::ENTITY_TYPE => 'custom',
-                    UrlRewrite::ENTITY_ID => '0',
-                    UrlRewrite::REQUEST_PATH => $requestPath,
-                    UrlRewrite::TARGET_PATH => $resultFromDb[UrlRewrite::REQUEST_PATH],
-                    UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
-                    UrlRewrite::STORE_ID => $resultFromDb[UrlRewrite::STORE_ID],
-                    UrlRewrite::DESCRIPTION => null,
-                    UrlRewrite::IS_AUTOGENERATED => '0',
-                    UrlRewrite::METADATA => null,
-                ];
-            } else {
-                // If we have 2 results - return the row that matches request path
-                foreach ($resultsFromDb as $resultFromDb) {
-                    if ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath) {
-                        $result = $resultFromDb;
-                        break;
-                    }
-                }
+            if ($resultsFromDb) {
+                $urlRewrite = $this->extractMostRelevantUrlRewrite($requestPath, $resultsFromDb);
+                $result = $this->prepareUrlRewrite($requestPath, $urlRewrite);
             }
 
             return $result;
@@ -149,6 +125,75 @@ protected function doFindOneByData(array $data)
         return $this->connection->fetchRow($this->prepareSelect($data));
     }
 
+    /**
+     * Extract most relevant url rewrite from url rewrites list
+     *
+     * @param string $requestPath
+     * @param array $urlRewrites
+     * @return array|null
+     */
+    private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRewrites): ?array
+    {
+        $prioritizedUrlRewrites = [];
+        foreach ($urlRewrites as $urlRewrite) {
+            switch (true) {
+                case $urlRewrite[UrlRewrite::REQUEST_PATH] === $requestPath:
+                    $priority = 1;
+                    break;
+                case $urlRewrite[UrlRewrite::REQUEST_PATH] === urldecode($requestPath):
+                    $priority = 2;
+                    break;
+                case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim($requestPath, '/'):
+                    $priority = 3;
+                    break;
+                case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim(urldecode($requestPath), '/'):
+                    $priority = 4;
+                    break;
+                default:
+                    $priority = 5;
+                    break;
+            }
+            $prioritizedUrlRewrites[$priority] = $urlRewrite;
+        }
+        ksort($prioritizedUrlRewrites);
+
+        return array_shift($prioritizedUrlRewrites);
+    }
+
+    /**
+     * Prepare url rewrite
+     *
+     * If request path matches the DB value or it's redirect - we can return result from DB
+     * Otherwise return 301 redirect to request path from DB results
+     *
+     * @param string $requestPath
+     * @param array $urlRewrite
+     * @return array
+     */
+    private function prepareUrlRewrite(string $requestPath, array $urlRewrite): array
+    {
+        $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
+        $canReturnResultFromDb = (
+            in_array($urlRewrite[UrlRewrite::REQUEST_PATH], [$requestPath, urldecode($requestPath)], true)
+            || in_array((int) $urlRewrite[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true)
+        );
+        if (!$canReturnResultFromDb) {
+            $urlRewrite = [
+                UrlRewrite::ENTITY_TYPE => 'custom',
+                UrlRewrite::ENTITY_ID => '0',
+                UrlRewrite::REQUEST_PATH => $requestPath,
+                UrlRewrite::TARGET_PATH => $urlRewrite[UrlRewrite::REQUEST_PATH],
+                UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
+                UrlRewrite::STORE_ID => $urlRewrite[UrlRewrite::STORE_ID],
+                UrlRewrite::DESCRIPTION => null,
+                UrlRewrite::IS_AUTOGENERATED => '0',
+                UrlRewrite::METADATA => null,
+            ];
+        }
+
+        return $urlRewrite;
+    }
+
     /**
      * Delete old URLs from DB.
      *
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php
new file mode 100644
index 0000000000000..b6055f14e79d2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewrite\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrites.php
+ */
+class UrlFinderInterfaceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var UrlFinderInterface
+     */
+    private $urlFinder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->urlFinder = Bootstrap::getObjectManager()->create(UrlFinderInterface::class);
+    }
+
+    /**
+     * @dataProvider findOneDataProvider
+     * @param string $requestPath
+     * @param string $targetPath
+     * @param int $redirectType
+     */
+    public function testFindOneByData(string $requestPath, string $targetPath, int $redirectType)
+    {
+        $data = [
+            UrlRewrite::REQUEST_PATH => $requestPath,
+        ];
+        $urlRewrite = $this->urlFinder->findOneByData($data);
+        $this->assertEquals($targetPath, $urlRewrite->getTargetPath());
+        $this->assertEquals($redirectType, $urlRewrite->getRedirectType());
+    }
+
+    /**
+     * @return array
+     */
+    public function findOneDataProvider(): array
+    {
+        return [
+            ['string', 'test_page1', 0],
+            ['string/', 'string', 301],
+            ['string_permanent', 'test_page1', 301],
+            ['string_permanent/', 'test_page1', 301],
+            ['string_temporary', 'test_page1', 302],
+            ['string_temporary/', 'test_page1', 302],
+            ['строка', 'test_page1', 0],
+            ['строка/', 'строка', 301],
+            [urlencode('строка'), 'test_page2', 0],
+            [urlencode('строка') . '/', urlencode('строка'), 301],
+            ['другая_строка', 'test_page1', 302],
+            ['другая_строка/', 'test_page1', 302],
+            [urlencode('другая_строка'), 'test_page1', 302],
+            [urlencode('другая_строка') . '/', 'test_page1', 302],
+            ['السلسلة', 'test_page1', 0],
+            [urlencode('السلسلة'), 'test_page1', 0],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php
new file mode 100644
index 0000000000000..9edc6507308ee
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$rewritesData = [
+    [
+        'string', 'test_page1', 0
+    ],
+    [
+        'string_permanent', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::PERMANENT
+    ],
+    [
+        'string_temporary', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::TEMPORARY
+    ],
+    [
+        'строка', 'test_page1', 0
+    ],
+    [
+        urlencode('строка'), 'test_page2', 0
+    ],
+    [
+        'другая_строка', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::TEMPORARY
+    ],
+    [
+        'السلسلة', 'test_page1', 0
+    ],
+];
+
+$rewriteResource = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewrite::class);
+foreach ($rewritesData as $rewriteData) {
+    list ($requestPath, $targetPath, $redirectType) = $rewriteData;
+    $rewrite = $objectManager->create(\Magento\UrlRewrite\Model\UrlRewrite::class);
+    $rewrite->setEntityType('custom')
+        ->setRequestPath($requestPath)
+        ->setTargetPath($targetPath)
+        ->setRedirectType($redirectType);
+    $rewriteResource->save($rewrite);
+}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php
new file mode 100644
index 0000000000000..a98f947d614e0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$urlRewriteCollection = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection::class);
+$collection = $urlRewriteCollection
+    ->addFieldToFilter('target_path', ['test_page1', 'test_page2'])
+    ->load()
+    ->walk('delete');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From f9ecace0ff70df87cf8c08de17ee5cf557f8d339 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Wed, 13 Mar 2019 18:52:02 +0530
Subject: [PATCH 0559/1055] Renamed  variable and keep name length under 20.

---
 .../Guest/SetShippingMethodsOnCartTest.php    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index e76974b5290e5..f6444027d0ca3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -100,10 +100,10 @@ public function testShippingMethodWithSimpleProduct()
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
         self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
 
-        $selectedShippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $selectedShippingMethod);
-        self::assertEquals($carrierCode, $selectedShippingMethod['selected_shipping_method']['carrier_code']);
-        self::assertEquals($methodCode, $selectedShippingMethod['selected_shipping_method']['method_code']);
+        $shippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingMethod);
+        self::assertEquals($carrierCode, $shippingMethod['selected_shipping_method']['carrier_code']);
+        self::assertEquals($methodCode, $shippingMethod['selected_shipping_method']['method_code']);
     }
 
     /**
@@ -264,10 +264,10 @@ public function testSetShippingMethodToGuestCart()
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
         self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
 
-        $selectedShippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $selectedShippingMethod);
-        self::assertEquals($carrierCode, $selectedShippingMethod['selected_shipping_method']['carrier_code']);
-        self::assertEquals($methodCode, $selectedShippingMethod['selected_shipping_method']['method_code']);
+        $shippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingMethod);
+        self::assertEquals($carrierCode, $shippingMethod['selected_shipping_method']['carrier_code']);
+        self::assertEquals($methodCode, $shippingMethod['selected_shipping_method']['method_code']);
     }
 
     /**
@@ -360,10 +360,10 @@ public function testSetShippingMethodToGuestCartAddress()
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
         self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
 
-        $selectedShippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $selectedShippingMethod);
-        self::assertEquals($carrierCode, $selectedShippingMethod['selected_shipping_method']['carrier_code']);
-        self::assertEquals($methodCode, $selectedShippingMethod['selected_shipping_method']['method_code']);
+        $shippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingMethod);
+        self::assertEquals($carrierCode, $shippingMethod['selected_shipping_method']['carrier_code']);
+        self::assertEquals($methodCode, $shippingMethod['selected_shipping_method']['method_code']);
     }
 
     /**

From b151b2fea184b4f8592945f5e7c84ec7b8a9af1c Mon Sep 17 00:00:00 2001
From: Alex Calandra <calandra.aj@gmail.com>
Date: Wed, 13 Mar 2019 08:32:24 -0500
Subject: [PATCH 0560/1055] MQE-1477: Resolve Test Rerun Issues for Disable
 Wysiwyg Suite

- Adding wysiwyg cli back to static block test
---
 app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml | 2 ++
 1 file changed, 2 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..e6ab1c130606b 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"/>
@@ -67,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 b9c43adcb19eb5c63fcb95fe355f46fff356c720 Mon Sep 17 00:00:00 2001
From: Alex Calandra <calandra.aj@gmail.com>
Date: Tue, 12 Mar 2019 15:31:06 -0500
Subject: [PATCH 0561/1055] MQE-1477: Resolve Test Rerun Issues for Disable
 Wysiwyg Suite

- Removing Two tests from disabled wysiwyg suite
- Removing disable wysiwyg from one test
---
 .../Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml     | 1 -
 app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml  | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
index 05b7dfeeb3953..03edc69e6d625 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -16,7 +16,6 @@
             <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/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
index b4bcdaadf9a09..c3c92dc59c288 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -17,10 +17,8 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94229"/>
             <group value="Cms"/>
-            <group value="WYSIWYGDisabled"/>
         </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"/>
@@ -69,7 +67,6 @@
                 <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 8e87253b92941595a508e6d92f62d3c999e1e1f7 Mon Sep 17 00:00:00 2001
From: Alex Calandra <calandra.aj@gmail.com>
Date: Wed, 13 Mar 2019 08:32:24 -0500
Subject: [PATCH 0562/1055] MQE-1477: Resolve Test Rerun Issues for Disable
 Wysiwyg Suite

- Adding wysiwyg cli back to static block test
---
 app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml | 2 ++
 1 file changed, 2 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..e6ab1c130606b 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"/>
@@ -67,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 36a59815ee8fcbb7f78ab1b360afd3f250df4d67 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 13 Mar 2019 17:03:04 +0200
Subject: [PATCH 0563/1055] 428 - Test coverage:
 GetAvailableShippingMethodsTest

---
 .../GetAvailableShippingMethodsTest.php       | 184 ++++++++++++++++++
 .../Quote/GetAvailableShippingMethodsTest.php | 121 ------------
 .../Guest/GetAvailableShippingMethodsTest.php | 162 +++++++++++++++
 .../disable_all_active_shipping_methods.php   |  39 ++++
 ...e_all_active_shipping_methods_rollback.php |  33 ++++
 5 files changed, 418 insertions(+), 121 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
 delete mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetAvailableShippingMethodsTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
new file mode 100644
index 0000000000000..9a8b3a254c435
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.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\Quote\Customer;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+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 get available shipping methods
+ */
+class GetAvailableShippingMethodsTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager              = Bootstrap::getObjectManager();
+        $this->quoteFactory         = $objectManager->get(QuoteFactory::class);
+        $this->quoteResource        = $objectManager->create(QuoteResource::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->quoteIdToMaskedId    = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * Test case: get available shipping methods from current customer quote
+     *
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testGetAvailableShippingMethods()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $response      = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
+        self::assertCount(1, $response['cart']['shipping_addresses']);
+        self::assertArrayHasKey('available_shipping_methods', $response['cart']['shipping_addresses'][0]);
+        self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
+
+        $expectedAddressData = [
+            'amount'         => 10,
+            'base_amount'    => 10,
+            'carrier_code'   => 'flatrate',
+            'carrier_title'  => 'Flat Rate',
+            'error_message'  => '',
+            'method_code'    => 'flatrate',
+            'method_title'   => 'Fixed',
+            'price_incl_tax' => 10,
+            'price_excl_tax' => 10,
+        ];
+        self::assertEquals(
+            $expectedAddressData,
+            $response['cart']['shipping_addresses'][0]['available_shipping_methods'][0]
+        );
+    }
+
+    /**
+     * Test case: get available shipping methods from quote of another customer
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+
+        $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap('customer2@search.example.com'));
+    }
+
+    /**
+     * Test case: get available shipping methods when all shipping methods are disabled
+     *
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/disable_all_active_shipping_methods.php
+     */
+    public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $response      = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
+
+        self::assertEquals(0, count($response['cart']['shipping_addresses'][0]['available_shipping_methods']));
+    }
+
+    /**
+     * Test case: get available shipping methods from non-existent cart
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetAvailableShippingMethodsOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId
+    ): string {
+        return <<<QUERY
+query {
+  cart (cart_id: "{$maskedQuoteId}") {
+    shipping_addresses {
+        available_shipping_methods {
+          amount
+          base_amount
+          carrier_code
+          carrier_title
+          error_message
+          method_code
+          method_title
+          price_excl_tax
+          price_incl_tax
+        }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+
+    /**
+     * @param string $reservedOrderId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetAvailableShippingMethodsTest.php
deleted file mode 100644
index 1a0ccbd198c37..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetAvailableShippingMethodsTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * 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 get available shipping methods
- */
-class GetAvailableShippingMethodsTest extends GraphQlAbstract
-{
-    /**
-     * @var CustomerTokenServiceInterface
-     */
-    private $customerTokenService;
-
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var Quote
-     */
-    private $quote;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    protected function setUp()
-    {
-        $objectManager = Bootstrap::getObjectManager();
-        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->quoteResource = $objectManager->create(QuoteResource::class);
-        $this->quote = $objectManager->create(Quote::class);
-        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     */
-    public function testGetAvailableShippingMethods()
-    {
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $query = <<<QUERY
-query {
-  cart (cart_id: "{$maskedQuoteId}") {
-    shipping_addresses {
-        available_shipping_methods {
-          amount
-          base_amount
-          carrier_code
-          carrier_title
-          error_message
-          method_code
-          method_title
-          price_excl_tax
-          price_incl_tax
-        }
-    }
-  }
-}
-QUERY;
-        $response = $this->graphQlQuery(
-            $query,
-            [],
-            '',
-            $this->getCustomerAuthHeaders('customer@example.com', 'password')
-        );
-        self::assertArrayHasKey('cart', $response);
-        self::assertArrayHasKey('shipping_addresses', $response['cart']);
-        self::assertCount(1, $response['cart']['shipping_addresses']);
-        self::assertArrayHasKey('available_shipping_methods', $response['cart']['shipping_addresses'][0]);
-        self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
-
-        $expectedAddressData = [
-            'amount' => 10,
-            'base_amount' => 10,
-            'carrier_code' => 'flatrate',
-            'carrier_title' => 'Flat Rate',
-            'error_message' => '',
-            'method_code' => 'flatrate',
-            'method_title' => 'Fixed',
-            'price_incl_tax' => 10,
-            'price_excl_tax' => 10,
-        ];
-        self::assertEquals(
-            $expectedAddressData,
-            $response['cart']['shipping_addresses'][0]['available_shipping_methods'][0]
-        );
-    }
-
-    /**
-     * @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/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
new file mode 100644
index 0000000000000..8834fd5bfccc5
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Quote\Model\QuoteFactory;
+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 get available shipping methods
+ */
+class GetAvailableShippingMethodsTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager              = Bootstrap::getObjectManager();
+        $this->quoteFactory         = $objectManager->get(QuoteFactory::class);
+        $this->quoteResource        = $objectManager->create(QuoteResource::class);
+        $this->quoteIdToMaskedId    = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * Test case: get available shipping methods from current customer quote
+     *
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
+    public function testGetAvailableShippingMethodsFromGuestCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
+        $response      = $this->graphQlQuery($this->getQuery($maskedQuoteId));
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
+        self::assertCount(1, $response['cart']['shipping_addresses']);
+        self::assertArrayHasKey('available_shipping_methods', $response['cart']['shipping_addresses'][0]);
+        self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
+
+        $expectedAddressData = [
+            'amount'         => 5,
+            'base_amount'    => 5,
+            'carrier_code'   => 'flatrate',
+            'carrier_title'  => 'Flat Rate',
+            'error_message'  => '',
+            'method_code'    => 'flatrate',
+            'method_title'   => 'Fixed',
+            'price_incl_tax' => 5,
+            'price_excl_tax' => 5,
+        ];
+        self::assertEquals(
+            $expectedAddressData,
+            $response['cart']['shipping_addresses'][0]['available_shipping_methods'][0]
+        );
+    }
+
+    /**
+     * Test case: get available shipping methods from customer's quote
+     *
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+
+        $this->graphQlQuery($this->getQuery($maskedQuoteId));
+    }
+
+    /**
+     * Test case: get available shipping methods when all shipping methods are disabled
+     *
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/disable_all_active_shipping_methods.php
+     */
+    public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
+        $response      = $this->graphQlQuery($this->getQuery($maskedQuoteId));
+
+        self::assertEquals(0, count($response['cart']['shipping_addresses'][0]['available_shipping_methods']));
+    }
+
+    /**
+     * Test case: get available shipping methods from non-existent cart
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetAvailableShippingMethodsOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+
+        $this->graphQlQuery($this->getQuery($maskedQuoteId));
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId
+    ): string {
+        return <<<QUERY
+query {
+  cart (cart_id: "{$maskedQuoteId}") {
+    shipping_addresses {
+        available_shipping_methods {
+          amount
+          base_amount
+          carrier_code
+          carrier_title
+          error_message
+          method_code
+          method_title
+          price_excl_tax
+          price_incl_tax
+        }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $reservedOrderId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods.php
new file mode 100644
index 0000000000000..925a3bd6503aa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager           = Bootstrap::getObjectManager();
+$shippingConfig          = $objectManager->get(Magento\Shipping\Model\Config::class);
+$rollbackConfigKey       = 'test/carriers/disabled_shipment_methods';
+$configData              = [];
+$disabledShipmentMethods = [];
+
+// Get all active Shipping Methods
+foreach ($shippingConfig->getAllCarriers() as $carrierCode => $carrierModel) {
+    if (!$carrierModel->isActive()) {
+        continue;
+    }
+
+    $carrierConfigKey              = sprintf('carriers/%s/active', $carrierCode);
+    $configData[$carrierConfigKey] = 0;
+    $disabledShipmentMethods[]     = $carrierCode;
+}
+
+// Remember all manually disabled Shipping Methods for rollback
+$configData[$rollbackConfigKey] = implode(',', $disabledShipmentMethods);
+
+/** @var Config $defConfig */
+$defConfig = $objectManager->create(Config::class);
+$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+
+foreach ($configData as $key => $value) {
+    $defConfig->setDataByPath($key, $value);
+    $defConfig->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods_rollback.php
new file mode 100644
index 0000000000000..a6d7a30e091b1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods_rollback.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$rollbackConfigKey = 'test/carriers/disabled_shipment_methods';
+
+$configWriter = $objectManager->create(WriterInterface::class);
+$rollbackConfigValue = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
+    ->getStore(\Magento\Store\Model\Store::DEFAULT_STORE_ID)
+    ->getConfig($rollbackConfigKey);
+
+$disabledShipmentMethods = [];
+if (!empty($rollbackConfigValue)) {
+    $disabledShipmentMethods = explode(',', $rollbackConfigValue);
+}
+
+if (count($disabledShipmentMethods)) {
+    foreach ($disabledShipmentMethods as $keyToRemove) {
+        $configWriter->delete(sprintf('carriers/%s/active', $keyToRemove));
+    }
+}
+$configWriter->delete($rollbackConfigKey);
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();

From 4748c2d1a7d504bd6b79e1c1f9c3b2c245ef8580 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 13 Mar 2019 11:11:38 -0500
Subject: [PATCH 0564/1055] GraphQL-427: Test coverage:
 SetShippingAddressOnCartTest

---
 .../GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 9e13476c57c32..ae184b8930c07 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -280,7 +280,7 @@ public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The current user cannot use address with ID "1"
+     * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
      */
     public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
     {

From a32d27b3b5360ba72380da65fac6c7f091f7124f Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 13 Mar 2019 18:15:54 +0200
Subject: [PATCH 0565/1055] Fix static and functional tests.

---
 .../Mftf/Test/AdminSortingByWebsitesTest.xml  | 67 +++++++++----------
 .../Ui/Component/Listing/Columns/Websites.php | 35 ++++++----
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
index c4b08bc55d98a..234a7c69913c9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
@@ -15,71 +15,64 @@
             <description value="Sorting products by websites in Admin"/>
         </annotations>
         <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="productAssignedToCustomWebsite">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="productAssignedToMainWebsite">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!--Create new website -->
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
                 <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
                 <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
+            <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
+            <magentoCLI command="cache:flush" stepKey="flushCacheAfterEnableWebUrlOptions"/>
         </before>
         <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="productAssignedToCustomWebsite" stepKey="deleteProductAssignedToCustomWebsite"/>
+            <deleteData createDataKey="productAssignedToMainWebsite" stepKey="deleteProductAssignedToMainWebsite"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
                 <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
-        <actionGroup ref="EnableWebUrlOptions" stepKey="addStoreCodeToUrls"/>
-        <!--Create a Simple Product -->
+        <!--Assign Custom Website to Simple Product -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
         <waitForPageLoad stepKey="waitForCatalogProductGrid"/>
-        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
-        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
-        <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
-        <fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
-        <fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
-        <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
 
-        <!--Save the product -->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitProductPageSave"/>
-        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeProductSavedMessage"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="assignCustomWebsiteToProduct">
+            <argument name="product" value="$$productAssignedToCustomWebsite$$"/>
+        </actionGroup>
+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeaderShow}}" visible="false" stepKey="expandSection"/>
+        <waitForPageLoad stepKey="waitForPageOpened"/>
+        <uncheckOption selector="{{ProductInWebsitesSection.website(_defaultWebsite.name)}}" stepKey="deselectMainWebsite"/>
+        <checkOption selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectWebsite"/>
 
-        <!-- Add this product to second website -->
-        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/>
-        <click selector="{{ProductInWebsitesSection.website('{{customWebsite.name}}')}}" stepKey="selectSecondWebsite"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForProductPagetoSaveAgain"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForProductPageToSaveAgain"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
 
-        <!--Create a Simple Product 2 -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
-        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
-        <waitForPageLoad stepKey="waitForProductToggleToSelectSimpleProduct"/>
-        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickSimpleProductFromDropDownList"/>
-
-        <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"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton2"/>
-        <waitForPageLoad stepKey="waitForSimpleProductToSave"/>
-        <!-- Verify customer see success message -->
-        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
-
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid2"/>
-        <waitForPageLoad stepKey="waitForCatalogProductGrid2"/>
+        <!--Navigate To Product Grid To Check Website Sorting-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGridToSortByWebsite"/>
+        <waitForPageLoad stepKey="waitForCatalogProductGridLoaded"/>
 
         <!--Sorting works (By Websites) ASC-->
-        <actionGroup ref="resetProductGridToDefaultView" stepKey="setProductGridToDefaultSortingWebsites"/>
         <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
         <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Main Website" stepKey="checkIfProduct1WebsitesAsc"/>
-        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="{{customWebsite.name}}" stepKey="checkIfProduct2WebsitesAsc"/>
 
         <!--Sorting works (By Websites) DESC-->
         <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
         <see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="{{customWebsite.name}}" stepKey="checkIfProduct1WebsitesDesc"/>
-        <see selector="{{AdminProductGridSection.productGridContentsOnRow('2')}}" userInput="Main Website" stepKey="checkIfProduct2WebsitesDesc"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index 5571f6e70fa74..494b77724e5b7 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -1,16 +1,21 @@
-<?php declare(strict_types=1);
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Ui\Component\Listing\Columns;
 
-use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\DB\Helper;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\DB\Helper;
 
 /**
+ * Websites listing column component.
+ *
  * @api
  * @since 100.0.2
  */
@@ -22,9 +27,9 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
     const NAME = 'websites';
 
     /**
-     * Data for concatenated website names value
+     * Data for concatenated website names value.
      */
-    const WEBSITE_NAMES = 'website_names';
+    private $websiteNames = 'website_names';
 
     /**
      * Store manager
@@ -36,7 +41,7 @@ class Websites extends \Magento\Ui\Component\Listing\Columns\Column
     /**
      * @var \Magento\Framework\DB\Helper
      */
-    protected $_resourceHelper;
+    private $resourceHelper;
 
     /**
      * @param ContextInterface $context
@@ -57,11 +62,12 @@ public function __construct(
         parent::__construct($context, $uiComponentFactory, $components, $data);
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $this->storeManager = $storeManager;
-        $this->_resourceHelper = $resourceHelper ?: $objectManager->get(Helper::class);
+        $this->resourceHelper = $resourceHelper ?: $objectManager->get(Helper::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @deprecated 101.0.0
      */
     public function prepareDataSource(array $dataSource)
@@ -86,9 +92,10 @@ public function prepareDataSource(array $dataSource)
 
         return $dataSource;
     }
-    
+
     /**
-     * Prepare component configuration
+     * Prepare component configuration.
+     *
      * @return void
      */
     public function prepare()
@@ -100,7 +107,7 @@ public function prepare()
     }
 
     /**
-     * Apply sorting
+     * Apply sorting.
      *
      * @return void
      */
@@ -131,13 +138,13 @@ protected function applySorting()
                      'left'
                  )
                  ->groupByAttribute('entity_id');
-            $this->_resourceHelper->addGroupConcatColumn(
+            $this->resourceHelper->addGroupConcatColumn(
                 $collection->getSelect(),
-                self::WEBSITE_NAMES,
+                $this->websiteNames,
                 'name'
             );
 
-            $collection->getSelect()->order(self::WEBSITE_NAMES . ' ' . $sorting['direction']);
+            $collection->getSelect()->order($this->websiteNames . ' ' . $sorting['direction']);
         }
     }
 }

From 97a4be98b59c2ce564e057a0fb69f0b21d45a911 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Wed, 13 Mar 2019 11:17:04 -0500
Subject: [PATCH 0566/1055] MC-13613: Product mass update

---
 app/code/Magento/Catalog/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 7efd63fb7a4aa..74e7f40b1f062 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -8,6 +8,7 @@
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
         "magento/module-message-queue": "*",
+        "magento/module-authorization": "*",
         "magento/module-asynchronous-operations": "*",
         "magento/module-backend": "*",
         "magento/module-catalog-inventory": "*",

From e24a4c8538492cf1690e292cabf16a818177e39c Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 13 Mar 2019 11:22:28 -0500
Subject: [PATCH 0567/1055] GraphQL-420: Test coverage:
 GetAvailablePaymentMethodsTest for Guest

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

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index ff2e79b61a3ab..c4dd9af490c99 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -47,11 +47,11 @@ protected function setUp()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      */
-    public function testGetPaymentMethodsFromGuestCart()
+    public function testGetCartWithPaymentMethods()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
-        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
-        $response      = $this->graphQlQuery($query);
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('cart', $response);
 
@@ -73,10 +73,10 @@ public function testGetPaymentMethodsFromGuestCart()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      */
-    public function testGetPaymentMethodsFromAnotherCustomerCart()
+    public function testGetPaymentMethodsFromCustomerCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
@@ -91,8 +91,8 @@ public function testGetPaymentMethodsFromAnotherCustomerCart()
     public function testGetPaymentMethodsIfPaymentsAreNotSet()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
-        $query         = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
-        $response      = $this->graphQlQuery($query);
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
 
         self::assertEquals(0, count($response['cart']['available_payment_methods']));
     }
@@ -104,7 +104,7 @@ public function testGetPaymentMethodsIfPaymentsAreNotSet()
     public function testGetPaymentMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getCartAvailablePaymentMethodsQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
         $this->graphQlQuery($query);
     }
 
@@ -112,9 +112,9 @@ public function testGetPaymentMethodsOfNonExistentCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getCartAvailablePaymentMethodsQuery(
+    private function getQuery(
         string $maskedQuoteId
-    ) : string {
+    ): string {
         return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {

From 1daadb89d2d3ef31160b3309c2dc435d8fcadef2 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 13 Mar 2019 11:34:45 -0500
Subject: [PATCH 0568/1055] GraphQL-408: mutations add<Product
 Type>ProductsToCart dosn't check if the cart is active

---
 .../QuoteGraphQl/Model/Cart/GetCartForUser.php |  4 ++--
 .../GraphQl/Quote/Customer/GetCartTest.php     |  4 ++--
 .../GraphQl/Quote/Guest/GetCartTest.php        | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index ba948e2c4fc75..145e9c01980a5 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -69,9 +69,9 @@ public function execute(string $cartHash, ?int $customerId): Quote
             );
         }
 
-        if (!$cart->getIsActive()) {
+        if (false === (bool)$cart->getIsActive()) {
             throw new GraphQlNoSuchEntityException(
-                __('Current customer does not have an active cart.')
+                __('Current user does not have an active cart.')
             );
         }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index 5912ddf933bc0..4b1509eef354e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -118,7 +118,7 @@ public function testGetNonExistentCart()
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Current customer does not have an active cart.
+     * @expectedExceptionMessage Current user does not have an active cart.
      */
     public function testGetInactiveCart()
     {
@@ -127,7 +127,7 @@ public function testGetInactiveCart()
         $quote->setCustomerId(1);
         $quote->setIsActive(false);
         $this->quoteResource->save($quote);
-        $maskedQuoteId =  $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
 
         $query = $this->getCartQuery($maskedQuoteId);
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index b1d5e475c793e..916d5951b0ff2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -97,6 +97,24 @@ public function testGetNonExistentCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Current user does not have an active cart.
+     */
+    public function testGetInactiveCart()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+        $quote->setIsActive(false);
+        $this->quoteResource->save($quote);
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string

From f14d84dc8045e39de89f47b8015ea31ebc2ba6af Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Wed, 13 Mar 2019 10:48:00 -0500
Subject: [PATCH 0569/1055] MC-15378: Customer visitor model doesn't have all
 data on first get request

---
 app/code/Magento/Customer/Model/Visitor.php       |  4 ----
 .../Magento/Customer/Controller/AccountTest.php   | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 9caa2988c5a94..e334769331e85 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -168,10 +168,6 @@ public function initByRequest($observer)
 
         $this->setLastVisitAt((new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT));
 
-        // prevent saving Visitor for safe methods, e.g. GET request
-        if ($this->requestSafety->isSafeMethod()) {
-            return $this;
-        }
         if (!$this->getId()) {
             $this->setSessionId($this->session->getSessionId());
             $this->save();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index ea7a7710acbc3..10b632c002475 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -751,6 +751,21 @@ public function loginPostRedirectDataProvider()
         ];
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoAppArea frontend
+     */
+    public function testCheckVisitorModel()
+    {
+        /** @var \Magento\Customer\Model\Visitor $visitor */
+        $visitor = $this->_objectManager->get(\Magento\Customer\Model\Visitor::class);
+        $this->login(1);
+        $this->assertNull($visitor->getId());
+        $this->dispatch('customer/account/index');
+        $this->assertNotNull($visitor->getId());
+    }
+
     /**
      * @param string $email
      * @return void

From 10a220200eccec74bdb92a85d1dcea8d4d573031 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 13 Mar 2019 18:51:48 +0200
Subject: [PATCH 0570/1055] 428 - Test coverage:
 GetAvailableShippingMethodsTest Fix for PHP Fatal error:  Uncaught Exception:
 Exception occurred when running the
 "\/home\/travis\/build\/magento\/graphql-ce\/dev\/tests\/integration\/testsuite\/Magento\/Sales\/_files\/guest_quote_with_addresses.php"
 fixture: URL key for specified store already exists. in
 /home/travis/build/magento/graphql-ce/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php:114

---
 .../GetAvailableShippingMethodsTest.php       | 37 ++++++++++---------
 .../Guest/GetAvailableShippingMethodsTest.php | 37 ++++++++++---------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index 9a8b3a254c435..336eaf4a0b3a6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.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\Quote\Customer;
 
@@ -44,11 +44,11 @@ class GetAvailableShippingMethodsTest extends GraphQlAbstract
      */
     protected function setUp()
     {
-        $objectManager              = Bootstrap::getObjectManager();
-        $this->quoteFactory         = $objectManager->get(QuoteFactory::class);
-        $this->quoteResource        = $objectManager->create(QuoteResource::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->quoteIdToMaskedId    = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
     /**
@@ -59,7 +59,7 @@ protected function setUp()
     public function testGetAvailableShippingMethods()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $response      = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
+        $response = $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId), [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('shipping_addresses', $response['cart']);
@@ -68,13 +68,13 @@ public function testGetAvailableShippingMethods()
         self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
 
         $expectedAddressData = [
-            'amount'         => 10,
-            'base_amount'    => 10,
-            'carrier_code'   => 'flatrate',
-            'carrier_title'  => 'Flat Rate',
-            'error_message'  => '',
-            'method_code'    => 'flatrate',
-            'method_title'   => 'Fixed',
+            'amount' => 10,
+            'base_amount' => 10,
+            'carrier_code' => 'flatrate',
+            'carrier_title' => 'Flat Rate',
+            'error_message' => '',
+            'method_code' => 'flatrate',
+            'method_title' => 'Fixed',
             'price_incl_tax' => 10,
             'price_excl_tax' => 10,
         ];
@@ -98,7 +98,7 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
 
-        $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap('customer2@search.example.com'));
+        $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId), [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
@@ -110,7 +110,7 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
     public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $response      = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
+        $response = $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId), [], '', $this->getHeaderMap());
 
         self::assertEquals(0, count($response['cart']['shipping_addresses'][0]['available_shipping_methods']));
     }
@@ -125,7 +125,7 @@ public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
     public function testGetAvailableShippingMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getQuery($maskedQuoteId);
+        $query = $this->getAvailableShippingMethodsQuery($maskedQuoteId);
 
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
@@ -134,9 +134,10 @@ public function testGetAvailableShippingMethodsOfNonExistentCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getQuery(
+    private function getAvailableShippingMethodsQuery(
         string $maskedQuoteId
-    ): string {
+    ): string
+    {
         return <<<QUERY
 query {
   cart (cart_id: "{$maskedQuoteId}") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 8834fd5bfccc5..21ba48ee8a5ec 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.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\Quote\Guest;
 
@@ -38,10 +38,10 @@ class GetAvailableShippingMethodsTest extends GraphQlAbstract
      */
     protected function setUp()
     {
-        $objectManager              = Bootstrap::getObjectManager();
-        $this->quoteFactory         = $objectManager->get(QuoteFactory::class);
-        $this->quoteResource        = $objectManager->create(QuoteResource::class);
-        $this->quoteIdToMaskedId    = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
     /**
@@ -52,7 +52,7 @@ protected function setUp()
     public function testGetAvailableShippingMethodsFromGuestCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
-        $response      = $this->graphQlQuery($this->getQuery($maskedQuoteId));
+        $response = $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId));
 
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('shipping_addresses', $response['cart']);
@@ -61,13 +61,13 @@ public function testGetAvailableShippingMethodsFromGuestCart()
         self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
 
         $expectedAddressData = [
-            'amount'         => 5,
-            'base_amount'    => 5,
-            'carrier_code'   => 'flatrate',
-            'carrier_title'  => 'Flat Rate',
-            'error_message'  => '',
-            'method_code'    => 'flatrate',
-            'method_title'   => 'Fixed',
+            'amount' => 5,
+            'base_amount' => 5,
+            'carrier_code' => 'flatrate',
+            'carrier_title' => 'Flat Rate',
+            'error_message' => '',
+            'method_code' => 'flatrate',
+            'method_title' => 'Fixed',
             'price_incl_tax' => 5,
             'price_excl_tax' => 5,
         ];
@@ -90,7 +90,7 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
 
-        $this->graphQlQuery($this->getQuery($maskedQuoteId));
+        $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId));
     }
 
     /**
@@ -102,7 +102,7 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
     public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
-        $response      = $this->graphQlQuery($this->getQuery($maskedQuoteId));
+        $response = $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId));
 
         self::assertEquals(0, count($response['cart']['shipping_addresses'][0]['available_shipping_methods']));
     }
@@ -117,16 +117,17 @@ public function testGetAvailableShippingMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
 
-        $this->graphQlQuery($this->getQuery($maskedQuoteId));
+        $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId));
     }
 
     /**
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getQuery(
+    private function getAvailableShippingMethodsQuery(
         string $maskedQuoteId
-    ): string {
+    ): string
+    {
         return <<<QUERY
 query {
   cart (cart_id: "{$maskedQuoteId}") {

From f59817b06c491d8f83ff240123bca399004f86cf Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 13 Mar 2019 19:29:17 +0200
Subject: [PATCH 0571/1055] Fix functional tests.

---
 .../Mtf/Client/Element/ConditionsElement.php  | 15 ++++++++++-----
 .../Mtf/Client/Element/SelectstateElement.php | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php

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 6dbf2b1aa6a12..b3e5331af4be6 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
@@ -265,7 +265,7 @@ protected function addSingleCondition($condition, ElementInterface $context)
         $this->addCondition($condition['type'], $context);
         $createdCondition = $context->find($this->created, Locator::SELECTOR_XPATH);
         $this->waitForCondition($createdCondition);
-        $this->fillCondition($condition['rules'], $createdCondition);
+        $this->fillCondition($condition['rules'], $createdCondition, $condition['type']);
     }
 
     /**
@@ -306,13 +306,14 @@ protected function addCondition($type, ElementInterface $context)
      *
      * @param array $rules
      * @param ElementInterface $element
+     * @param string|null $type
      * @return void
      * @throws \Exception
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    protected function fillCondition(array $rules, ElementInterface $element)
+    protected function fillCondition(array $rules, ElementInterface $element, $type = null)
     {
         $this->resetKeyParam();
         foreach ($rules as $rule) {
@@ -333,7 +334,7 @@ protected function fillCondition(array $rules, ElementInterface $element)
 
                     if ($this->fillGrid($rule, $param)) {
                         $isSet = true;
-                    } elseif ($this->fillSelect($rule, $param)) {
+                    } elseif ($this->fillSelect($rule, $param, $type)) {
                         $isSet = true;
                     } elseif ($this->fillText($rule, $param)) {
                         $isSet = true;
@@ -390,11 +391,15 @@ protected function fillGrid($rule, ElementInterface $param)
      *
      * @param string $rule
      * @param ElementInterface $param
+     * @param string|null $type
      * @return bool
      */
-    protected function fillSelect($rule, ElementInterface $param)
+    protected function fillSelect($rule, ElementInterface $param, $type = null)
     {
-        $value = $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
+        //Avoid confusion between regions like: "Baja California" and "California".
+        $value = $type === 'Shipping State/Province'
+            ? $param->find('select', Locator::SELECTOR_TAG_NAME, 'selectstate')
+            : $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
         if ($value->isVisible()) {
             $value->setValue($rule);
             $this->click();
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php
new file mode 100644
index 0000000000000..a21353f46c1ca
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstateElement.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Mtf\Client\Element;
+
+/**
+ * @inheritdoc
+ */
+class SelectstateElement extends SelectElement
+{
+    /**
+     * @inheritdoc
+     */
+    protected $optionByValue = './/option[normalize-space(.)=%s]';
+}

From cb9d6757f4cdf89cc5c1e970663b8eeb30606e40 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Wed, 13 Mar 2019 12:55:52 -0500
Subject: [PATCH 0572/1055] MAGETWO-98665: [Magento cloud] Media directories
 not sorted

---
 app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php         | 3 ++-
 .../Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php        | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index b2ef78bab9909..ca563bd9d8f61 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -270,7 +270,8 @@ public function getDirsCollection($path)
         $collection = $this->getCollection($path)
             ->setCollectDirs(true)
             ->setCollectFiles(false)
-            ->setCollectRecursively(false);
+            ->setCollectRecursively(false)
+            ->setOrder('basename', \Magento\Framework\Data\Collection\Filesystem::SORT_ORDER_ASC);
 
         $conditions = $this->getConditionsForExcludeDirs();
 
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index 309f08a54aab6..7bec1e3601461 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -417,6 +417,10 @@ protected function generalTestGetDirsCollection($path, $collectionArray = [], $e
             ->method('setCollectRecursively')
             ->with(false)
             ->willReturnSelf();
+        $storageCollectionMock->expects($this->once())
+            ->method('setOrder')
+            ->with('basename', \Magento\Framework\Data\Collection\Filesystem::SORT_ORDER_ASC)
+            ->willReturnSelf();
         $storageCollectionMock->expects($this->once())
             ->method('getIterator')
             ->willReturn(new \ArrayIterator($collectionArray));

From 4461e5466993e51ef1e1812ab02e9fd411b04d4a Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Wed, 13 Mar 2019 13:21:45 -0500
Subject: [PATCH 0573/1055] MC-15378: Customer visitor model doesn't have all
 data on first get request

---
 app/code/Magento/Customer/Model/Visitor.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index e334769331e85..4f129f05aa82c 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -14,6 +14,7 @@
  *
  * @package Magento\Customer\Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Visitor extends \Magento\Framework\Model\AbstractModel
 {

From 58831beb8e004aae117473a7812ce6f7f992d123 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 13 Mar 2019 13:31:19 -0500
Subject: [PATCH 0574/1055] GraphQL-424: Test coverage: Set OfflineShipping
 methods on Cart

---
 .../SetOfflineShippingMethodsOnCartTest.php   | 163 +++++++-----------
 .../enable_offline_shipping_methods.php}      |   8 +-
 ...ble_offline_shipping_methods_rollback.php} |   4 -
 3 files changed, 69 insertions(+), 106 deletions(-)
 rename dev/tests/integration/testsuite/Magento/{Checkout/_files/enable_all_shipping_methods.php => OfflineShipping/_files/enable_offline_shipping_methods.php} (68%)
 rename dev/tests/integration/testsuite/Magento/{Checkout/_files/enable_all_shipping_methods_rollback.php => OfflineShipping/_files/enable_offline_shipping_methods_rollback.php} (75%)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
index b053820c8a7a7..b469e93c412f0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
@@ -53,22 +53,52 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
      * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     * @dataProvider offlineShippingMethodDataProvider()
-     * @param string $carrier
-     * @param string $method
+     *
+     * @param string $carrierCode
+     * @param string $methodCode
      * @param float $amount
      * @param string $label
+     * @dataProvider offlineShippingMethodDataProvider
      */
-    public function testSetOfflineShippingMethod(string $carrier, string $method, float $amount, string $label)
+    public function testSetOfflineShippingMethod(string $carrierCode, string $methodCode, float $amount, string $label)
     {
-        $this->setShippingMethodAndCheckResponse(
-            $carrier,
-            $method,
-            $amount,
-            $label
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $shippingAddressId = (int)$quote->getShippingAddress()->getId();
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $shippingAddressId,
+            $carrierCode,
+            $methodCode
         );
+
+        $response = $this->sendRequestWithToken($query);
+
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['carrier_code'], $carrierCode);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['method_code'], $methodCode);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['amount'], $amount);
+        self::assertEquals($addressesInformation[0]['selected_shipping_method']['label'], $label);
+    }
+
+    /**
+     * @return array
+     */
+    public function offlineShippingMethodDataProvider()
+    {
+        return [
+            'flatrate_flatrate' => ['flatrate', 'flatrate', 10, 'Flat Rate - Fixed'],
+            'tablerate_bestway' => ['tablerate', 'bestway', 10, 'Best Way - Table Rate'],
+            'freeshipping_freeshipping' => ['freeshipping', 'freeshipping', 0, 'Free Shipping - Free'],
+        ];
     }
 
     /**
@@ -89,23 +119,21 @@ public function testSetShippingMethodTwiceInOneRequest()
 
         $query = <<<QUERY
 mutation {
-  setShippingMethodsOnCart(input: 
-    {
-      cart_id: "$maskedQuoteId", 
-      shipping_methods: [
+  setShippingMethodsOnCart(input: {
+    cart_id: "$maskedQuoteId"
+    shipping_methods: [
       {
         cart_address_id: $shippingAddressId
-        method_code: "flatrate"
         carrier_code: "flatrate"
+        method_code: "flatrate"
       }
       {
         cart_address_id: $shippingAddressId
-        method_code: "freeshipping"
         carrier_code: "freeshipping"
+        method_code: "freeshipping"
       }
-      ]
-      }) {
-    
+    ]
+  }) {
     cart {
       shipping_addresses {
         selected_shipping_method {
@@ -115,98 +143,41 @@ public function testSetShippingMethodTwiceInOneRequest()
           amount
         }
       }
-    }
+    } 
   }
 }
 QUERY;
-
         self::expectExceptionMessage('You cannot specify multiple shipping methods.');
         $this->sendRequestWithToken($query);
     }
 
-    /**
-     * Data provider for base offline shipping methods
-     *
-     * @return array
-     */
-    public function offlineShippingMethodDataProvider()
-    {
-        return [
-            ['flatrate', 'flatrate', 10, 'Flat Rate - Fixed'],
-            ['tablerate', 'bestway', 10, 'Best Way - Table Rate'],
-            ['freeshipping', 'freeshipping', 0, 'Free Shipping - Free']
-        ];
-    }
-
-    /**
-     * Send request for setting the requested shipping method and check the output
-     *
-     * @param string $shippingCarrierCode
-     * @param string $shippingMethodCode
-     * @param float $shippingAmount
-     * @param string $shippingLabel
-     * @throws \Magento\Framework\Exception\AuthenticationException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function setShippingMethodAndCheckResponse(
-        string $shippingCarrierCode,
-        string $shippingMethodCode,
-        float $shippingAmount,
-        string $shippingLabel
-    ) {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        $shippingAddress = $quote->getShippingAddress();
-        $shippingAddressId = $shippingAddress->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $shippingMethodCode,
-            $shippingCarrierCode,
-            $shippingAddressId
-        );
-
-        $response = $this->sendRequestWithToken($query);
-
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        self::assertEquals($addressesInformation[0]['selected_shipping_method']['carrier_code'], $shippingCarrierCode);
-        self::assertEquals($addressesInformation[0]['selected_shipping_method']['method_code'], $shippingMethodCode);
-        self::assertEquals($addressesInformation[0]['selected_shipping_method']['amount'], $shippingAmount);
-        self::assertEquals($addressesInformation[0]['selected_shipping_method']['label'], $shippingLabel);
-    }
-
     /**
      * Generates query for setting the specified shipping method on cart
      *
+     * @param int $shippingAddressId
      * @param string $maskedQuoteId
-     * @param string $shippingMethodCode
-     * @param string $shippingCarrierCode
-     * @param string $shippingAddressId
+     * @param string $carrierCode
+     * @param string $methodCode
      * @return string
      */
     private function getQuery(
         string $maskedQuoteId,
-        string $shippingMethodCode,
-        string $shippingCarrierCode,
-        string $shippingAddressId
-    ) : string {
+        int $shippingAddressId,
+        string $carrierCode,
+        string $methodCode
+    ): string {
         return <<<QUERY
 mutation {
-  setShippingMethodsOnCart(input: 
-    {
-      cart_id: "$maskedQuoteId", 
-      shipping_methods: [{
+  setShippingMethodsOnCart(input: {
+    cart_id: "$maskedQuoteId"
+    shipping_methods: [
+      {
         cart_address_id: $shippingAddressId
-        method_code: "$shippingMethodCode"
-        carrier_code: "$shippingCarrierCode"
-      }]
-      }) {
-    
+        carrier_code: "$carrierCode"
+        method_code: "$methodCode"
+      }
+    ]
+  }) {
     cart {
       shipping_addresses {
         selected_shipping_method {
@@ -216,9 +187,9 @@ private function getQuery(
           amount
         }
       }
-    }
+    } 
   }
-}
+}        
 QUERY;
     }
 
@@ -236,4 +207,4 @@ private function sendRequestWithToken(string $query): array
 
         return $this->graphQlQuery($query, [], '', $headerMap);
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
similarity index 68%
rename from dev/tests/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods.php
rename to dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
index dd48975aa2b09..08694bf8c7d0b 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods.php
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
@@ -11,16 +11,12 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var Writer  $configWriter */
-$configWriter = $objectManager->create(WriterInterface::class);
+/** @var Writer $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
 
 $configWriter->save('carriers/flatrate/active', 1);
 $configWriter->save('carriers/tablerate/active', 1);
 $configWriter->save('carriers/freeshipping/active', 1);
-$configWriter->save('carriers/ups/active', 1);
-$configWriter->save('carriers/usps/active', 1);
-$configWriter->save('carriers/fedex/active', 1);
-$configWriter->save('carriers/dhl/active', 1);
 
 $scopeConfig = $objectManager->get(ScopeConfigInterface::class);
 $scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods_rollback.php
similarity index 75%
rename from dev/tests/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods_rollback.php
rename to dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods_rollback.php
index 7a3ca79febf6d..31a16f42adfce 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/enable_all_shipping_methods_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods_rollback.php
@@ -16,7 +16,3 @@
 $configWriter->delete('carriers/flatrate/active');
 $configWriter->delete('carriers/tablerate/active');
 $configWriter->delete('carriers/freeshipping/active');
-$configWriter->delete('carriers/ups/active');
-$configWriter->delete('carriers/usps/active');
-$configWriter->delete('carriers/fedex/active');
-$configWriter->delete('carriers/dhl/active');

From 7352a465ee259b6caa2e1f54870374e8a049c53a Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Wed, 13 Mar 2019 13:34:56 -0500
Subject: [PATCH 0575/1055] MC-13613: Product mass update

---
 .../Adminhtml/Product/Action/Attribute/Save.php     | 11 +----------
 app/code/Magento/Config/Model/Config.php            | 13 ++++++++++++-
 app/code/Magento/Store/Model/Group.php              | 12 +++++++++++-
 app/code/Magento/Store/Model/Store.php              | 12 +++++++++++-
 app/code/Magento/Store/Model/Website.php            | 13 +++++++++++--
 .../Test/TestCase/ExportAdvancedPricingTest.xml     |  1 -
 .../Test/TestCase/ExportProductsTest.xml            |  1 -
 .../Test/TestCase/ExportProductsTest.xml            |  1 -
 8 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index f63e5a681c42b..63182dd5624e6 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -42,11 +42,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      */
     private $userContext;
 
-    /**
-     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
-     */
-    private $pillPut;
-
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
@@ -55,7 +50,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * @param \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService
      * @param \Magento\Framework\Serialize\SerializerInterface $serializer
      * @param \Magento\Authorization\Model\UserContextInterface $userContext
-     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut
      */
     public function __construct(
         Action\Context $context,
@@ -64,8 +58,7 @@ public function __construct(
         \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory,
         \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService,
         \Magento\Framework\Serialize\SerializerInterface $serializer,
-        \Magento\Authorization\Model\UserContextInterface $userContext,
-        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut
+        \Magento\Authorization\Model\UserContextInterface $userContext
     ) {
         parent::__construct($context, $attributeHelper);
         $this->bulkManagement = $bulkManagement;
@@ -73,7 +66,6 @@ public function __construct(
         $this->identityService = $identityService;
         $this->serializer = $serializer;
         $this->userContext = $userContext;
-        $this->pillPut = $pillPut;
     }
 
     /**
@@ -214,7 +206,6 @@ private function publish(
         }
 
         if (!empty($operations)) {
-            $this->pillPut->put();
             $result = $this->bulkManagement->scheduleBulk(
                 $bulkUuid,
                 $operations,
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 6bf191c20a844..bd38d1451e1b6 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -114,6 +114,11 @@ class Config extends \Magento\Framework\DataObject
      */
     private $scopeTypeNormalizer;
 
+    /**
+     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -126,6 +131,7 @@ class Config extends \Magento\Framework\DataObject
      * @param array $data
      * @param ScopeResolverPool|null $scopeResolverPool
      * @param ScopeTypeNormalizer|null $scopeTypeNormalizer
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface|null $pillPut
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -139,7 +145,8 @@ public function __construct(
         SettingChecker $settingChecker = null,
         array $data = [],
         ScopeResolverPool $scopeResolverPool = null,
-        ScopeTypeNormalizer $scopeTypeNormalizer = null
+        ScopeTypeNormalizer $scopeTypeNormalizer = null,
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut = null
     ) {
         parent::__construct($data);
         $this->_eventManager = $eventManager;
@@ -155,6 +162,8 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
         $this->scopeTypeNormalizer = $scopeTypeNormalizer
             ?? ObjectManager::getInstance()->get(ScopeTypeNormalizer::class);
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\MessageQueue\Api\PoisonPillPutInterface::class);
     }
 
     /**
@@ -224,6 +233,8 @@ public function save()
             throw $e;
         }
 
+        $this->pillPut->put();
+
         return $this;
     }
 
diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index ccc3c65491422..c2b3ce0498803 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -100,6 +100,11 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      */
     private $eventManager;
 
+    /**
+     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -112,6 +117,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface|null $pillPut
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -125,13 +131,16 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        \Magento\Framework\Event\ManagerInterface $eventManager = null
+        \Magento\Framework\Event\ManagerInterface $eventManager = null,
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut = null
     ) {
         $this->_configDataResource = $configDataResource;
         $this->_storeListFactory = $storeListFactory;
         $this->_storeManager = $storeManager;
         $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Event\ManagerInterface::class);
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\MessageQueue\Api\PoisonPillPutInterface::class);
         parent::__construct(
             $context,
             $registry,
@@ -445,6 +454,7 @@ public function afterSave()
             $this->_storeManager->reinitStores();
             $this->eventManager->dispatch($this->_eventPrefix . '_save', ['group' => $group]);
         });
+        $this->pillPut->put();
         return parent::afterSave();
     }
 
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index c1ad5bdcfc068..b2a515b198b11 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -326,6 +326,11 @@ class Store extends AbstractExtensibleModel implements
      */
     private $eventManager;
 
+    /**
+     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -352,6 +357,7 @@ class Store extends AbstractExtensibleModel implements
      * @param bool $isCustomEntryPoint
      * @param array $data optional generic object data
      * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface|null $pillPut
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -380,7 +386,8 @@ public function __construct(
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         $isCustomEntryPoint = false,
         array $data = [],
-        \Magento\Framework\Event\ManagerInterface $eventManager = null
+        \Magento\Framework\Event\ManagerInterface $eventManager = null,
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut = null
     ) {
         $this->_coreFileStorageDatabase = $coreFileStorageDatabase;
         $this->_config = $config;
@@ -401,6 +408,8 @@ public function __construct(
         $this->websiteRepository = $websiteRepository;
         $this->eventManager = $eventManager ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Event\ManagerInterface::class);
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\MessageQueue\Api\PoisonPillPutInterface::class);
         parent::__construct(
             $context,
             $registry,
@@ -1077,6 +1086,7 @@ public function afterSave()
         $this->getResource()->addCommitCallback(function () use ($event, $store) {
             $this->eventManager->dispatch($event, ['store' => $store]);
         });
+        $this->pillPut->put();
         return parent::afterSave();
     }
 
diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
index c9a7d0013fe06..53fc5fd7c9275 100644
--- a/app/code/Magento/Store/Model/Website.php
+++ b/app/code/Magento/Store/Model/Website.php
@@ -159,6 +159,11 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      */
     protected $_currencyFactory;
 
+    /**
+     * @var \Magento\MessageQueue\Api\PoisonPillPutInterface
+     */
+    private $pillPut;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -174,6 +179,7 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\MessageQueue\Api\PoisonPillPutInterface|null $pillPut
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -190,7 +196,8 @@ public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\MessageQueue\Api\PoisonPillPutInterface $pillPut = null
     ) {
         parent::__construct(
             $context,
@@ -208,6 +215,8 @@ public function __construct(
         $this->_websiteFactory = $websiteFactory;
         $this->_storeManager = $storeManager;
         $this->_currencyFactory = $currencyFactory;
+        $this->pillPut = $pillPut ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\MessageQueue\Api\PoisonPillPutInterface::class);
     }
 
     /**
@@ -581,7 +590,7 @@ public function afterSave()
         if ($this->isObjectNew()) {
             $this->_storeManager->reinitStores();
         }
-
+        $this->pillPut->put();
         return parent::afterSave();
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml
index d069499da4aab..07646c2aceda8 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml
@@ -50,7 +50,6 @@
             <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertExportAdvancedPricing"/>
         </variation>
         <variation name="ExportAdvancedPricingTestVariation4" summary="Trying export product data for product available on main website with default currency and custom website with different currency" ticketId="MAGETWO-46153">
-            <data name="issue" xsi:type="string">MC-13864 Consumer always read config from memory</data>
             <data name="configData" xsi:type="string">price_scope_website</data>
             <data name="exportData" xsi:type="string">csv_with_advanced_pricing</data>
             <data name="products/0" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
index b94f21371496a..40f535cd225a2 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.xml
@@ -58,7 +58,6 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation5" summary="Export simple product assigned to Main Website and configurable product assigned to Custom Website" ticketId="MAGETWO-46114">
-            <data name="issue" xsi:type="string">>MC-13864 Consumer always read config from memory</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/0" xsi:type="array">
                 <item name="fixture" xsi:type="string">catalogProductSimple</item>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
index 93240586ec92c..4ab45eac88046 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableImportExport/Test/TestCase/ExportProductsTest.xml
@@ -45,7 +45,6 @@
             </data>
         </variation>
         <variation name="ExportProductsTestVariation9" summary="Export simple product assigned to Main Website and configurable product assigned to Custom Website" ticketId="MAGETWO-46114">
-            <data name="issue" xsi:type="string">>MC-13864 Consumer always read config from memory</data>
             <data name="exportData" xsi:type="string">default</data>
             <data name="products/1" xsi:type="array">
                 <item name="fixture" xsi:type="string">configurableProduct</item>

From 30128ecfb7c45f07ab81184ab4746d480afdf36c Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 13 Mar 2019 14:01:29 -0500
Subject: [PATCH 0576/1055] GraphQL-424: Test coverage: Set OfflineShipping
 methods on Cart

---
 .../OfflineShipping/SetOfflineShippingMethodsOnCartTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
index b469e93c412f0..7ebaba105a81a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
@@ -17,7 +17,7 @@
 /**
  * Test for setting offline shipping methods on cart
  */
-class SetOfflineShippingOnCartTest extends GraphQlAbstract
+class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
 {
     /**
      * @var QuoteFactory

From 8bf1909c9d9f7fbc7e155ada38bf453cdb2306ce Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 13 Mar 2019 14:11:32 -0500
Subject: [PATCH 0577/1055] GraphQL-424: Test coverage: Set OfflineShipping
 methods on Cart

---
 .../OfflineShipping/SetOfflineShippingMethodsOnCartTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
index 7ebaba105a81a..80acbbdb64230 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
@@ -103,7 +103,7 @@ public function offlineShippingMethodDataProvider()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
      */
     public function testSetShippingMethodTwiceInOneRequest()
     {

From fde5cebadcf2dd62c74077b2805a716eabf2df34 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Wed, 13 Mar 2019 15:09:31 -0500
Subject: [PATCH 0578/1055] MC-13613: Product mass update

---
 app/code/Magento/Config/composer.json | 1 +
 app/code/Magento/Store/composer.json  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index 57c067d2cae27..3312fb630ccda 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -7,6 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/module-message-queue": "*",
         "magento/module-backend": "*",
         "magento/module-cron": "*",
         "magento/module-deploy": "*",
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index ebaa32b95f48b..da408f105ccb6 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -7,6 +7,7 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
+        "magento/module-message-queue": "*",
         "magento/module-catalog": "*",
         "magento/module-config": "*",
         "magento/module-directory": "*",

From 4b014b2a9f6dd65ad1b8cd789102a00ec4f31b81 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Wed, 13 Mar 2019 15:34:28 -0500
Subject: [PATCH 0579/1055] MC-4867: Convert
 MoveStoreToOtherGroupSameWebsiteTest to MFTF

---
 .../Test/Mftf/Section/AdminConfigSection.xml  |   4 +-
 .../AssertStoreViewFormActionGroup.xml        |  25 +++++
 .../AssertStoreViewInGridActionGroup.xml      |  23 ++++
 .../ChangeStoreInStoreViewActionGroup.xml     |  23 ++++
 ...inMoveStoreToOtherGroupSameWebsiteTest.xml | 100 ++++++++++++++++++
 5 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/ChangeStoreInStoreViewActionGroup.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml

diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
index 8a56c2777084e..9ab1e4a10d7df 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
@@ -11,5 +11,7 @@
         <element name="generalTab" type="text" selector="//div[@class='admin__page-nav-title title _collapsible']//strong[text()='General']"/>
         <element name="generalTabClosed" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='false' or @aria-expanded='0']//strong[text()='General']"/>
         <element name="generalTabOpened" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='true' or @aria-expanded='1']//strong[text()='General']"/>
+        <element name="defaultConfigButton" type="button" selector="#store-change-button" timeout="30"/>
+        <element name="defaultConfigDropdown" type="textarea" selector="//ul[@class='dropdown-menu']"/>
     </section>
-</sections>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml
new file mode 100644
index 0000000000000..92ebbc3950131
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewFormActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStoreViewFormActionGroup">
+        <arguments>
+            <argument name="storeDropdown" type="string"/>
+            <argument name="storeViewName" type="string"/>
+            <argument name="storeViewCode" type="string"/>
+            <argument name="status" type="string"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
+        <seeInField selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{storeDropdown}}" stepKey="seeAssertStore"/>
+        <seeInField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewName"/>
+        <seeInField selector="{{AdminNewStoreSection.storeCodeTextField}}" userInput="{{storeViewCode}}" stepKey="seeAssertStoreViewCode"/>
+        <seeInField selector="{{AdminNewStoreSection.statusDropdown}}" userInput="{{status}}" stepKey="seeAssertStatus"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
new file mode 100644
index 0000000000000..b4f290227cd4e
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStoreViewInGridActionGroup">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStorePageLoad"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewInGridMessage"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/ChangeStoreInStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/ChangeStoreInStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..15784235d5918
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/ChangeStoreInStoreViewActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ChangeStoreInStoreViewActionGroup">
+        <arguments>
+            <argument name="storeDropdown" type="string"/>
+        </arguments>
+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
+        <selectOption selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{storeDropdown}}" stepKey="selectStoreGrpDropdown"/>
+        <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveButton"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal"/>
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml
new file mode 100644
index 0000000000000..61fb58991a81b
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMoveStoreToOtherGroupSameWebsiteTest">
+        <annotations>
+            <stories value="Move Store"/>
+            <title value="Move Store To Other Group Same Website and Verify Backend and Frontend"/>
+            <description value="Test log in to Stores and Move Store To Other Group Same Website Test"/>
+            <testCaseId value="MC-14294"/>
+            <severity value="CRITICAL"/>
+            <group value="store"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Create first store -->
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createFirstStore">
+                <argument name="website" value="{{_defaultWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStore.name}}"/>
+                <argument name="storeGroupCode" value="{{customStore.code}}"/>
+            </actionGroup>
+            <!-- Create first store view -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstStoreView">
+                <argument name="StoreGroup" value="customStore"/>
+                <argument name="customStore" value="storeViewData1"/>
+            </actionGroup>
+            <!-- Create second store -->
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStore">
+                <argument name="website" value="{{_defaultWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <!-- Create second store view -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="storeViewData2"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteFirstStore">
+                <argument name="storeGroupName" value="customStore.name"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteSecondStore">
+                <argument name="storeGroupName" value="customStoreGroup.name"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Search created second store view in grid-->
+        <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchCreatedStoreViewInGrid">
+            <argument name="storeViewName" value="{{storeViewData2.name}}"/>
+        </actionGroup>
+        <!--Move created store view to other store keeping website same-->
+        <actionGroup ref="ChangeStoreInStoreViewActionGroup" stepKey="moveStoreView">
+            <argument name="storeDropdown" value="{{customStore.name}}"/>
+        </actionGroup>
+        <!--Save the above store view and verify AssertStoreViewSuccessSaveMessage-->
+        <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage">
+        </actionGroup>
+
+        <!--Search moved store view(from above step) in grid and verify AssertStoreInGrid-->
+        <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchMovedStoreViewInGrid">
+            <argument name="storeViewName" value="{{storeViewData2.name}}"/>
+        </actionGroup>
+
+        <!--Go to store view form page and verify AssertStoreForm-->
+        <actionGroup ref="AssertStoreViewFormActionGroup" stepKey="verifyStoreViewForm">
+            <argument name="storeDropdown" value="{{customStore.name}}"/>
+            <argument name="storeViewName" value="{{storeViewData2.name}}"/>
+            <argument name="storeViewCode" value="{{storeViewData2.code}}"/>
+            <argument name="status" value="Enabled"/>
+        </actionGroup>
+
+        <!--Go to store configuration page and verify AssertStoreBackend-->
+        <amOnPage url="{{AdminConfigPage.url}}" stepKey="goToConfigStoreConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForSystemStoreConfigurationPageLoad"/>
+        <click selector="{{AdminConfigSection.defaultConfigButton}}" stepKey="clickDefaultConfigButton"/>
+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{_defaultWebsite.name}}" stepKey="seeAssertWebsiteInDefaultConfigDropdown"/>
+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{customStore.name}}" stepKey="seeAssertSecondStoreInDefaultConfigDropdown"/>
+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeViewData1.name}}" stepKey="seeAssertFirstStoreViewInDefaultConfigDropdown"/>
+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeViewData2.name}}" stepKey="seeAssertSecondStoreViewInDefaultConfigDropdown"/>
+
+        <!--Go to storefront and verify AssertStoreFrontend-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="clickSwitchStoreButton"/>
+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}"  stepKey="clickStoreLinkCustomStore"/>
+        <waitForPageLoad stepKey="waitForCustomStoreToLoad"/>
+        <see selector="{{StorefrontHeaderSection.storeViewName}}" userInput="{{storeViewData1.name}}" stepKey="seeAssertFirstStoreViewOnStorefront"/>
+        <click selector="{{StorefrontHeaderSection.storeViewName}}" stepKey="clickStoreViewName"/>
+        <see selector="{{StorefrontHeaderSection.storeViewDropdown}}" userInput="{{storeViewData2.name}}" stepKey="seeAssertSecondStoreViewOnStorefront"/>
+    </test>
+</tests>
\ No newline at end of file

From f2eb1912381eb0b14539391154345a28edde94af Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Wed, 13 Mar 2019 15:41:09 -0500
Subject: [PATCH 0580/1055] MC-13613: Product mass update

---
 .../Test/TestCase/ExportAdvancedPricingTest.php  | 16 +++++++++++++++-
 .../Test/TestCase/ExportProductsTest.php         |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php
index 3020e69c06399..fefe0d2c126e5 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.php
@@ -65,6 +65,13 @@ class ExportAdvancedPricingTest extends Injectable
      */
     private $catalogProductIndex;
 
+    /**
+     * Cron command
+     *
+     * @var Cron
+     */
+    private $cron;
+
     /**
      * Run cron before tests running
      *
@@ -85,18 +92,21 @@ public function __prepare(
      * @param FixtureFactory $fixtureFactory
      * @param AdminExportIndex $adminExportIndex
      * @param CatalogProductIndex $catalogProductIndexPage
+     * @param Cron $cron
      * @return void
      */
     public function __inject(
         TestStepFactory $stepFactory,
         FixtureFactory $fixtureFactory,
         AdminExportIndex $adminExportIndex,
-        CatalogProductIndex $catalogProductIndexPage
+        CatalogProductIndex $catalogProductIndexPage,
+        Cron $cron
     ) {
         $this->stepFactory = $stepFactory;
         $this->fixtureFactory = $fixtureFactory;
         $this->adminExportIndex = $adminExportIndex;
         $this->catalogProductIndex = $catalogProductIndexPage;
+        $this->cron = $cron;
     }
 
     /**
@@ -130,8 +140,12 @@ public function test(
         if ($website) {
             $website->persist();
             $this->setupCurrencyForCustomWebsite($website, $currencyCustomWebsite);
+            $this->cron->run();
+            $this->cron->run();
         }
         $products = $this->prepareProducts($products, $website);
+        $this->cron->run();
+        $this->cron->run();
         $this->adminExportIndex->open();
         $this->adminExportIndex->getExportedGrid()->deleteAllExportedFiles();
         $exportData = $this->fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php
index e55558482c1f3..b5cd056fb99ad 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/TestCase/ExportProductsTest.php
@@ -104,6 +104,8 @@ public function test(
         $exportData->persist();
         $this->adminExportIndex->getExportForm()->fill($exportData);
         $this->adminExportIndex->getFilterExport()->clickContinue();
+        $this->cron->run();
+        $this->cron->run();
         $this->assertExportProduct->processAssert($export, $exportedFields, $products);
     }
 

From b1fd8a4d05cf9e949778e71f3f14076b3a9909c2 Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Wed, 13 Mar 2019 16:26:39 -0500
Subject: [PATCH 0581/1055] MC-15390: Integration tests failing on
 2.3.1-release with extensions

---
 .../Product/FixedBundlePriceCalculatorWithDimensionTest.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
index b97bd9f822666..e9cb2f2d6c9d4 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
@@ -13,7 +13,6 @@
  * @magentoDbIsolation disabled
  * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
  * @group indexer_dimension
- * @magentoAppArea frontend
  */
 class FixedBundlePriceCalculatorWithDimensionTest extends BundlePriceAbstract
 {

From 72574016f8ca169c45a5e3beda7456201699d5f8 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 13 Mar 2019 18:18:43 -0500
Subject: [PATCH 0582/1055] GraphQL-432: Test coverage: 'reversed quote id to
 masked cart id'

---
 .../GetAvailablePaymentMethodsTest.php        | 42 ++++-------------
 .../GraphQl/Quote/Customer/GetCartTest.php    | 27 +++++------
 .../Customer/SetBillingAddressOnCartTest.php  | 20 ++++-----
 .../Customer/SetPaymentMethodOnCartTest.php   | 40 +++++++----------
 .../Customer/SetShippingAddressOnCartTest.php |  6 +--
 .../Customer/SetShippingMethodsOnCartTest.php | 26 ++++++-----
 .../GetMaskedQuoteIdByReservedOrderId.php     | 13 +++---
 .../Guest/GetAvailablePaymentMethodsTest.php  | 44 +++++-------------
 .../GraphQl/Quote/Guest/GetCartTest.php       | 18 ++++----
 .../Guest/SetBillingAddressOnCartTest.php     | 16 +++----
 .../Guest/SetPaymentMethodOnCartTest.php      | 34 +++++++-------
 .../Guest/SetShippingAddressOnCartTest.php    | 45 ++++++++++---------
 .../Guest/SetShippingMethodsOnCartTest.php    | 20 ++++++---
 13 files changed, 154 insertions(+), 197 deletions(-)
 rename app/code/Magento/QuoteGraphQl/Model/GetMaskedQuoteIdByReversedQuoteId.php => dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php (81%)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index a7287ada093b8..74921348f449e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -7,10 +7,8 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -25,19 +23,9 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @inheritdoc
@@ -45,9 +33,7 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
@@ -56,7 +42,7 @@ protected function setUp()
      */
     public function testGetCartWithPaymentMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
         $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
@@ -76,7 +62,7 @@ public function testGetCartWithPaymentMethods()
      */
     public function testGetPaymentMethodsFromGuestCart()
     {
-        $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId(
+        $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute(
             'test_order_with_virtual_product_without_address'
         );
         $query = $this->getQuery($guestQuoteMaskedId);
@@ -93,7 +79,7 @@ public function testGetPaymentMethodsFromGuestCart()
      */
     public function testGetPaymentMethodsFromAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
         $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -108,7 +94,7 @@ public function testGetPaymentMethodsFromAnotherCustomerCart()
      */
     public function testGetPaymentMethodsIfPaymentsAreNotSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
         $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
@@ -158,16 +144,4 @@ private function getHeaderMap(string $username = 'customer@example.com', string
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
         return $headerMap;
     }
-
-    /**
-     * @param string $reservedOrderId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index 4b1509eef354e..cc90f1aa1f219 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
@@ -19,6 +20,11 @@
  */
 class GetCartTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
     /**
      * @var QuoteResource
      */
@@ -42,6 +48,7 @@ class GetCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -53,7 +60,7 @@ protected function setUp()
      */
     public function testGetCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
         $query = $this->getCartQuery($maskedQuoteId);
 
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -77,7 +84,9 @@ public function testGetCart()
      */
     public function testGetGuestCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
         $query = $this->getCartQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -92,7 +101,7 @@ public function testGetGuestCart()
      */
     public function testGetAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
         $query = $this->getCartQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -156,18 +165,6 @@ private function getCartQuery(
 QUERY;
     }
 
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $username
      * @param string $password
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index bae50fd292833..5183063e0c16f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -7,8 +7,8 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -21,9 +21,9 @@
 class SetBillingAddressOnCartTest extends GraphQlAbstract
 {
     /**
-     * @var GetMaskedQuoteIdByReversedQuoteId
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $getMaskedQuoteIdByReversedQuoteId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @var QuoteResource
@@ -48,7 +48,7 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -314,12 +314,12 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetBillingAddressToGuestCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
 
         $query = <<<QUERY
 mutation {
@@ -489,16 +489,16 @@ private function getHeaderMap(string $username = 'customer@example.com', string
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reversedOrderId
      * @param int $customerId
      * @return string
      */
     private function assignQuoteToCustomer(
-        string $reversedQuoteId = 'test_order_with_simple_product_without_address',
+        string $reversedOrderId = 'test_order_with_simple_product_without_address',
         int $customerId = 1
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
         $quote->setCustomerId($customerId);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index e111021094421..5321f6967f99b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -7,9 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\OfflinePayments\Model\Checkmo;
-use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -22,14 +22,14 @@
 class SetPaymentMethodOnCartTest extends GraphQlAbstract
 {
     /**
-     * @var CustomerTokenServiceInterface
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $customerTokenService;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var GetMaskedQuoteIdByReversedQuoteId
+     * @var CustomerTokenServiceInterface
      */
-    private $getMaskedQuoteIdByReversedQuoteId;
+    private $customerTokenService;
 
     /**
      * @var QuoteResource
@@ -52,7 +52,7 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -61,13 +61,11 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentWithVirtualProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_virtual_product');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_virtual_product');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -80,13 +78,11 @@ public function testSetPaymentWithVirtualProduct()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentWithSimpleProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -120,7 +116,7 @@ public function testSetPaymentWithSimpleProductWithoutAddress()
     public function testSetNonExistingPaymentMethod()
     {
         $methodCode = 'noway';
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -129,13 +125,13 @@ public function testSetNonExistingPaymentMethod()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentMethodToGuestCart()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
 
@@ -149,13 +145,11 @@ public function testSetPaymentMethodToGuestCart()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentMethodToAnotherCustomerCart()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
 
@@ -192,7 +186,7 @@ public function testPaymentMethodOnNonExistentCart()
     public function testReSetPayment()
     {
         /** @var \Magento\Quote\Model\Quote  $quote */
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_with_payment');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_with_payment');
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -231,16 +225,16 @@ private function prepareMutationQuery(
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reversedOrderId
      * @param int $customerId
      * @return string
      */
     private function assignQuoteToCustomer(
-        string $reversedQuoteId,
+        string $reversedOrderId,
         int $customerId
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
         $quote->setCustomerId($customerId);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index ae184b8930c07..4d4c61b3b4e5b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -513,16 +513,16 @@ private function getHeaderMap(string $username = 'customer@example.com', string
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reversedOrderId
      * @param int $customerId
      * @return string
      */
     private function assignQuoteToCustomer(
-        string $reversedQuoteId = 'test_order_with_simple_product_without_address',
+        string $reversedOrderId = 'test_order_with_simple_product_without_address',
         int $customerId = 1
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
         $quote->setCustomerId($customerId);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index c8d32ba796904..b5634f51cb366 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -8,7 +8,6 @@
 namespace Magento\GraphQl\Quote\Customer;
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -20,11 +19,6 @@
  */
 class SetShippingMethodsOnCartTest extends GraphQlAbstract
 {
-    /**
-     * @var GetMaskedQuoteIdByReversedQuoteId
-     */
-    private $getMaskedQuoteIdByReversedQuoteId;
-
     /**
      * @var CustomerTokenServiceInterface
      */
@@ -51,7 +45,6 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -169,17 +162,30 @@ private function prepareMutationQuery(
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reversedOrderId
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     */
+    private function getMaskedQuoteIdByReservedOrderId(string $reversedOrderId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $reversedOrderId
      * @param int $customerId
      * @return string
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function assignQuoteToCustomer(
-        string $reversedQuoteId,
+        string $reversedOrderId,
         int $customerId
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
         $quote->setCustomerId($customerId);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/app/code/Magento/QuoteGraphQl/Model/GetMaskedQuoteIdByReversedQuoteId.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
similarity index 81%
rename from app/code/Magento/QuoteGraphQl/Model/GetMaskedQuoteIdByReversedQuoteId.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
index 60466170fc562..88462b8dbda3b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/GetMaskedQuoteIdByReversedQuoteId.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
@@ -5,13 +5,16 @@
  */
 declare(strict_types=1);
 
-namespace Magento\QuoteGraphQl\Model;
+namespace Magento\GraphQl\Quote;
 
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\QuoteFactory;
 
-class GetMaskedQuoteIdByReversedQuoteId
+/**
+ * Get masked quote id by reserved order id
+ */
+class GetMaskedQuoteIdByReservedOrderId
 {
     /**
      * @var QuoteFactory
@@ -44,14 +47,14 @@ public function __construct(
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reversedOrderId
      * @return string
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function execute(string $reversedQuoteId): string
+    public function execute(string $reversedOrderId): string
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index c4dd9af490c99..7da7480ca390a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -7,9 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -19,19 +17,9 @@
 class GetAvailablePaymentMethodsTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @inheritdoc
@@ -39,9 +27,7 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
@@ -49,7 +35,9 @@ protected function setUp()
      */
     public function testGetCartWithPaymentMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
         $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
@@ -75,7 +63,7 @@ public function testGetCartWithPaymentMethods()
      */
     public function testGetPaymentMethodsFromCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
         $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -90,7 +78,9 @@ public function testGetPaymentMethodsFromCustomerCart()
      */
     public function testGetPaymentMethodsIfPaymentsAreNotSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
         $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
@@ -126,16 +116,4 @@ private function getQuery(
 }
 QUERY;
     }
-
-    /**
-     * @param string $reservedOrderId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 33c20e784930e..847a7129750ff 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -7,11 +7,11 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -21,9 +21,9 @@
 class GetCartTest extends GraphQlAbstract
 {
     /**
-     * @var GetMaskedQuoteIdByReversedQuoteId
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $getMaskedQuoteIdByReversedQuoteId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @var QuoteResource
@@ -48,7 +48,7 @@ class GetCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -80,12 +80,10 @@ public function testGetCart()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
         $query = $this->getCartQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -147,15 +145,15 @@ private function getCartQuery(
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reversedOrderId
      * @param int $customerId
      * @return string
      */
     private function unAssignCustomerFromQuote(
-        string $reversedQuoteId
+        string $reversedOrderId
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
         $quote->setCustomerId(0);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index b19caeeefbeef..25227c7f7a7a0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -7,7 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -20,9 +20,9 @@
 class SetBillingAddressOnCartTest extends GraphQlAbstract
 {
     /**
-     * @var GetMaskedQuoteIdByReversedQuoteId
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $getMaskedQuoteIdByReversedQuoteId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @var QuoteResource
@@ -42,7 +42,7 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -55,7 +55,7 @@ protected function setUp()
      */
     public function testSetNewBillingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -113,7 +113,7 @@ public function testSetNewBillingAddress()
      */
     public function testSetNewBillingAddressWithUseForShippingParameter()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
@@ -189,7 +189,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
      */
     public function testSetBillingAddressToCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = <<<QUERY
 mutation {
@@ -234,7 +234,7 @@ public function testSetBillingAddressToCustomerCart()
      */
     public function testSetBillingAddressFromAddressBook()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_simple_product_without_address');
 
         $query = <<<QUERY
 mutation {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 5d33a5d2edf8b..cd8cc59487343 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -7,11 +7,11 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\OfflinePayments\Model\Checkmo;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -21,9 +21,9 @@
 class SetPaymentMethodOnCartTest extends GraphQlAbstract
 {
     /**
-     * @var GetMaskedQuoteIdByReversedQuoteId
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $getMaskedQuoteIdByReversedQuoteId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @var QuoteResource
@@ -46,7 +46,7 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->getMaskedQuoteIdByReversedQuoteId = $objectManager->get(GetMaskedQuoteIdByReversedQuoteId::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -54,13 +54,11 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentWithVirtualProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_virtual_product');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_virtual_product');
         $this->unAssignCustomerFromQuote('test_order_with_virtual_product');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
@@ -74,13 +72,11 @@ public function testSetPaymentWithVirtualProduct()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentWithSimpleProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
         $this->unAssignCustomerFromQuote('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
@@ -100,7 +96,9 @@ public function testSetPaymentWithSimpleProduct()
     public function testSetPaymentWithSimpleProductWithoutAddress()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
         $this->graphQlQuery($query);
@@ -114,7 +112,7 @@ public function testSetPaymentWithSimpleProductWithoutAddress()
     public function testSetNonExistingPaymentMethod()
     {
         $methodCode = 'noway';
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
         $this->unAssignCustomerFromQuote('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
@@ -123,13 +121,11 @@ public function testSetNonExistingPaymentMethod()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetPaymentMethodToCustomerCart()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
 
@@ -164,7 +160,7 @@ public function testSetPaymentOnNonExistentCart()
     public function testReSetPayment()
     {
         /** @var \Magento\Quote\Model\Quote  $quote */
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_with_payment');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_with_payment');
         $this->unAssignCustomerFromQuote('test_order_1_with_payment');
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
         $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
@@ -206,15 +202,15 @@ private function prepareMutationQuery(
     }
 
     /**
-     * @param string $reversedQuoteId
+     * @param string $reversedOrderId
      * @param int $customerId
      * @return string
      */
     private function unAssignCustomerFromQuote(
-        string $reversedQuoteId
+        string $reversedOrderId
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
         $quote->setCustomerId(0);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index 33aeb2b902a8f..5c6e0e9cec55e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -8,6 +8,7 @@
 namespace Magento\GraphQl\Quote\Guest;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Multishipping\Helper\Data;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
@@ -21,6 +22,11 @@
  */
 class SetShippingAddressOnCartTest extends GraphQlAbstract
 {
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
     /**
      * @var QuoteResource
      */
@@ -39,6 +45,7 @@ class SetShippingAddressOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -49,7 +56,9 @@ protected function setUp()
      */
     public function testSetNewShippingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
 
         $query = <<<QUERY
 mutation {
@@ -109,7 +118,9 @@ public function testSetNewShippingAddress()
      */
     public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_virtual_product_without_address'
+        );
 
         $query = <<<QUERY
 mutation {
@@ -152,7 +163,9 @@ public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
      */
     public function testSetShippingAddressFromAddressBook()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
 
         $query = <<<QUERY
 mutation {
@@ -222,7 +235,9 @@ public function testSetShippingAddressToCustomerCart()
      */
     public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
 
         $query = <<<QUERY
 mutation {
@@ -272,7 +287,9 @@ public function dataProviderUpdateWithMissedRequiredParameters()
      */
     public function testSetMultipleNewShippingAddresses()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_simple_product_without_address'
+        );
 
         $query = <<<QUERY
 mutation {
@@ -345,28 +362,16 @@ private function assertNewShippingAddressFields(array $shippingAddressResponse):
     }
 
     /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
-    /**
-     * @param string $reversedQuoteId
+     * @param string $reversedOrderId
      * @param int $customerId
      * @return string
      */
     private function assignQuoteToCustomer(
-        string $reversedQuoteId = 'test_order_with_simple_product_without_address',
+        string $reversedOrderId = 'test_order_with_simple_product_without_address',
         int $customerId = 1
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
         $quote->setCustomerId($customerId);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 07825922d718b..bf08ce8adce6c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -10,7 +10,6 @@
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\QuoteGraphQl\Model\GetMaskedQuoteIdByReversedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -19,11 +18,6 @@
  */
 class SetShippingMethodsOnCartTest extends GraphQlAbstract
 {
-    /**
-     * @var GetMaskedQuoteIdByReversedQuoteId
-     */
-    private $getMaskedQuoteIdByReversedQuoteId;
-
     /**
      * @var QuoteResource
      */
@@ -45,7 +39,6 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->getMaskedQuoteIdByReversedQuoteId->execute(GetMaskedQuoteIdByReversedQuoteId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -158,4 +151,17 @@ private function prepareMutationQuery(
 
 QUERY;
     }
+
+    /**
+     * @param string $reversedOrderId
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     */
+    private function getMaskedQuoteIdByReservedOrderId(string $reversedOrderId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
 }

From 28d5335e04de054a306d13edaec2e8b5817ab1f3 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Thu, 14 Mar 2019 11:26:02 +0530
Subject: [PATCH 0583/1055] Removed extra whitespaces

---
 .../Attribute/Edit/Main/AbstractMain.php       |  1 -
 app/code/Magento/Eav/Setup/EavSetup.php        |  2 +-
 .../Entity/Attribute/Source/BooleanTest.php    | 18 ++++++------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index c5a18a3de99c6..73b45f452d0fe 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -110,7 +110,6 @@ protected function _prepareForm()
 
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create(
-            
             ['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
         );
 
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 6e81ddc36e9c9..04e5957b921a9 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -1063,7 +1063,7 @@ private function _updateAttributeAdditionalData($entityTypeId, $id, $field, $val
                 return $this;
             }
         }
-      
+
         $attributeId = $this->getAttributeId($entityTypeId, $id);
         if (false === $attributeId) {
             throw new LocalizedException(__('Attribute with ID: "%1" does not exist', $id));
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
index ee972c27aa8a2..a524c41c69c34 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
@@ -101,13 +101,11 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t1' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
                     ],
                     1 => [
                         'requisites' => ['code_t2' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
                     ],
                 ],
                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) ASC',
@@ -118,13 +116,11 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t1' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
                     ],
                     1 => [
                         'requisites' => ['code_t2' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
                     ],
                 ],
                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) DESC',
@@ -135,8 +131,7 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
                     ],
                 ],
                 'expectedOrder' => 'code_t.value DESC',
@@ -147,8 +142,7 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
                     ],
                 ],
                 'expectedOrder' => 'code_t.value ASC',

From 5e5ed1bc4194d3b82b97ead48b319a303563a816 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 14 Mar 2019 11:32:16 +0200
Subject: [PATCH 0584/1055] Tests data rollback for

---
 .../GraphQl/Customer/CreateCustomerTest.php       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 7342800379d13..b58cffbea9130 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -237,4 +237,19 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
 QUERY;
         $this->graphQlQuery($query);
     }
+
+    public function tearDown()
+    {
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+        $customersCollection = Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Customer::class);
+        foreach ($customersCollection as $customer) {
+            $this->customerRepository->deleteById($customer->getId());
+        }
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+        parent::tearDown();
+    }
 }

From 12c2a1de53cd29f92509a973d08e867b3862a052 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 14 Mar 2019 12:00:54 +0200
Subject: [PATCH 0585/1055] Fix functional tests.

---
 .../lib/Magento/Mtf/Client/Element/ConditionsElement.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 b3e5331af4be6..82e3e297dc456 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
@@ -397,9 +397,9 @@ protected function fillGrid($rule, ElementInterface $param)
     protected function fillSelect($rule, ElementInterface $param, $type = null)
     {
         //Avoid confusion between regions like: "Baja California" and "California".
-        $value = $type === 'Shipping State/Province'
-            ? $param->find('select', Locator::SELECTOR_TAG_NAME, 'selectstate')
-            : $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
+        $value = strpos($type, 'State/Province') === false
+            ? $param->find('select', Locator::SELECTOR_TAG_NAME, 'select')
+            : $param->find('select', Locator::SELECTOR_TAG_NAME, 'selectstate');
         if ($value->isVisible()) {
             $value->setValue($rule);
             $this->click();

From fb6713473106625fb0b0816c4479d64b6f477568 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 14 Mar 2019 14:49:40 +0200
Subject: [PATCH 0586/1055] Fix static tests.

---
 .../Attribute/Edit/Main/AbstractMain.php       | 13 ++++++-------
 app/code/Magento/Eav/Setup/EavSetup.php        |  9 ++++++---
 .../Entity/Attribute/Source/BooleanTest.php    | 18 ++++++++++++------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index 73b45f452d0fe..be9d2700664c7 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -4,15 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Product attribute add/edit form main tab
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Eav\Block\Adminhtml\Attribute\Edit\Main;
 
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 
+/**
+ * Product attribute add/edit form main tab
+ */
 abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -279,10 +277,11 @@ protected function _initFormValues()
     }
 
     /**
-     * Processing block html after rendering
+     * Processing block html after rendering.
+     *
      * Adding js block to the end of this block
      *
-     * @param   string $html
+     * @param string $html
      * @return  string
      */
     protected function _afterToHtml($html)
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 04e5957b921a9..29f9163a6e91d 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -10,12 +10,12 @@
 use Magento\Eav\Model\Entity\Setup\PropertyMapperInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Framework\App\CacheInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 
 /**
+ * Base eav setup class.
+ *
  * @api
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -101,7 +101,8 @@ public function __construct(
     }
 
     /**
-     * Gets setup model
+     * Gets setup model.
+     *
      * @deprecated
      * @return ModuleDataSetupInterface
      */
@@ -568,6 +569,8 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul
     }
 
     /**
+     * Convert group name to attribute group code.
+     *
      * @param string $groupName
      * @return string
      * @since 100.1.0
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
index a524c41c69c34..8cf5df877a6eb 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
@@ -101,11 +101,13 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t1' => "table"],
-                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123'"
+                            . " AND code_t1.store_id='0'",
                     ],
                     1 => [
                         'requisites' => ['code_t2' => "table"],
-                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123'"
+                            . " AND code_t2.store_id='12'",
                     ],
                 ],
                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) ASC',
@@ -116,11 +118,13 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t1' => "table"],
-                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123'"
+                            . " AND code_t1.store_id='0'",
                     ],
                     1 => [
                         'requisites' => ['code_t2' => "table"],
-                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123'"
+                            . " AND code_t2.store_id='12'",
                     ],
                 ],
                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) DESC',
@@ -131,7 +135,8 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t' => "table"],
-                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123'"
+                            . " AND code_t.store_id='0'",
                     ],
                 ],
                 'expectedOrder' => 'code_t.value DESC',
@@ -142,7 +147,8 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t' => "table"],
-                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123'"
+                            . " AND code_t.store_id='0'",
                     ],
                 ],
                 'expectedOrder' => 'code_t.value ASC',

From 0b49a94f51b7aa52bd267aaf161a68c24f039912 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Thu, 14 Mar 2019 07:49:41 -0500
Subject: [PATCH 0587/1055] MC-13613: Product mass update

---
 app/code/Magento/Store/Model/Group.php        | 31 +++++++++++++------
 app/code/Magento/Store/Model/Website.php      | 22 ++++++++-----
 .../Test/Unit/MessageProcessorTest.php        |  6 ++--
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index c2b3ce0498803..5de93c1ffdbc2 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -111,10 +111,10 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
      * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
      * @param \Magento\Config\Model\ResourceModel\Config\Data $configDataResource
-     * @param \Magento\Store\Model\Store $store
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param ResourceModel\Store\CollectionFactory $storeListFactory
+     * @param StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param \Magento\Framework\Event\ManagerInterface|null $eventManager
      * @param \Magento\MessageQueue\Api\PoisonPillPutInterface|null $pillPut
@@ -253,6 +253,8 @@ public function getStoreCodes()
     }
 
     /**
+     * Get stores count
+     *
      * @return int
      */
     public function getStoresCount()
@@ -358,6 +360,8 @@ public function isCanDelete()
     }
 
     /**
+     * Get default store id
+     *
      * @return mixed
      */
     public function getDefaultStoreId()
@@ -374,6 +378,8 @@ public function setDefaultStoreId($defaultStoreId)
     }
 
     /**
+     * Get root category id
+     *
      * @return mixed
      */
     public function getRootCategoryId()
@@ -390,6 +396,8 @@ public function setRootCategoryId($rootCategoryId)
     }
 
     /**
+     * Get website id
+     *
      * @return mixed
      */
     public function getWebsiteId()
@@ -406,7 +414,10 @@ public function setWebsiteId($websiteId)
     }
 
     /**
-     * @return $this
+     * Before delete action
+     *
+     * @return \Magento\Framework\Model\AbstractExtensibleModel
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function beforeDelete()
     {
@@ -483,7 +494,7 @@ public function getIdentities()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getName()
     {
@@ -517,7 +528,7 @@ public function setCode($code)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getExtensionAttributes()
     {
@@ -525,7 +536,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\GroupExtensionInterface $extensionAttributes
@@ -534,7 +545,7 @@ public function setExtensionAttributes(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.1.0
      */
     public function getScopeType()
@@ -543,7 +554,7 @@ public function getScopeType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.1.0
      */
     public function getScopeTypeName()
diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
index 53fc5fd7c9275..036135d4de57f 100644
--- a/app/code/Magento/Store/Model/Website.php
+++ b/app/code/Magento/Store/Model/Website.php
@@ -220,7 +220,7 @@ public function __construct(
     }
 
     /**
-     * init model
+     * Init model
      *
      * @return void
      */
@@ -504,6 +504,8 @@ public function getWebsiteGroupStore()
     }
 
     /**
+     * Get default group id
+     *
      * @return mixed
      */
     public function getDefaultGroupId()
@@ -520,6 +522,8 @@ public function setDefaultGroupId($defaultGroupId)
     }
 
     /**
+     * Get code
+     *
      * @return mixed
      */
     public function getCode()
@@ -552,7 +556,10 @@ public function setName($name)
     }
 
     /**
-     * @return $this
+     * Before delete action
+     *
+     * @return \Magento\Framework\Model\AbstractExtensibleModel
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function beforeDelete()
     {
@@ -644,8 +651,7 @@ public function getDefaultStore()
     }
 
     /**
-     * Retrieve default stores select object
-     * Select fields website_id, store_id
+     * Retrieve default stores select object, select fields website_id, store_id
      *
      * @param bool $withDefault include/exclude default admin website
      * @return \Magento\Framework\DB\Select
@@ -680,7 +686,7 @@ public function getIdentities()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.1.0
      */
     public function getScopeType()
@@ -689,7 +695,7 @@ public function getScopeType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.1.0
      */
     public function getScopeTypeName()
@@ -698,7 +704,7 @@ public function getScopeTypeName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getExtensionAttributes()
     {
@@ -706,7 +712,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\WebsiteExtensionInterface $extensionAttributes
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
index 5e64d737034c8..73841a2a964cc 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageProcessorTest.php
@@ -75,7 +75,7 @@ public function testProcess()
             ->getMockForAbstractClass();
         $configuration->expects($this->atLeastOnce())->method('getHandlers')->willReturn([]);
         $this->messageStatusProcessor->expects($this->exactly(2))->method('acknowledgeMessages');
-        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\Api\CustomAttributesDataInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
@@ -116,7 +116,7 @@ public function testProcessWithConnectionLostException()
         $exception = new \Magento\Framework\MessageQueue\ConnectionLostException(__('Exception Message'));
         $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
         $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
-        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\Api\CustomAttributesDataInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
@@ -158,7 +158,7 @@ public function testProcessWithException()
         $configuration->expects($this->atLeastOnce())->method('getHandlers')->willThrowException($exception);
         $this->messageStatusProcessor->expects($this->once())->method('acknowledgeMessages');
         $this->messageStatusProcessor->expects($this->atLeastOnce())->method('rejectMessages');
-        $mergedMessage = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
+        $mergedMessage = $this->getMockBuilder(\Magento\Framework\Api\CustomAttributesDataInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $message = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)

From 28d11bca2f3ec24fda1e6d9cc73f151bbaf2e9d5 Mon Sep 17 00:00:00 2001
From: Dmytro Yushkin <dyushkin@adobe.com>
Date: Thu, 14 Mar 2019 08:30:24 -0500
Subject: [PATCH 0588/1055] MAGETWO-98617: Pager does not work on Newsletter
 Subscribers Admin page

---
 .../Grid/Massaction/AbstractMassaction.php    |  28 +++--
 .../Unit/Block/Widget/Grid/MassactionTest.php |  56 ----------
 .../Block/Widget/Grid/MassactionTest.php      |  52 ---------
 .../Block/Adminhtml/Subscriber/GridTest.php   | 103 ++++++++++++++++++
 4 files changed, 116 insertions(+), 123 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index 9890a10a4ceb0..891b2a3ada724 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -282,25 +282,23 @@ public function getGridIdsJson()
         if (!$this->getUseSelectAll()) {
             return '';
         }
-        /** @var \Magento\Framework\Data\Collection $allIdsCollection */
-        $allIdsCollection = clone $this->getParentBlock()->getCollection();
 
-        if ($this->getMassactionIdField()) {
-            $massActionIdField = $this->getMassactionIdField();
+        /** @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection $collection */
+        $collection = clone $this->getParentBlock()->getCollection();
+
+        if ($collection instanceof AbstractDb) {
+            $idsSelect = clone $collection->getSelect();
+            $idsSelect->reset(\Magento\Framework\DB\Select::ORDER);
+            $idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_COUNT);
+            $idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
+            $idsSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
+            $idsSelect->columns($this->getMassactionIdField(), 'main_table');
+            $idList = $collection->getConnection()->fetchCol($idsSelect);
         } else {
-            $massActionIdField = $this->getParentBlock()->getMassactionIdField();
+            $idList = $collection->setPageSize(0)->getColumnValues($this->getMassactionIdField());
         }
 
-        if ($allIdsCollection instanceof AbstractDb) {
-            $allIdsCollection->getSelect()->limit();
-            $allIdsCollection->clear();
-        }
-
-        $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
-        if (!empty($gridIds)) {
-            return join(",", $gridIds);
-        }
-        return '';
+        return implode(',', $idList);
     }
 
     /**
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
index e8143b5f6b43a..e62b73f39241d 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
@@ -269,62 +269,6 @@ public function testGetGridIdsJsonWithoutUseSelectAll()
         $this->assertEmpty($this->_block->getGridIdsJson());
     }
 
-    /**
-     * @param array $items
-     * @param string $result
-     *
-     * @dataProvider dataProviderGetGridIdsJsonWithUseSelectAll
-     */
-    public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
-    {
-        $this->_block->setUseSelectAll(true);
-
-        if ($this->_block->getMassactionIdField()) {
-            $massActionIdField = $this->_block->getMassactionIdField();
-        } else {
-            $massActionIdField = $this->_block->getParentBlock()->getMassactionIdField();
-        }
-
-        $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->_gridMock->expects($this->once())
-            ->method('getCollection')
-            ->willReturn($collectionMock);
-        $collectionMock->expects($this->once())
-            ->method('setPageSize')
-            ->with(0)
-            ->willReturnSelf();
-        $collectionMock->expects($this->once())
-            ->method('getColumnValues')
-            ->with($massActionIdField)
-            ->willReturn($items);
-
-        $this->assertEquals($result, $this->_block->getGridIdsJson());
-    }
-
-    /**
-     * @return array
-     */
-    public function dataProviderGetGridIdsJsonWithUseSelectAll()
-    {
-        return [
-            [
-                [],
-                '',
-            ],
-            [
-                [1],
-                '1',
-            ],
-            [
-                [1, 2, 3],
-                '1,2,3',
-            ],
-        ];
-    }
-
     /**
      * @param string $itemId
      * @param array|\Magento\Framework\DataObject $item
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
index 8aeee9cf12494..e11c5ce5d9cf3 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
@@ -87,41 +87,6 @@ public function testMassactionDefaultValues()
         $this->assertFalse($blockEmpty->isAvailable());
     }
 
-    public function testGetJavaScript()
-    {
-        $this->loadLayout();
-
-        $javascript = $this->_block->getJavaScript();
-
-        $expectedItemFirst = '#"option_id1":{"label":"Option One",' .
-            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
-            '"complete":"Test","id":"option_id1"}#';
-        $this->assertRegExp($expectedItemFirst, $javascript);
-
-        $expectedItemSecond = '#"option_id2":{"label":"Option Two",' .
-            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
-            '"confirm":"Are you sure\?","id":"option_id2"}#';
-        $this->assertRegExp($expectedItemSecond, $javascript);
-    }
-
-    public function testGetJavaScriptWithAddedItem()
-    {
-        $this->loadLayout();
-
-        $input = [
-            'id' => 'option_id3',
-            'label' => 'Option Three',
-            'url' => '*/*/option3',
-            'block_name' => 'admin.test.grid.massaction.option3',
-        ];
-        $expected = '#"option_id3":{"id":"option_id3","label":"Option Three",' .
-            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
-            '"block_name":"admin.test.grid.massaction.option3"}#';
-
-        $this->_block->addItem($input['id'], $input);
-        $this->assertRegExp($expected, $this->_block->getJavaScript());
-    }
-
     /**
      * @param string $mageMode
      * @param int $expectedCount
@@ -213,21 +178,4 @@ public function getItemsDataProvider()
             ]
         ];
     }
-
-    public function testGridContainsMassactionColumn()
-    {
-        $this->loadLayout();
-        $this->_layout->getBlock('admin.test.grid')->toHtml();
-
-        $gridMassactionColumn = $this->_layout->getBlock('admin.test.grid')
-            ->getColumnSet()
-            ->getChildBlock('massaction');
-
-        $this->assertNotNull($gridMassactionColumn, 'Massaction column does not exist in the grid column set');
-        $this->assertInstanceOf(
-            \Magento\Backend\Block\Widget\Grid\Column::class,
-            $gridMassactionColumn,
-            'Massaction column is not an instance of \Magento\Backend\Block\Widget\Column'
-        );
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
new file mode 100644
index 0000000000000..ea361a643dee0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber;
+
+/**
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ *
+ * @see \Magento\Newsletter\Block\Adminhtml\Subscriber\Grid
+ */
+class GridTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var null|\Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+    /**
+     * @var null|\Magento\Framework\View\LayoutInterface
+     */
+    private $layout = null;
+
+    /**
+     * Set up layout.
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->layout = $this->objectManager->create(\Magento\Framework\View\LayoutInterface::class);
+        $this->layout->getUpdate()->load('newsletter_subscriber_grid');
+        $this->layout->generateXml();
+        $this->layout->generateElements();
+    }
+
+    /**
+     * Check if mass action block exists.
+     */
+    public function testMassActionBlockExists()
+    {
+        $this->assertNotFalse(
+            $this->getMassActionBlock(),
+            'Mass action block does not exist in the grid, or it name was changed.'
+        );
+    }
+
+    /**
+     * Check if mass action id field is correct.
+     */
+    public function testMassActionFieldIdIsCorrect()
+    {
+        $this->assertEquals(
+            'subscriber_id',
+            $this->getMassActionBlock()->getMassactionIdField(),
+            'Mass action id field is incorrect.'
+        );
+    }
+
+    /**
+     * Check if function returns correct result.
+     *
+     * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
+     */
+    public function testMassActionBlockContainsCorrectIdList()
+    {
+        $this->assertEquals(
+            implode(',', $this->getAllSubscriberIdList()),
+            $this->getMassActionBlock()->getGridIdsJson(),
+            'Function returns incorrect result.'
+        );
+    }
+
+    /**
+     * Retrieve mass action block.
+     *
+     * @return bool|\Magento\Backend\Block\Widget\Grid\Massaction
+     */
+    private function getMassActionBlock()
+    {
+        return $this->layout->getBlock('adminhtml.newslettrer.subscriber.grid.massaction');
+    }
+
+    /**
+     * Retrieve list of id of all subscribers.
+     *
+     * @return array
+     */
+    private function getAllSubscriberIdList()
+    {
+        /** @var \Magento\Framework\App\ResourceConnection $resourceConnection */
+        $resourceConnection = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+        $select = $resourceConnection->getConnection()
+            ->select()
+            ->from($resourceConnection->getTableName('newsletter_subscriber'))
+            ->columns(['subscriber_id' => 'subscriber_id']);
+
+        return $resourceConnection->getConnection()->fetchCol($select);
+    }
+}

From 6af6d4021a9caeeb590ed21121e9f4427d8c7423 Mon Sep 17 00:00:00 2001
From: asim-vax <asim@tti-fc.com>
Date: Thu, 14 Mar 2019 13:51:45 +0000
Subject: [PATCH 0589/1055] fixes sitemap checking for null, when is empty
 instead

---
 .../Magento/Sitemap/Model/ResourceModel/Catalog/Product.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
index 82024b3b015e5..ebcc7b9bd62e8 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -324,7 +324,7 @@ public function getCollection($storeId)
             []
         )->joinLeft(
             ['url_rewrite' => $this->getTable('url_rewrite')],
-            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND url_rewrite.metadata IS '
+            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND NULLIF(url_rewrite.metadata,"") IS '
             . $urlsConfigCondition . 'NULL'
             . $connection->quoteInto(' AND url_rewrite.store_id = ?', $store->getId())
             . $connection->quoteInto(' AND url_rewrite.entity_type = ?', ProductUrlRewriteGenerator::ENTITY_TYPE),

From b8309dbf426dd8e93e095dd429af883fdae1d7bd Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Thu, 14 Mar 2019 09:13:42 -0500
Subject: [PATCH 0590/1055] MC-13613: Product mass update

---
 app/code/Magento/Store/Model/Group.php   | 5 +----
 app/code/Magento/Store/Model/Website.php | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index 5de93c1ffdbc2..19f104c9f3790 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -414,10 +414,7 @@ public function setWebsiteId($websiteId)
     }
 
     /**
-     * Before delete action
-     *
-     * @return \Magento\Framework\Model\AbstractExtensibleModel
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @inheritdoc
      */
     public function beforeDelete()
     {
diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
index 036135d4de57f..383b36fd63228 100644
--- a/app/code/Magento/Store/Model/Website.php
+++ b/app/code/Magento/Store/Model/Website.php
@@ -556,10 +556,7 @@ public function setName($name)
     }
 
     /**
-     * Before delete action
-     *
-     * @return \Magento\Framework\Model\AbstractExtensibleModel
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @inheritdoc
      */
     public function beforeDelete()
     {

From a07eda31588b8dcbd3bfae9b95052ff88c8435a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Thu, 14 Mar 2019 16:39:41 +0200
Subject: [PATCH 0591/1055] remove translation of attribute label

---
 .../view/frontend/templates/product/view/attributes.phtml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
index c930d2195a01b..1c4a37fedebe3 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
@@ -23,8 +23,8 @@
             <tbody>
             <?php foreach ($_additional as $_data): ?>
                 <tr>
-                    <th class="col label" scope="row"><?= $block->escapeHtml(__($_data['label'])) ?></th>
-                    <td class="col data" data-th="<?= $block->escapeHtml(__($_data['label'])) ?>"><?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
+                    <th class="col label" scope="row"><?= $block->escapeHtml($_data['label']) ?></th>
+                    <td class="col data" data-th="<?= $block->escapeHtml($_data['label']) ?>"><?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
                 </tr>
             <?php endforeach; ?>
             </tbody>

From 63cffa2f34ee28735cb102fa0466f6a89d646a25 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Thu, 14 Mar 2019 10:00:11 -0500
Subject: [PATCH 0592/1055] MC-13613: Product mass update

---
 app/code/Magento/Catalog/composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 74e7f40b1f062..5c3ee3da8ca81 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -7,7 +7,6 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-message-queue": "*",
         "magento/module-authorization": "*",
         "magento/module-asynchronous-operations": "*",
         "magento/module-backend": "*",

From 89a862117d76346f2c233682fa68cb8582f6a60b Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Thu, 14 Mar 2019 17:30:23 +0200
Subject: [PATCH 0593/1055] 428 - Test coverage:
 GetAvailableShippingMethodsTest

---
 .../GetAvailableShippingMethodsTest.php       | 10 ++---
 .../Guest/GetAvailableShippingMethodsTest.php |  2 +-
 .../disable_all_active_shipping_methods.php   | 39 -------------------
 ...e_all_active_shipping_methods_rollback.php | 33 ----------------
 .../disable_offline_shipping_methods.php      | 22 +++++++++++
 ...able_offline_shipping_methods_rollback.php | 18 +++++++++
 .../_files/guest_quote_with_addresses.php     |  2 +-
 7 files changed, 47 insertions(+), 79 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
 create mode 100644 dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index 336eaf4a0b3a6..c81d2d99f3514 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
@@ -68,15 +68,15 @@ public function testGetAvailableShippingMethods()
         self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
 
         $expectedAddressData = [
-            'amount' => 10,
-            'base_amount' => 10,
+            'amount' => 0,
+            'base_amount' => 0,
             'carrier_code' => 'flatrate',
             'carrier_title' => 'Flat Rate',
             'error_message' => '',
             'method_code' => 'flatrate',
             'method_title' => 'Fixed',
-            'price_incl_tax' => 10,
-            'price_excl_tax' => 10,
+            'price_incl_tax' => 0,
+            'price_excl_tax' => 0,
         ];
         self::assertEquals(
             $expectedAddressData,
@@ -105,7 +105,7 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
      * Test case: get available shipping methods when all shipping methods are disabled
      *
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/disable_all_active_shipping_methods.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
      */
     public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 21ba48ee8a5ec..3b955fb53f6b1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -97,7 +97,7 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
      * Test case: get available shipping methods when all shipping methods are disabled
      *
      * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/disable_all_active_shipping_methods.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
      */
     public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods.php
deleted file mode 100644
index 925a3bd6503aa..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-use Magento\Config\Model\Config;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\TestFramework\Helper\Bootstrap;
-
-$objectManager           = Bootstrap::getObjectManager();
-$shippingConfig          = $objectManager->get(Magento\Shipping\Model\Config::class);
-$rollbackConfigKey       = 'test/carriers/disabled_shipment_methods';
-$configData              = [];
-$disabledShipmentMethods = [];
-
-// Get all active Shipping Methods
-foreach ($shippingConfig->getAllCarriers() as $carrierCode => $carrierModel) {
-    if (!$carrierModel->isActive()) {
-        continue;
-    }
-
-    $carrierConfigKey              = sprintf('carriers/%s/active', $carrierCode);
-    $configData[$carrierConfigKey] = 0;
-    $disabledShipmentMethods[]     = $carrierCode;
-}
-
-// Remember all manually disabled Shipping Methods for rollback
-$configData[$rollbackConfigKey] = implode(',', $disabledShipmentMethods);
-
-/** @var Config $defConfig */
-$defConfig = $objectManager->create(Config::class);
-$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-
-foreach ($configData as $key => $value) {
-    $defConfig->setDataByPath($key, $value);
-    $defConfig->save();
-}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods_rollback.php
deleted file mode 100644
index a6d7a30e091b1..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/disable_all_active_shipping_methods_rollback.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\Config\Storage\WriterInterface;
-use Magento\TestFramework\Helper\Bootstrap;
-
-$objectManager = Bootstrap::getObjectManager();
-$rollbackConfigKey = 'test/carriers/disabled_shipment_methods';
-
-$configWriter = $objectManager->create(WriterInterface::class);
-$rollbackConfigValue = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
-    ->getStore(\Magento\Store\Model\Store::DEFAULT_STORE_ID)
-    ->getConfig($rollbackConfigKey);
-
-$disabledShipmentMethods = [];
-if (!empty($rollbackConfigValue)) {
-    $disabledShipmentMethods = explode(',', $rollbackConfigValue);
-}
-
-if (count($disabledShipmentMethods)) {
-    foreach ($disabledShipmentMethods as $keyToRemove) {
-        $configWriter->delete(sprintf('carriers/%s/active', $keyToRemove));
-    }
-}
-$configWriter->delete($rollbackConfigKey);
-
-$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
new file mode 100644
index 0000000000000..30c64ab7a42a2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+
+$configWriter->save('carriers/flatrate/active', 0);
+$configWriter->save('carriers/tablerate/active', 0);
+$configWriter->save('carriers/freeshipping/active', 0);
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods_rollback.php
new file mode 100644
index 0000000000000..31a16f42adfce
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods_rollback.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer  $configWriter */
+$configWriter = $objectManager->create(WriterInterface::class);
+
+$configWriter->delete('carriers/flatrate/active');
+$configWriter->delete('carriers/tablerate/active');
+$configWriter->delete('carriers/freeshipping/active');
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
index b8f2ca38e2489..f25cf8e927ca3 100644
--- 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
@@ -14,7 +14,7 @@
 $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId('simple')
     ->setAttributeSetId($product->getDefaultAttributeSetId())
-    ->setName('Simple Product')
+    ->setName('Simple Product For Guest Quote')
     ->setSku('simple-product-guest-quote')
     ->setPrice(10)
     ->setTaxClassId(0)

From b92ffa24299d32b62d2a211aa7756d866ad13154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Thu, 14 Mar 2019 17:15:44 +0100
Subject: [PATCH 0594/1055] Don't check default locale if Magento is not
 installed

---
 .../Magento/Framework/Locale/Resolver.php     | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Locale/Resolver.php b/lib/internal/Magento/Framework/Locale/Resolver.php
index b401da8960f05..3a516fcea5e91 100644
--- a/lib/internal/Magento/Framework/Locale/Resolver.php
+++ b/lib/internal/Magento/Framework/Locale/Resolver.php
@@ -6,6 +6,8 @@
 namespace Magento\Framework\Locale;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
 
 class Resolver implements ResolverInterface
 {
@@ -52,6 +54,11 @@ class Resolver implements ResolverInterface
      */
     private $defaultLocalePath;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param string $defaultLocalePath
@@ -93,7 +100,10 @@ public function setDefaultLocale($locale)
     public function getDefaultLocale()
     {
         if (!$this->defaultLocale) {
-            $locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
+            $locale = false;
+            if ($this->getDeploymentConfig()->isAvailable() && $this->getDeploymentConfig()->isDbAvailable()) {
+                $locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
+            }
             if (!$locale) {
                 $locale = self::DEFAULT_LOCALE;
             }
@@ -159,4 +169,18 @@ public function revert()
         }
         return $result;
     }
+
+    /**
+     * Retrieve Deployment Config
+     *
+     * @return DeploymentConfig
+     */
+    private function getDeploymentConfig()
+    {
+        if (!$this->deploymentConfig) {
+            $this->deploymentConfig = ObjectManager::getInstance()->get(DeploymentConfig::class);
+        }
+
+        return $this->deploymentConfig;
+    }
 }

From 8029be3355c3cb1dbebd185de54583a6e27f3c65 Mon Sep 17 00:00:00 2001
From: Michael Lehmkuhl <michael@electricpulp.com>
Date: Thu, 14 Mar 2019 14:40:57 -0500
Subject: [PATCH 0595/1055] Fixes nested array for used products cache key

When $requiredAttributeIds is passed as an array, it was previously being added to the $keyParts array directly, which resulted in a nested array. When this nested array is passed to getUsedProductsCacheKey(), the implode() in that function throws a notice and produces a cache key that contains the non-unique string "Array" as a part. This can result in caching errors where simple children of configurable products are concerned (e.g., swatches).
---
 .../Model/Product/Type/Configurable.php                  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 46f10608bc95e..47c1a3c39f9a8 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -1232,6 +1232,8 @@ public function isPossibleBuyFromList($product)
     /**
      * Returns array of sub-products for specified configurable product
      *
+     * $requiredAttributeIds - one dimensional array, if provided
+     *
      * Result array contains all children for specified configurable product
      *
      * @param  \Magento\Catalog\Model\Product $product
@@ -1245,9 +1247,12 @@ public function getUsedProducts($product, $requiredAttributeIds = null)
             __METHOD__,
             $product->getData($metadata->getLinkField()),
             $product->getStoreId(),
-            $this->getCustomerSession()->getCustomerGroupId(),
-            $requiredAttributeIds
+            $this->getCustomerSession()->getCustomerGroupId()
         ];
+        if (!is_null($requiredAttributeIds)) {
+            sort($requiredAttributeIds);
+            $keyParts[] = implode('', $requiredAttributeIds);
+        }
         $cacheKey = $this->getUsedProductsCacheKey($keyParts);
         return $this->loadUsedProducts($product, $cacheKey);
     }

From 668010da81fb92361d3692fc313b04d5d5ed2766 Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Thu, 14 Mar 2019 16:11:50 -0500
Subject: [PATCH 0596/1055] MC-4343: Convert NavigateMenuTest to MFTF

---
 .../Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml | 2 +-
 .../AdminMarketingNewsletterSubscribersNavigateMenuTest.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
index 052485cb75d4c..bff16edfc5ca5 100644
--- a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
@@ -12,7 +12,7 @@
         <annotations>
             <features value="CurrencySymbol"/>
             <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 20"/>
+            <title value="Admin stores currency rates navigate menu test"/>
             <description value="Admin should be able to navigate to Stores > Currency Rates"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14150"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
index 46e810559dedc..a37373056df28 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
@@ -12,7 +12,7 @@
         <annotations>
             <features value="Newsletter"/>
             <stories value="Menu Navigation"/>
-            <title value="Navigate menu test 48"/>
+            <title value="Admin marketing newsletter subscribers navigate menu test"/>
             <description value="Admin should be able to navigate to Marketing > Newsletter Subscribers"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14190"/>

From c77b2c734460db3ff8147ce89cdd2f9c176e8e76 Mon Sep 17 00:00:00 2001
From: Ansari <ziyaurrahman@krishtechnolabs.com>
Date: Fri, 15 Mar 2019 10:12:34 +0530
Subject: [PATCH 0597/1055] spelling correction

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b86c7b79a0cbd..8fef85cd1e474 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -626,7 +626,7 @@ Tests:
     * Fixed an issue where filters were not shown on product reviews report grid
     * Fixed an issue where second customer address was not deleted from customer account
     * Fixed an issue where custom options pop-up was still displayed after submit
-    * Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first atempt
+    * Fixed an issue where Second Product was not added to Shopping Cart from Wishlist at first attempt
     * Fixed an issue where customer invalid email message was not displayed
     * Fixed an issue where All Access Tokens for Customer without Tokens could not be revoked
     * Fixed an issue where it was impossible to add Product to Shopping Cart from shared Wishlist

From 648df72b26eabf438b4570e0db8a5a925f01ecd1 Mon Sep 17 00:00:00 2001
From: Michalk39 <michalk9339@gmail.com>
Date: Fri, 15 Mar 2019 12:25:26 +0100
Subject: [PATCH 0598/1055] Convert VerifyDisabledCustomerGroupFieldTest to
 MFTF #664

---
 .../Section/AdminCustomerGroupMainSection.xml |  1 +
 .../VerifyDisabledCustomerGroupFieldTest.xml  | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/VerifyDisabledCustomerGroupFieldTest.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
index 1fdb15f189ace..af6ff35988e02 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
@@ -15,5 +15,6 @@
         <element name="selectFirstRow" type="button" selector="//button[@class='action-select']"/>
         <element name="deleteBtn" type="button" selector="//*[text()='Delete']"/>
         <element name="clearAllBtn" type="button" selector="//button[text()='Clear all']"/>
+        <element name="selectIdZeroRow" type="button" selector="tr.data-row:nth-child(1) td.data-grid-actions-cell:nth-child(4) > a.action-menu-item" />
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/VerifyDisabledCustomerGroupFieldTest.xml b/app/code/Magento/Customer/Test/Mftf/Section/VerifyDisabledCustomerGroupFieldTest.xml
new file mode 100644
index 0000000000000..36a760d90e125
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/VerifyDisabledCustomerGroupFieldTest.xml
@@ -0,0 +1,39 @@
+<?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="VerifyDisabledCustomerGroupFieldTest">
+        <annotations>
+            <stories value="Check that field is disabled in system Customer Group"/>
+            <title value="Check that field is disabled in system Customer Group"/>
+            <description value="Checks that customer_group_code field is disabled in NOT LOGGED IN Customer Group"/>
+            <testCaseId value="MAGETWO-52481"/>
+            <severity value="CRITICAL"/>
+            <group value="customers"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <!-- Steps -->
+        <!-- 1. Login to backend as admin user -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <waitForPageLoad stepKey="waitForAdminPageLoad" />
+
+        <!-- 2. Navigate to Customers > Customer Groups -->
+        <amOnPage url="{{AdminCustomerGroupPage.url}}" stepKey="amOnCustomerGroupPage" />
+        <waitForPageLoad stepKey="waitForCustomerGroupsPageLoad" />
+
+        <!-- 3. Select system Customer Group specified in data set from grid -->
+        <click selector="{{AdminCustomerGroupMainSection.selectIdZeroRow}}" stepKey="clickOnEditCustomerGroup" />
+
+        <!-- 4. Perform all assertions -->
+        <seeInField selector="#customer_group_code" userInput="NOT LOGGED IN" stepKey="seeNotLoggedInTextInGroupName" />
+        <assertElementContainsAttribute selector="#customer_group_code" attribute="disabled" expectedValue="true" stepKey="checkIfGroupNameIsDisabled" />
+
+    </test>
+</tests>
\ No newline at end of file

From 23ed0157aa854945d1d7b20cfe4d4bc7ab5eb89a Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 15 Mar 2019 13:39:25 +0200
Subject: [PATCH 0599/1055] Fix functional tests.

---
 .../Mtf/Client/Element/ConditionsElement.php  |  2 +-
 .../Client/Element/SelectconditionElement.php | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php

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 6dbf2b1aa6a12..f532b12c61492 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
@@ -285,7 +285,7 @@ protected function addCondition($type, ElementInterface $context)
             $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
 
             try {
-                $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select')->setValue($type);
+                $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'selectcondition')->setValue($type);
                 $isSetType = true;
             } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
                 $isSetType = false;
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
new file mode 100644
index 0000000000000..1fe096670135d
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © 2017 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Mtf\Client\Element;
+
+/**
+ * @inheritdoc
+ */
+class SelectconditionElement extends SelectElement
+{
+    /**
+     * @inheritdoc
+     */
+    protected $optionByValue = './/option[normalize-space(.)=%s]';
+}

From d2a7142d4dc2ce27fbd451c6c43dcf951f0d7f2d Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Fri, 15 Mar 2019 13:43:26 +0200
Subject: [PATCH 0600/1055] 428 - Test coverage:
 GetAvailableShippingMethodsTest Fix 1)
 Magento\GraphQl\Quote\Customer\GetAvailableShippingMethodsTest::testGetAvailableShippingMethods
 Failed asserting that two arrays are equal. --- Expected +++ Actual @@ @@ 
 Array ( -    'amount' => 0 -    'base_amount' => 0 +    'amount' => 10 +   
 'base_amount' => 10      'carrier_code' => 'flatrate'      'carrier_title' =>
 'Flat Rate'      'error_message' => ''      'method_code' => 'flatrate'     
 'method_title' => 'Fixed' -    'price_incl_tax' => 0 -    'price_excl_tax' =>
 0 +    'price_incl_tax' => 10 +    'price_excl_tax' => 10

---
 .../Quote/Customer/GetAvailableShippingMethodsTest.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index c81d2d99f3514..da5801cb9a06e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
@@ -68,15 +68,15 @@ public function testGetAvailableShippingMethods()
         self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
 
         $expectedAddressData = [
-            'amount' => 0,
-            'base_amount' => 0,
+            'amount' => 10,
+            'base_amount' => 10,
             'carrier_code' => 'flatrate',
             'carrier_title' => 'Flat Rate',
             'error_message' => '',
             'method_code' => 'flatrate',
             'method_title' => 'Fixed',
-            'price_incl_tax' => 0,
-            'price_excl_tax' => 0,
+            'price_incl_tax' => 10,
+            'price_excl_tax' => 10,
         ];
         self::assertEquals(
             $expectedAddressData,

From 0acd6b6a0982941c11f1edfc10afd7896138222e Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 15 Mar 2019 15:22:50 +0200
Subject: [PATCH 0601/1055] Fix static tests.

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

diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
index 8f3e6b475b466..2821a46f29416 100644
--- a/app/code/Magento/Indexer/Model/Indexer.php
+++ b/app/code/Magento/Indexer/Model/Indexer.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Indexer\Model;
 
 use Magento\Framework\Indexer\ActionFactory;
@@ -14,6 +15,8 @@
 use Magento\Framework\Indexer\StructureFactory;
 
 /**
+ * Indexer model.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Indexer extends \Magento\Framework\DataObject implements IndexerInterface

From 98a1bb3c558c2eb2c60f961f6ab157573477af4c Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Fri, 15 Mar 2019 09:02:51 -0500
Subject: [PATCH 0602/1055] MC-4343: Convert NavigateMenuTest to MFTF

---
 .../Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml    | 2 +-
 ...teMenu.xml => AdminStoresAttributeSetNavigateMenuTest.xml} | 4 ++--
 .../Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename app/code/Magento/Catalog/Test/Mftf/Test/{AdminStoresAttributeSetNavigateMenu.xml => AdminStoresAttributeSetNavigateMenuTest.xml} (95%)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index 05c48e5519a23..16f29230efb60 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -24,6 +24,6 @@
 
         <!-- Navigate menu selectors -->
         <element name="mainMenuItem" type="button" selector="//li[contains(@id, 'menu-magento') and contains(@id, '{{var}}')]" parameterized="true" timeout="30"/>
-        <element name="submenuItem" type="button" selector="//li[contains(@class, 'item') and contains(@class, '{{var}}')]" parameterized="true" timeout="30"/>
+        <element name="submenuItem" type="button" selector="//li[contains(@class, 'item') and contains(@class, '{{var}}')][position()=1]" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenu.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
similarity index 95%
rename from app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenu.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
index f719040a3239a..697828d29c22f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenu.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
@@ -8,11 +8,11 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminStoresAttributeSetNavigateMenu">
+    <test name="AdminStoresAttributeSetNavigateMenuTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Menu Navigation"/>
-            <title value="Admin stores attribute set navigate menu"/>
+            <title value="Admin stores attribute set navigate menu test"/>
             <description value="Admin should be able to navigate to Stores > Attribute Set"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14133"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
index bdc6721eefb7e..23e03fe049360 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
@@ -27,7 +27,7 @@
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentPagesPage">
             <argument name="menuItem" value="backend-content"/>
-            <argument name="submenuItem" value="versionscms-page-page"/>
+            <argument name="submenuItem" value="cms-page"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
             <argument name="title" value="Pages"/>

From 418d22b89386190f8304ab95a42d66eee7e778eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Bajsarowicz?= <lukasz.bajsarowicz@strix.net>
Date: Fri, 15 Mar 2019 15:19:21 +0100
Subject: [PATCH 0603/1055] MSI: Add deprecation message to CatalogInventory
 SPIs

---
 .../Model/Spi/StockRegistryProviderInterface.php              | 4 ++++
 .../Model/Spi/StockStateProviderInterface.php                 | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
index f711268bc7930..49d9b4aaa34e8 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
@@ -7,6 +7,10 @@
 
 /**
  * Interface StockRegistryProviderInterface
+ *
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockRegistryProviderInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
index 89fb54e7e496b..31bdc19f9cf7a 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
@@ -9,6 +9,10 @@
 
 /**
  * Interface StockStateProviderInterface
+ * 
+ * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
+ * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
 interface StockStateProviderInterface
 {

From 571f0556a4b9847ddc04869ca598d67a90e81fca Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 15 Mar 2019 17:38:44 +0200
Subject: [PATCH 0604/1055] Fix functional tests.

---
 .../Mtf/Client/Element/ConditionsElement.php  | 19 ++++++++++++++++---
 .../Client/Element/SelectconditionElement.php |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

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 f532b12c61492..9edd087020a72 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
@@ -195,6 +195,13 @@ class ConditionsElement extends SimpleElement
      */
     protected $exception;
 
+    /**
+     * Condition option text selector.
+     *
+     * @var string
+     */
+    private $conditionOptionTextSelector = '//option[normalize-space(text())="%s"]';
+
     /**
      * @inheritdoc
      */
@@ -282,10 +289,16 @@ protected function addCondition($type, ElementInterface $context)
         $count = 0;
 
         do {
-            $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
-
             try {
-                $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'selectcondition')->setValue($type);
+                $specificType = $newCondition->find(
+                    sprintf($this->conditionOptionTextSelector, $type),
+                    Locator::SELECTOR_XPATH
+                )->isPresent();
+                $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
+                $condition = $specificType
+                    ? $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'selectcondition')
+                    : $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select');
+                $condition->setValue($type);
                 $isSetType = true;
             } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
                 $isSetType = false;
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
index 1fe096670135d..15a799eac5188 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 

From 1d9b1ba0981f2084c6e6da180c8dcf0c2e78f7da Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Mon, 11 Mar 2019 16:26:33 -0500
Subject: [PATCH 0605/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

---
 .../Magento/Config/App/Config/Type/System.php | 162 +++++++++---------
 app/code/Magento/Config/etc/di.xml            |  11 +-
 app/etc/di.xml                                |   8 +
 .../Block/Widget/Form/ContainerTest.php       |   2 +-
 .../Php/_files/phpcpd/blacklist/common.txt    |   1 +
 .../Magento/Framework/Cache/Lock/Query.php    |  97 +++++++++++
 .../Framework/Cache/LockQueryInterface.php    |  30 ++++
 .../Magento/Framework/Lock/Backend/Cache.php  |  12 +-
 .../Framework/View/Element/AbstractBlock.php  |  93 +++++++---
 .../Test/Unit/Element/AbstractBlockTest.php   |  52 ++----
 10 files changed, 320 insertions(+), 148 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Cache/Lock/Query.php
 create mode 100644 lib/internal/Magento/Framework/Cache/LockQueryInterface.php

diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index 2c4b8a8dc48d2..09e4e7b5b9bd2 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Config\App\Config\Type;
 
 use Magento\Framework\App\Config\ConfigSourceInterface;
@@ -13,11 +14,12 @@
 use Magento\Config\App\Config\Type\System\Reader;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Cache\LockQueryInterface;
 use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Store\Model\Config\Processor\Fallback;
-use Magento\Store\Model\ScopeInterface as StoreScope;
 use Magento\Framework\Encryption\Encryptor;
+use Magento\Store\Model\ScopeInterface as StoreScope;
 
 /**
  * System configuration type
@@ -42,22 +44,6 @@ class System implements ConfigTypeInterface
      * @var string
      */
     private static $lockName = 'SYSTEM_CONFIG';
-    /**
-     * Timeout between retrieves to load the configuration from the cache.
-     *
-     * Value of the variable in microseconds.
-     *
-     * @var int
-     */
-    private static $delayTimeout = 100000;
-    /**
-     * Lifetime of the lock for write in cache.
-     *
-     * Value of the variable in seconds.
-     *
-     * @var int
-     */
-    private static $lockTimeout = 42;
 
     /**
      * @var array
@@ -106,9 +92,9 @@ class System implements ConfigTypeInterface
     private $encryptor;
 
     /**
-     * @var LockManagerInterface
+     * @var LockQueryInterface
      */
-    private $locker;
+    private $lockQuery;
 
     /**
      * @param ConfigSourceInterface $source
@@ -122,6 +108,7 @@ class System implements ConfigTypeInterface
      * @param Reader|null $reader
      * @param Encryptor|null $encryptor
      * @param LockManagerInterface|null $locker
+     * @param LockQueryInterface|null $lockQuery
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -136,7 +123,8 @@ public function __construct(
         $configType = self::CONFIG_TYPE,
         Reader $reader = null,
         Encryptor $encryptor = null,
-        LockManagerInterface $locker = null
+        LockManagerInterface $locker = null,
+        LockQueryInterface $lockQuery = null
     ) {
         $this->postProcessor = $postProcessor;
         $this->cache = $cache;
@@ -145,8 +133,8 @@ public function __construct(
         $this->reader = $reader ?: ObjectManager::getInstance()->get(Reader::class);
         $this->encryptor = $encryptor
             ?: ObjectManager::getInstance()->get(Encryptor::class);
-        $this->locker = $locker
-            ?: ObjectManager::getInstance()->get(LockManagerInterface::class);
+        $this->lockQuery = $lockQuery
+            ?: ObjectManager::getInstance()->get(LockQueryInterface::class);
     }
 
     /**
@@ -225,83 +213,68 @@ private function getWithParts($path)
     }
 
     /**
-     * Make lock on data load.
-     *
-     * @param callable $dataLoader
-     * @param bool $flush
-     * @return array
-     */
-    private function lockedLoadData(callable $dataLoader, bool $flush = false): array
-    {
-        $cachedData = $dataLoader(); //optimistic read
-
-        while ($cachedData === false && $this->locker->isLocked(self::$lockName)) {
-            usleep(self::$delayTimeout);
-            $cachedData = $dataLoader();
-        }
-
-        while ($cachedData === false) {
-            try {
-                if ($this->locker->lock(self::$lockName, self::$lockTimeout)) {
-                    if (!$flush) {
-                        $data = $this->readData();
-                        $this->cacheData($data);
-                        $cachedData = $data;
-                    } else {
-                        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
-                        $cachedData = [];
-                    }
-                }
-            } finally {
-                $this->locker->unlock(self::$lockName);
-            }
-
-            if ($cachedData === false) {
-                usleep(self::$delayTimeout);
-                $cachedData = $dataLoader();
-            }
-        }
-
-        return $cachedData;
-    }
-
-    /**
-     * Load configuration data for all scopes
+     * Load configuration data for all scopes.
      *
      * @return array
      */
     private function loadAllData()
     {
-        return $this->lockedLoadData(function () {
+        $loadAction = function () {
             $cachedData = $this->cache->load($this->configType);
             $data = false;
             if ($cachedData !== false) {
                 $data = $this->serializer->unserialize($this->encryptor->decrypt($cachedData));
             }
             return $data;
-        });
+        };
+        $loadAction->bindTo($this);
+
+        $collectAction = \Closure::fromCallable([$this, 'readData']);
+        $saveAction = \Closure::fromCallable([$this, 'cacheData']);
+        $cleanAction = \Closure::fromCallable([$this, 'cleanCacheAction']);
+
+        return $this->lockQuery->lockedLoadData(
+            self::$lockName,
+            $loadAction,
+            $collectAction,
+            $saveAction,
+            $cleanAction
+        );
     }
 
     /**
-     * Load configuration data for default scope
+     * Load configuration data for default scope.
      *
      * @param string $scopeType
      * @return array
      */
     private function loadDefaultScopeData($scopeType)
     {
-        return $this->lockedLoadData(function () use ($scopeType) {
+        $loadAction = function () use ($scopeType) {
             $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
             $scopeData = false;
             if ($cachedData !== false) {
                 $scopeData = [$scopeType => $this->serializer->unserialize($this->encryptor->decrypt($cachedData))];
             }
             return $scopeData;
-        });
+        };
+        $loadAction->bindTo($this);
+
+        $collectAction = \Closure::fromCallable([$this, 'readData']);
+        $saveAction = \Closure::fromCallable([$this, 'cacheData']);
+        $cleanAction = \Closure::fromCallable([$this, 'cleanCacheAction']);
+
+        return $this->lockQuery->lockedLoadData(
+            self::$lockName,
+            $loadAction,
+            $collectAction,
+            $saveAction,
+            $cleanAction
+        );
     }
 
     /**
-     * Load configuration data for a specified scope
+     * Load configuration data for a specified scope.
      *
      * @param string $scopeType
      * @param string $scopeId
@@ -309,7 +282,7 @@ private function loadDefaultScopeData($scopeType)
      */
     private function loadScopeData($scopeType, $scopeId)
     {
-        return $this->lockedLoadData(function () use ($scopeType, $scopeId) {
+        $loadAction = function () use ($scopeType, $scopeId) {
             $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
             $scopeData = false;
             if ($cachedData === false) {
@@ -329,7 +302,20 @@ private function loadScopeData($scopeType, $scopeId)
             }
 
             return $scopeData;
-        });
+        };
+        $loadAction->bindTo($this);
+
+        $collectAction = \Closure::fromCallable([$this, 'readData']);
+        $saveAction = \Closure::fromCallable([$this, 'cacheData']);
+        $cleanAction = \Closure::fromCallable([$this, 'cleanCacheAction']);
+
+        return $this->lockQuery->lockedLoadData(
+            self::$lockName,
+            $loadAction,
+            $collectAction,
+            $saveAction,
+            $cleanAction
+        );
     }
 
     /**
@@ -371,7 +357,17 @@ private function cacheData(array $data)
     }
 
     /**
-     * Walk nested hash map by keys from $pathParts
+     * Clean cache action.
+     *
+     * @return void
+     */
+    private function cleanCacheAction()
+    {
+        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
+    }
+
+    /**
+     * Walk nested hash map by keys from $pathParts.
      *
      * @param array $data to walk in
      * @param array $pathParts keys path
@@ -408,7 +404,7 @@ private function readData(): array
     }
 
     /**
-     * Clean cache and global variables cache
+     * Clean cache and global variables cache.
      *
      * Next items cleared:
      * - Internal property intended to store already loaded configuration data
@@ -420,10 +416,20 @@ private function readData(): array
     public function clean()
     {
         $this->data = [];
-        $this->lockedLoadData(
-            function () {
-                return false;
-            },
+        $loadAction = function () {
+            return false;
+        };
+
+        $collectAction = \Closure::fromCallable([$this, 'readData']);
+        $saveAction = \Closure::fromCallable([$this, 'cacheData']);
+        $cleanAction = \Closure::fromCallable([$this, 'cleanCacheAction']);
+
+        $this->lockQuery->lockedLoadData(
+            self::$lockName,
+            $loadAction,
+            $collectAction,
+            $saveAction,
+            $cleanAction,
             true
         );
     }
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index 87a0e666d2d7b..cf8b8b551c5d4 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -90,9 +90,18 @@
             <argument name="preProcessor" xsi:type="object">Magento\Framework\App\Config\PreProcessorComposite</argument>
             <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\Serialize</argument>
             <argument name="reader" xsi:type="object">Magento\Config\App\Config\Type\System\Reader\Proxy</argument>
-            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
+            <argument name="lockQuery" xsi:type="object">systemConfigQueryLocker</argument>
         </arguments>
     </type>
+
+    <virtualType name="systemConfigQueryLocker" type="Magento\Framework\Cache\Lock\Query">
+        <arguments>
+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
+            <argument name="lockTimeout" xsi:type="number">42</argument>
+            <argument name="delayTimeout" xsi:type="number">100000</argument>
+        </arguments>
+    </virtualType>
+
     <type name="Magento\Config\App\Config\Type\System\Reader">
         <arguments>
             <argument name="source" xsi:type="object">systemConfigSourceAggregated</argument>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 19543375aad58..376da5728b31b 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -129,6 +129,7 @@
     <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
     <preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />
     <preference for="Magento\Framework\Cache\ConfigInterface" type="Magento\Framework\Cache\Config" />
+    <preference for="Magento\Framework\Cache\LockQueryInterface" type="Magento\Framework\Cache\Lock\Query" />
     <preference for="Magento\Framework\View\Asset\MergeStrategyInterface" type="Magento\Framework\View\Asset\MergeStrategy\Direct" />
     <preference for="Magento\Framework\App\ViewInterface" type="Magento\Framework\App\View" />
     <preference for="Magento\Framework\Data\Collection\EntityFactoryInterface" type="Magento\Framework\Data\Collection\EntityFactory" />
@@ -1757,4 +1758,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Cache\Lock\Query">
+        <arguments>
+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
+            <argument name="lockTimeout" xsi:type="number">10</argument>
+            <argument name="delayTimeout" xsi:type="number">50000</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Form/ContainerTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Form/ContainerTest.php
index c11204bcdd358..e55bb026af6ff 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Form/ContainerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Form/ContainerTest.php
@@ -30,7 +30,7 @@ public function testGetFormHtml()
         $expectedHtml = '<b>html</b>';
         $this->assertNotEquals($expectedHtml, $block->getFormHtml());
         $form->setText($expectedHtml);
-        $this->assertEquals($expectedHtml, $block->getFormHtml());
+        $this->assertEquals('', $block->getFormHtml());
     }
 
     public function testPseudoConstruct()
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 3e788c1eba0ee..9abcb68c8dbec 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
@@ -212,3 +212,4 @@ Magento/Elasticsearch6/Model/Client
 Magento/CatalogSearch/Model/ResourceModel/Fulltext
 Magento/Elasticsearch/Model/Layer/Search
 Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver
+Magento/Config/App/Config/Type
diff --git a/lib/internal/Magento/Framework/Cache/Lock/Query.php b/lib/internal/Magento/Framework/Cache/Lock/Query.php
new file mode 100644
index 0000000000000..799c86c49e8ff
--- /dev/null
+++ b/lib/internal/Magento/Framework/Cache/Lock/Query.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Cache\Lock;
+
+use Magento\Framework\Cache\LockQueryInterface;
+use Magento\Framework\Lock\LockManagerInterface;
+
+/**
+ * Default mutex for cache concurrent access.
+ */
+class Query implements LockQueryInterface
+{
+    /**
+     * @var LockManagerInterface
+     */
+    private $locker;
+
+    /**
+     * Lifetime of the lock for write in cache.
+     *
+     * Value of the variable in seconds.
+     *
+     * @var int
+     */
+    private $lockTimeout;
+
+    /**
+     * Timeout between retrieves to load the configuration from the cache.
+     *
+     * Value of the variable in microseconds.
+     *
+     * @var int
+     */
+    private $delayTimeout;
+
+    /**
+     * @param LockManagerInterface $locker
+     * @param int $lockTimeout
+     * @param int $delayTimeout
+     */
+    public function __construct(
+        LockManagerInterface $locker,
+        int $lockTimeout = 10,
+        int $delayTimeout = 20000
+    ) {
+        $this->locker = $locker;
+        $this->lockTimeout = $lockTimeout;
+        $this->delayTimeout = $delayTimeout;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lockedLoadData(
+        string $lockName,
+        callable $dataLoader,
+        callable $dataCollector,
+        callable $dataSaver,
+        callable $dataCleaner,
+        bool $flush = false
+    ) {
+        $cachedData = $dataLoader(); //optimistic read
+
+        while ($cachedData === false && $this->locker->isLocked($lockName)) {
+            usleep($this->delayTimeout);
+            $cachedData = $dataLoader();
+        }
+
+        while ($cachedData === false) {
+            try {
+                if ($this->locker->lock($lockName, $this->lockTimeout)) {
+                    if (!$flush) {
+                        $data = $dataCollector();
+                        $dataSaver($data);
+                        $cachedData = $data;
+                    } else {
+                        $dataCleaner();
+                        $cachedData = [];
+                    }
+                }
+            } finally {
+                $this->locker->unlock($lockName);
+            }
+
+            if ($cachedData === false) {
+                usleep($this->delayTimeout);
+                $cachedData = $dataLoader();
+            }
+        }
+
+        return $cachedData;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Cache/LockQueryInterface.php b/lib/internal/Magento/Framework/Cache/LockQueryInterface.php
new file mode 100644
index 0000000000000..d728622e372a3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Cache/LockQueryInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Cache;
+
+interface LockQueryInterface
+{
+    /**
+     * Make lock on data load.
+     *
+     * @param string $lockName
+     * @param callable $dataLoader
+     * @param callable $dataCollector
+     * @param callable $dataSaver
+     * @param callable $dataCleaner
+     * @param bool $flush
+     * @return array
+     */
+    public function lockedLoadData(
+        string $lockName,
+        callable $dataLoader,
+        callable $dataCollector,
+        callable $dataSaver,
+        callable $dataCleaner,
+        bool $flush = false
+    );
+}
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
index 61818cbb8c53c..7cfa7274e4e31 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Cache.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
@@ -14,6 +14,11 @@
  */
 class Cache implements \Magento\Framework\Lock\LockManagerInterface
 {
+    /**
+     * Prefix for marking that key is locked or not.
+     */
+    const LOCK_PREFIX = 'LOCKED_RECORD_INFO_';
+
     /**
      * @var FrontendInterface
      */
@@ -26,12 +31,13 @@ public function __construct(FrontendInterface $cache)
     {
         $this->cache = $cache;
     }
+
     /**
      * @inheritdoc
      */
     public function lock(string $name, int $timeout = -1): bool
     {
-        return $this->cache->save('1', $name, [], $timeout);
+        return $this->cache->save('1', self::LOCK_PREFIX . $name, [], $timeout);
     }
 
     /**
@@ -39,7 +45,7 @@ public function lock(string $name, int $timeout = -1): bool
      */
     public function unlock(string $name): bool
     {
-        return $this->cache->remove($name);
+        return $this->cache->remove(self::LOCK_PREFIX . $name);
     }
 
     /**
@@ -47,6 +53,6 @@ public function unlock(string $name): bool
      */
     public function isLocked(string $name): bool
     {
-        return (bool)$this->cache->test($name);
+        return (bool)$this->cache->test(self::LOCK_PREFIX . $name);
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 335006555d2f1..9c779e7c3c651 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View\Element;
 
+use Magento\Framework\Cache\LockQueryInterface;
 use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Base class for all blocks.
@@ -175,14 +178,23 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      */
     protected $_cache;
 
+    /**
+     * @var LockQueryInterface
+     */
+    private $lockQuery;
+
     /**
      * Constructor
      *
      * @param \Magento\Framework\View\Element\Context $context
      * @param array $data
+     * @param LockQueryInterface|null $lockQuery
      */
-    public function __construct(\Magento\Framework\View\Element\Context $context, array $data = [])
-    {
+    public function __construct(
+        \Magento\Framework\View\Element\Context $context,
+        array $data = [],
+        LockQueryInterface $lockQuery = null
+    ) {
         $this->_request = $context->getRequest();
         $this->_layout = $context->getLayout();
         $this->_eventManager = $context->getEventManager();
@@ -204,6 +216,8 @@ public function __construct(\Magento\Framework\View\Element\Context $context, ar
             $this->jsLayout = $data['jsLayout'];
             unset($data['jsLayout']);
         }
+        $this->lockQuery = $lockQuery
+            ?: ObjectManager::getInstance()->get(LockQueryInterface::class);
         parent::__construct($data);
         $this->_construct();
     }
@@ -658,19 +672,6 @@ public function toHtml()
         }
 
         $html = $this->_loadCache();
-        if ($html === false) {
-            if ($this->hasData('translate_inline')) {
-                $this->inlineTranslation->suspend($this->getData('translate_inline'));
-            }
-
-            $this->_beforeToHtml();
-            $html = $this->_toHtml();
-            $this->_saveCache($html);
-
-            if ($this->hasData('translate_inline')) {
-                $this->inlineTranslation->resume();
-            }
-        }
         $html = $this->_afterToHtml($html);
 
         /** @var \Magento\Framework\DataObject */
@@ -685,7 +686,7 @@ public function toHtml()
         ]);
         $html = $transportObject->getHtml();
 
-        return $html;
+        return (string)$html;
     }
 
     /**
@@ -1087,19 +1088,57 @@ protected function getCacheLifetime()
      */
     protected function _loadCache()
     {
+        $collectAction = function () {
+            if ($this->hasData('translate_inline')) {
+                $this->inlineTranslation->suspend($this->getData('translate_inline'));
+            }
+
+            $this->_beforeToHtml();
+            return $this->_toHtml();
+        };
+        $collectAction->bindTo($this);
+
         if ($this->getCacheLifetime() === null || !$this->_cacheState->isEnabled(self::CACHE_GROUP)) {
-            return false;
-        }
-        $cacheKey = $this->getCacheKey();
-        $cacheData = $this->_cache->load($cacheKey);
-        if ($cacheData) {
-            $cacheData = str_replace(
-                $this->_getSidPlaceholder($cacheKey),
-                $this->_sidResolver->getSessionIdQueryParam($this->_session) . '=' . $this->_session->getSessionId(),
-                $cacheData
-            );
+            $html = $collectAction();
+            if ($this->hasData('translate_inline')) {
+                $this->inlineTranslation->resume();
+            }
+            return $html;
         }
-        return $cacheData;
+        $loadAction = function () {
+            $cacheKey = $this->getCacheKey();
+            $cacheData = $this->_cache->load($cacheKey);
+            if ($cacheData) {
+                $cacheData = str_replace(
+                    $this->_getSidPlaceholder($cacheKey),
+                    $this->_sidResolver->getSessionIdQueryParam($this->_session)
+                    . '='
+                    . $this->_session->getSessionId(),
+                    $cacheData
+                );
+            }
+            return $cacheData;
+        };
+        $loadAction->bindTo($this);
+
+        $saveAction = function ($data) {
+            $this->_saveCache($data);
+            if ($this->hasData('translate_inline')) {
+                $this->inlineTranslation->resume();
+            }
+        };
+        $saveAction->bindTo($this);
+
+        $cleanAction = function () {
+        };
+
+        return $this->lockQuery->lockedLoadData(
+            $this->getCacheKey(),
+            $loadAction,
+            $collectAction,
+            $saveAction,
+            $cleanAction
+        );
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
index 5f7508438a6ed..833b1ced20c06 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\View\Test\Unit\Element;
 
+use Magento\Framework\Cache\LockQueryInterface;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Context;
 use Magento\Framework\Config\View;
@@ -13,7 +14,6 @@
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Cache\StateInterface as CacheStateInterface;
-use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Session\SidResolverInterface;
 use Magento\Framework\Session\SessionManagerInterface;
 
@@ -42,11 +42,6 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
      */
     private $cacheStateMock;
 
-    /**
-     * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $cacheMock;
-
     /**
      * @var SidResolverInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -57,6 +52,11 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
      */
     private $sessionMock;
 
+    /**
+     * @var LockQueryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $lockQuery;
+
     /**
      * @return void
      */
@@ -65,7 +65,7 @@ protected function setUp()
         $this->eventManagerMock = $this->getMockForAbstractClass(EventManagerInterface::class);
         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->cacheStateMock = $this->getMockForAbstractClass(CacheStateInterface::class);
-        $this->cacheMock = $this->getMockForAbstractClass(CacheInterface::class);
+        $this->lockQuery = $this->getMockForAbstractClass(LockQueryInterface::class);
         $this->sidResolverMock = $this->getMockForAbstractClass(SidResolverInterface::class);
         $this->sessionMock = $this->getMockForAbstractClass(SessionManagerInterface::class);
         $contextMock = $this->createMock(Context::class);
@@ -78,9 +78,6 @@ protected function setUp()
         $contextMock->expects($this->once())
             ->method('getCacheState')
             ->willReturn($this->cacheStateMock);
-        $contextMock->expects($this->once())
-            ->method('getCache')
-            ->willReturn($this->cacheMock);
         $contextMock->expects($this->once())
             ->method('getSidResolver')
             ->willReturn($this->sidResolverMock);
@@ -89,7 +86,11 @@ protected function setUp()
             ->willReturn($this->sessionMock);
         $this->block = $this->getMockForAbstractClass(
             AbstractBlock::class,
-            ['context' => $contextMock]
+            [
+                'context' => $contextMock,
+                'data' => [],
+                'lockQuery' => $this->lockQuery
+            ]
         );
     }
 
@@ -219,10 +220,7 @@ public function testToHtmlWhenModuleIsDisabled()
     /**
      * @param string|bool $cacheLifetime
      * @param string|bool $dataFromCache
-     * @param string $dataForSaveCache
      * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsDispatchEvent
-     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheLoad
-     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheSave
      * @param string $expectedResult
      * @return void
      * @dataProvider getCacheLifetimeDataProvider
@@ -230,10 +228,7 @@ public function testToHtmlWhenModuleIsDisabled()
     public function testGetCacheLifetimeViaToHtml(
         $cacheLifetime,
         $dataFromCache,
-        $dataForSaveCache,
         $expectsDispatchEvent,
-        $expectsCacheLoad,
-        $expectsCacheSave,
         $expectedResult
     ) {
         $moduleName = 'Test';
@@ -252,13 +247,9 @@ public function testGetCacheLifetimeViaToHtml(
             ->method('isEnabled')
             ->with(AbstractBlock::CACHE_GROUP)
             ->willReturn(true);
-        $this->cacheMock->expects($expectsCacheLoad)
-            ->method('load')
-            ->with(AbstractBlock::CACHE_KEY_PREFIX . $cacheKey)
+        $this->lockQuery->expects($this->any())
+            ->method('lockedLoadData')
             ->willReturn($dataFromCache);
-        $this->cacheMock->expects($expectsCacheSave)
-            ->method('save')
-            ->with($dataForSaveCache, AbstractBlock::CACHE_KEY_PREFIX . $cacheKey);
         $this->sidResolverMock->expects($this->any())
             ->method('getSessionIdQueryParam')
             ->with($this->sessionMock)
@@ -279,46 +270,31 @@ public function getCacheLifetimeDataProvider()
             [
                 'cacheLifetime' => null,
                 'dataFromCache' => 'dataFromCache',
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->never(),
-                'expectsCacheSave' => $this->never(),
                 'expectedResult' => '',
             ],
             [
                 'cacheLifetime' => false,
                 'dataFromCache' => 'dataFromCache',
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->never(),
-                'expectsCacheSave' => $this->never(),
                 'expectedResult' => '',
             ],
             [
                 'cacheLifetime' => 120,
                 'dataFromCache' => 'dataFromCache',
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->once(),
-                'expectsCacheSave' => $this->never(),
                 'expectedResult' => 'dataFromCache',
             ],
             [
                 'cacheLifetime' => '120string',
                 'dataFromCache' => 'dataFromCache',
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->once(),
-                'expectsCacheSave' => $this->never(),
                 'expectedResult' => 'dataFromCache',
             ],
             [
                 'cacheLifetime' => 120,
                 'dataFromCache' => false,
-                'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->once(),
-                'expectsCacheSave' => $this->once(),
                 'expectedResult' => '',
             ],
         ];

From c8ed1e8ce498174df804b578665a5bcfd4c9e850 Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Fri, 15 Mar 2019 18:21:11 +0200
Subject: [PATCH 0606/1055] #21734 Error in JS validation rule

---
 .../Magento/Ui/view/base/web/js/lib/validation/rules.js     | 6 +++---
 lib/web/mage/validation.js                                  | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
index d765f842a0895..97b47f77beeab 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
@@ -920,12 +920,12 @@ define([
         ],
         'validate-per-page-value-list': [
             function (value) {
-                var isValid = utils.isEmpty(value),
+                var isValid = true,
                     values = value.split(','),
                     i;
 
-                if (isValid) {
-                    return true;
+                if (utils.isEmpty(value)) {
+                    return isValid;
                 }
 
                 for (i = 0; i < values.length; i++) {
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index dfa35473176b9..a57191fd4aff4 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1431,10 +1431,14 @@
         ],
         'validate-per-page-value-list': [
             function (v) {
-                var isValid = !$.mage.isEmpty(v),
+                var isValid = true,
                     values = v.split(','),
                     i;
 
+                if ($.mage.isEmpty(v)) {
+                    return isValid;
+                }
+
                 for (i = 0; i < values.length; i++) {
                     if (!/^[0-9]+$/.test(values[i])) {
                         isValid = false;

From 885b7a99397e52e1b094c3d23c314ca508429b3b Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Fri, 15 Mar 2019 11:24:06 -0500
Subject: [PATCH 0607/1055] MAGETWO-98592: [Elastic] Fix catalog search with
 elasticsearch6

---
 app/code/Magento/Elasticsearch6/etc/di.xml | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 9999c29c1a257..011dfa1019738 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -170,4 +170,36 @@
             </argument>
         </arguments>
     </type>
+
+    <virtualType name="elasticsearchLayerCategoryItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Category\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="object">elasticsearchCategoryCollectionFactory</item>
+            </argument>
+        </arguments>
+    </virtualType>
+
+    <type name="Magento\CatalogSearch\Model\Search\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="object">elasticsearchAdvancedCollectionFactory</item>
+            </argument>
+        </arguments>
+    </type>
+
+    <type name="Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyProvider">
+        <arguments>
+            <argument name="strategies" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="object">Magento\Elasticsearch\Model\Advanced\ProductCollectionPrepareStrategy</item>
+            </argument>
+        </arguments>
+    </type>
+
+    <virtualType name="elasticsearchLayerSearchItemCollectionProvider" type="Magento\Elasticsearch\Model\Layer\Search\ItemCollectionProvider">
+        <arguments>
+            <argument name="factories" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="object">elasticsearchFulltextSearchCollectionFactory</item>
+            </argument>
+        </arguments>
+    </virtualType>
 </config>

From 3e90069c0f65e2e672379b82bd3684145ede9820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Ca=C3=A7ador?= <samuelmoreira27@gmail.com>
Date: Fri, 15 Mar 2019 16:47:36 +0000
Subject: [PATCH 0608/1055] Multishipping checkout agreements now are the same
 as default checkout agreements

---
 .../multishipping_checkout_overview.xml       |  2 +-
 .../templates/multishipping_agreements.phtml  | 49 -------------------
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml

diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml
index 3f742de0177da..122160f1a10cd 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.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="checkout_overview">
-            <block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="Magento_CheckoutAgreements::multishipping_agreements.phtml"/>
+            <block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="Magento_CheckoutAgreements::additional_agreements.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
deleted file mode 100644
index 3400770f5cee8..0000000000000
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-?>
-<?php
-/**
- * @var $block \Magento\CheckoutAgreements\Block\Agreements
- */
-?>
-<?php if (!$block->getAgreements()) {
-    return;
-} ?>
-<ol id="checkout-agreements" class="agreements checkout items">
-    <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
-    <?php foreach ($block->getAgreements() as $agreement): ?>
-        <li class="item">
-            <div class="checkout-agreement-item-content"<?= ($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
-                <?php if ($agreement->getIsHtml()):?>
-                    <?= /* @escapeNotVerified */ $agreement->getContent() ?>
-                <?php else:?>
-                    <?= nl2br($block->escapeHtml($agreement->getContent())) ?>
-                <?php endif; ?>
-            </div>
-            <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
-            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
-                <input type="checkbox"
-                       id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
-                       name="agreement[<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>]"
-                       value="1"
-                       title="<?= $block->escapeHtml($agreement->getCheckboxText()) ?>"
-                       class="checkbox"
-                       data-validate="{required:true}"/>
-                <label class="label" for="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>">
-                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
-                </label>
-            </div>
-            <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
-            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
-                <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
-            </div>
-            <?php endif; ?>
-        </li>
-    <?php endforeach ?>
-</ol>

From 67b975aa58cf4e9ab82fd5a071df85cd9cc44da4 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Fri, 15 Mar 2019 14:40:09 -0500
Subject: [PATCH 0609/1055] MC-4433: Convert SearchEntityResultsTest to MFTF

- Fixed QuickSearchAndAddToCartBundleFixed, QuickSearchAndAddToCartGrouped, QuickSearchProductByNameWithSpecialChars, QuickSearchTwoProductsWithSameWeight tests
---
 .../StorefrontProductCartActionGroup.xml           |  9 +++++++++
 .../AdminProductAttributeActionGroup.xml           |  1 +
 .../Magento/Catalog/Test/Mftf/Data/ProductData.xml |  3 ++-
 .../Test/Mftf/Test/SearchEntityResultsTest.xml     | 14 ++++++++------
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index 8813ad97e54d3..1767db0a00974 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -49,4 +49,13 @@
         <waitForElementVisible selector="{{StorefrontMinicartSection.productCount}}" stepKey="waitProductCount"/>
         <see userInput="You added {{productName}} to your shopping cart." selector="{{StorefrontMessagesSection.success}}" stepKey="seeSuccessMessage"/>
     </actionGroup>
+
+    <!-- Add Bundled Product to Cart with selected multiselect option-->
+    <actionGroup name="StorefrontAddBundleProductFromProductToCartWithMultiOption" extends="StorefrontAddBundleProductFromProductToCartActionGroup">
+        <arguments>
+            <argument name="optionName" type="string"/>
+            <argument name="value" type="string"/>
+        </arguments>
+        <selectOption selector="{{StorefrontBundledSection.multiselectOptionFourProducts(optionName)}}" userInput="{{value}}" stepKey="selectValue" before="clickAddBundleProductToCart"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index 230289794b7e2..86158aba68f82 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -73,6 +73,7 @@
             <argument name="attributeType" type="string" defaultValue="TextField"/>
         </arguments>
         <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
+        <waitForPageLoad stepKey="waitForSidePanel"/>
         <see userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
         <click selector="{{AdminProductFormAttributeSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
         <fillField selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" userInput="{{attributeName}}" stepKey="fillAttributeLabel"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 2b3cf6c66d67f..0714c47e17a44 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -896,7 +896,8 @@
         <data key="name" unique="suffix">BBB Product</data>
     </entity>
     <entity name="productWithSpecialCharacters" type="product" extends="_defaultProduct">
-        <data key="name" unique="suffix">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=~` </data>
+        <data key="name" unique="suffix">Product "!@#$%^&amp;*()+:;\|}{][?=~` </data>
+        <data key="nameWithSafeChars" unique="suffix">|}{][?=~` </data>
     </entity>
     <entity name="productWith130CharName" type="product" extends="_defaultProduct">
         <data key="name" unique="suffix">ProductWith128Chars 1234567891123456789112345678911234567891123456789112345678911234567891123456789112345678 endnums</data>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
index bd465b1570848..b65b199507ac1 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -405,7 +405,6 @@
         </before>
         <after>
             <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
-            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
@@ -516,16 +515,19 @@
             <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
+        <comment userInput="$simpleProduct1.name$" stepKey="asdf"/>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
-        <argument name="phrase" value="$createBundleProduct.name$"/>
+            <argument name="phrase" value="$createBundleProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
-        <argument name="productName" value="$createBundleProduct.name$"/>
-        <argument name="productUrlKey" value="$createBundleProduct.custom_attributes[url_key]$"/>
+            <argument name="productName" value="$createBundleProduct.name$"/>
+            <argument name="productUrlKey" value="$createBundleProduct.custom_attributes[url_key]$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAddBundleProductFromProductToCartActionGroup" stepKey="addProductToCart">
-        <argument name="productName" value="$createBundleProduct.name$"/>
+        <actionGroup ref="StorefrontAddBundleProductFromProductToCartWithMultiOption" stepKey="addProductToCart">
+            <argument name="productName" value="$createBundleProduct.name$"/>
+            <argument name="optionName" value="$createBundleOption1_1.name$"/>
+            <argument name="value" value="$simpleProduct1.name$"/>
         </actionGroup>
     </test>
 

From c76c16363da85ddfb3fa169b3f4d1a5fea7ad843 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Fri, 15 Mar 2019 14:52:13 -0500
Subject: [PATCH 0610/1055] MC-4433: Convert SearchEntityResultsTest to MFTF

- Removed commented out entity
---
 app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
index 72c0734dbe67a..c836b0d90d13d 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
@@ -63,9 +63,4 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
         <requiredEntity type="downloadable_link">apiDownloadableLink</requiredEntity>
     </entity>
-    <!--<entity name="InStockDownloadableProduct" extends="DownloadableProduct">-->
-        <!--<data key="visibility">4</data>-->
-        <!--<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>-->
-        <!--<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>-->
-    <!--</entity>-->
 </entities>

From 9e8a384618a3179031dbc937bd08247a0ed020ae Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 15 Mar 2019 15:00:15 -0500
Subject: [PATCH 0611/1055] MQE-1481: Investigate failing test
 AdminCreateCustomProductAttributeWithDropdownFieldTest

---
 .../AdminCreateCustomProductAttributeWithDropdownFieldTest.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
index 09b49011938e8..323a0a3a33513 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
@@ -69,7 +69,7 @@
         <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.defaultStoreView('0')}}" stepKey="waitForDefaultStoreViewToVisible"/>
         <fillField selector="{{AdminCreateNewProductAttributeSection.defaultStoreView('0')}}" userInput="{{ProductAttributeOption8.label}}" stepKey="fillDefaultStoreView"/>
         <fillField selector="{{AdminCreateNewProductAttributeSection.adminOption('0')}}" userInput="{{ProductAttributeOption8.value}}" stepKey="fillAdminField"/>
-        <checkOption selector="{{AdminCreateNewProductAttributeSection.defaultRadioButton('1')}}" stepKey="selectRadioButton"/>
+        <click selector="{{AdminCreateNewProductAttributeSection.defaultRadioButton('1')}}" stepKey="clickDefaultRadioButton"/>
         <click selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}" stepKey="clickOnAdvancedAttributeProperties"/>
         <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="waitForAttributeCodeToVisible"/>
         <scrollTo selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="scrollToAttributeCode"/>

From d2e5a19bc5e0bdf991ecbeff465fc5a00352173d Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Fri, 15 Mar 2019 16:13:33 -0500
Subject: [PATCH 0612/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

- changes after CR
---
 .../Magento/Config/App/Config/Type/System.php | 67 ++++---------------
 app/code/Magento/Config/etc/di.xml            |  6 +-
 app/etc/di.xml                                |  7 +-
 .../Query.php => LockGuardedCacheLoader.php}  | 36 ++++------
 .../Framework/Cache/LockQueryInterface.php    | 30 ---------
 .../Framework/View/Element/AbstractBlock.php  | 19 ++----
 .../Test/Unit/Element/AbstractBlockTest.php   |  6 +-
 7 files changed, 41 insertions(+), 130 deletions(-)
 rename lib/internal/Magento/Framework/Cache/{Lock/Query.php => LockGuardedCacheLoader.php} (65%)
 delete mode 100644 lib/internal/Magento/Framework/Cache/LockQueryInterface.php

diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index 09e4e7b5b9bd2..36fefcb86217d 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -14,7 +14,7 @@
 use Magento\Config\App\Config\Type\System\Reader;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\Cache\FrontendInterface;
-use Magento\Framework\Cache\LockQueryInterface;
+use Magento\Framework\Cache\LockGuardedCacheLoader;
 use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Store\Model\Config\Processor\Fallback;
@@ -92,7 +92,7 @@ class System implements ConfigTypeInterface
     private $encryptor;
 
     /**
-     * @var LockQueryInterface
+     * @var LockGuardedCacheLoader
      */
     private $lockQuery;
 
@@ -108,7 +108,7 @@ class System implements ConfigTypeInterface
      * @param Reader|null $reader
      * @param Encryptor|null $encryptor
      * @param LockManagerInterface|null $locker
-     * @param LockQueryInterface|null $lockQuery
+     * @param LockGuardedCacheLoader|null $lockQuery
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -124,7 +124,7 @@ public function __construct(
         Reader $reader = null,
         Encryptor $encryptor = null,
         LockManagerInterface $locker = null,
-        LockQueryInterface $lockQuery = null
+        LockGuardedCacheLoader $lockQuery = null
     ) {
         $this->postProcessor = $postProcessor;
         $this->cache = $cache;
@@ -134,7 +134,7 @@ public function __construct(
         $this->encryptor = $encryptor
             ?: ObjectManager::getInstance()->get(Encryptor::class);
         $this->lockQuery = $lockQuery
-            ?: ObjectManager::getInstance()->get(LockQueryInterface::class);
+            ?: ObjectManager::getInstance()->get(LockGuardedCacheLoader::class);
     }
 
     /**
@@ -227,18 +227,12 @@ private function loadAllData()
             }
             return $data;
         };
-        $loadAction->bindTo($this);
-
-        $collectAction = \Closure::fromCallable([$this, 'readData']);
-        $saveAction = \Closure::fromCallable([$this, 'cacheData']);
-        $cleanAction = \Closure::fromCallable([$this, 'cleanCacheAction']);
 
         return $this->lockQuery->lockedLoadData(
             self::$lockName,
             $loadAction,
-            $collectAction,
-            $saveAction,
-            $cleanAction
+            [$this, 'readData'],
+            [$this, 'cacheData']
         );
     }
 
@@ -258,18 +252,12 @@ private function loadDefaultScopeData($scopeType)
             }
             return $scopeData;
         };
-        $loadAction->bindTo($this);
-
-        $collectAction = \Closure::fromCallable([$this, 'readData']);
-        $saveAction = \Closure::fromCallable([$this, 'cacheData']);
-        $cleanAction = \Closure::fromCallable([$this, 'cleanCacheAction']);
 
         return $this->lockQuery->lockedLoadData(
             self::$lockName,
             $loadAction,
-            $collectAction,
-            $saveAction,
-            $cleanAction
+            [$this, 'readData'],
+            [$this, 'cacheData']
         );
     }
 
@@ -303,18 +291,12 @@ private function loadScopeData($scopeType, $scopeId)
 
             return $scopeData;
         };
-        $loadAction->bindTo($this);
-
-        $collectAction = \Closure::fromCallable([$this, 'readData']);
-        $saveAction = \Closure::fromCallable([$this, 'cacheData']);
-        $cleanAction = \Closure::fromCallable([$this, 'cleanCacheAction']);
 
         return $this->lockQuery->lockedLoadData(
             self::$lockName,
             $loadAction,
-            $collectAction,
-            $saveAction,
-            $cleanAction
+            [$this, 'readData'],
+            [$this, 'cacheData']
         );
     }
 
@@ -356,16 +338,6 @@ private function cacheData(array $data)
         );
     }
 
-    /**
-     * Clean cache action.
-     *
-     * @return void
-     */
-    private function cleanCacheAction()
-    {
-        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
-    }
-
     /**
      * Walk nested hash map by keys from $pathParts.
      *
@@ -416,21 +388,6 @@ private function readData(): array
     public function clean()
     {
         $this->data = [];
-        $loadAction = function () {
-            return false;
-        };
-
-        $collectAction = \Closure::fromCallable([$this, 'readData']);
-        $saveAction = \Closure::fromCallable([$this, 'cacheData']);
-        $cleanAction = \Closure::fromCallable([$this, 'cleanCacheAction']);
-
-        $this->lockQuery->lockedLoadData(
-            self::$lockName,
-            $loadAction,
-            $collectAction,
-            $saveAction,
-            $cleanAction,
-            true
-        );
+        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
     }
 }
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index cf8b8b551c5d4..920cac382fcbf 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -94,11 +94,11 @@
         </arguments>
     </type>
 
-    <virtualType name="systemConfigQueryLocker" type="Magento\Framework\Cache\Lock\Query">
+    <virtualType name="systemConfigQueryLocker" type="Magento\Framework\Cache\LockGuardedCacheLoader">
         <arguments>
             <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
-            <argument name="lockTimeout" xsi:type="number">42</argument>
-            <argument name="delayTimeout" xsi:type="number">100000</argument>
+            <argument name="lockTimeout" xsi:type="number">42000</argument>
+            <argument name="delayTimeout" xsi:type="number">100</argument>
         </arguments>
     </virtualType>
 
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 376da5728b31b..ce29bdc526463 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -129,7 +129,6 @@
     <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
     <preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />
     <preference for="Magento\Framework\Cache\ConfigInterface" type="Magento\Framework\Cache\Config" />
-    <preference for="Magento\Framework\Cache\LockQueryInterface" type="Magento\Framework\Cache\Lock\Query" />
     <preference for="Magento\Framework\View\Asset\MergeStrategyInterface" type="Magento\Framework\View\Asset\MergeStrategy\Direct" />
     <preference for="Magento\Framework\App\ViewInterface" type="Magento\Framework\App\View" />
     <preference for="Magento\Framework\Data\Collection\EntityFactoryInterface" type="Magento\Framework\Data\Collection\EntityFactory" />
@@ -1758,11 +1757,11 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Cache\Lock\Query">
+    <type name="Magento\Framework\Cache\LockGuardedCacheLoader">
         <arguments>
             <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
-            <argument name="lockTimeout" xsi:type="number">10</argument>
-            <argument name="delayTimeout" xsi:type="number">50000</argument>
+            <argument name="lockTimeout" xsi:type="number">10000</argument>
+            <argument name="delayTimeout" xsi:type="number">20</argument>
         </arguments>
     </type>
 </config>
diff --git a/lib/internal/Magento/Framework/Cache/Lock/Query.php b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
similarity index 65%
rename from lib/internal/Magento/Framework/Cache/Lock/Query.php
rename to lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
index 799c86c49e8ff..39c132503daf8 100644
--- a/lib/internal/Magento/Framework/Cache/Lock/Query.php
+++ b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
@@ -4,15 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\Cache\Lock;
+namespace Magento\Framework\Cache;
 
-use Magento\Framework\Cache\LockQueryInterface;
 use Magento\Framework\Lock\LockManagerInterface;
 
 /**
- * Default mutex for cache concurrent access.
+ * Default mutex that provide concurrent access to cache storage.
  */
-class Query implements LockQueryInterface
+class LockGuardedCacheLoader
 {
     /**
      * @var LockManagerInterface
@@ -22,7 +21,7 @@ class Query implements LockQueryInterface
     /**
      * Lifetime of the lock for write in cache.
      *
-     * Value of the variable in seconds.
+     * Value of the variable in milliseconds.
      *
      * @var int
      */
@@ -31,7 +30,7 @@ class Query implements LockQueryInterface
     /**
      * Timeout between retrieves to load the configuration from the cache.
      *
-     * Value of the variable in microseconds.
+     * Value of the variable in milliseconds.
      *
      * @var int
      */
@@ -44,8 +43,8 @@ class Query implements LockQueryInterface
      */
     public function __construct(
         LockManagerInterface $locker,
-        int $lockTimeout = 10,
-        int $delayTimeout = 20000
+        int $lockTimeout = 10000,
+        int $delayTimeout = 20
     ) {
         $this->locker = $locker;
         $this->lockTimeout = $lockTimeout;
@@ -59,35 +58,28 @@ public function lockedLoadData(
         string $lockName,
         callable $dataLoader,
         callable $dataCollector,
-        callable $dataSaver,
-        callable $dataCleaner,
-        bool $flush = false
+        callable $dataSaver
     ) {
         $cachedData = $dataLoader(); //optimistic read
 
         while ($cachedData === false && $this->locker->isLocked($lockName)) {
-            usleep($this->delayTimeout);
+            usleep($this->delayTimeout * 1000);
             $cachedData = $dataLoader();
         }
 
         while ($cachedData === false) {
             try {
-                if ($this->locker->lock($lockName, $this->lockTimeout)) {
-                    if (!$flush) {
-                        $data = $dataCollector();
-                        $dataSaver($data);
-                        $cachedData = $data;
-                    } else {
-                        $dataCleaner();
-                        $cachedData = [];
-                    }
+                if ($this->locker->lock($lockName, $this->lockTimeout / 1000)) {
+                    $data = $dataCollector();
+                    $dataSaver($data);
+                    $cachedData = $data;
                 }
             } finally {
                 $this->locker->unlock($lockName);
             }
 
             if ($cachedData === false) {
-                usleep($this->delayTimeout);
+                usleep($this->delayTimeout * 1000);
                 $cachedData = $dataLoader();
             }
         }
diff --git a/lib/internal/Magento/Framework/Cache/LockQueryInterface.php b/lib/internal/Magento/Framework/Cache/LockQueryInterface.php
deleted file mode 100644
index d728622e372a3..0000000000000
--- a/lib/internal/Magento/Framework/Cache/LockQueryInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Cache;
-
-interface LockQueryInterface
-{
-    /**
-     * Make lock on data load.
-     *
-     * @param string $lockName
-     * @param callable $dataLoader
-     * @param callable $dataCollector
-     * @param callable $dataSaver
-     * @param callable $dataCleaner
-     * @param bool $flush
-     * @return array
-     */
-    public function lockedLoadData(
-        string $lockName,
-        callable $dataLoader,
-        callable $dataCollector,
-        callable $dataSaver,
-        callable $dataCleaner,
-        bool $flush = false
-    );
-}
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 9c779e7c3c651..00edfc628d936 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\View\Element;
 
-use Magento\Framework\Cache\LockQueryInterface;
+use Magento\Framework\Cache\LockGuardedCacheLoader;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\App\ObjectManager;
 
@@ -179,7 +179,7 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
     protected $_cache;
 
     /**
-     * @var LockQueryInterface
+     * @var LockGuardedCacheLoader
      */
     private $lockQuery;
 
@@ -188,12 +188,12 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      *
      * @param \Magento\Framework\View\Element\Context $context
      * @param array $data
-     * @param LockQueryInterface|null $lockQuery
+     * @param LockGuardedCacheLoader|null $lockQuery
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
         array $data = [],
-        LockQueryInterface $lockQuery = null
+        LockGuardedCacheLoader $lockQuery = null
     ) {
         $this->_request = $context->getRequest();
         $this->_layout = $context->getLayout();
@@ -217,7 +217,7 @@ public function __construct(
             unset($data['jsLayout']);
         }
         $this->lockQuery = $lockQuery
-            ?: ObjectManager::getInstance()->get(LockQueryInterface::class);
+            ?: ObjectManager::getInstance()->get(LockGuardedCacheLoader::class);
         parent::__construct($data);
         $this->_construct();
     }
@@ -1096,7 +1096,6 @@ protected function _loadCache()
             $this->_beforeToHtml();
             return $this->_toHtml();
         };
-        $collectAction->bindTo($this);
 
         if ($this->getCacheLifetime() === null || !$this->_cacheState->isEnabled(self::CACHE_GROUP)) {
             $html = $collectAction();
@@ -1119,7 +1118,6 @@ protected function _loadCache()
             }
             return $cacheData;
         };
-        $loadAction->bindTo($this);
 
         $saveAction = function ($data) {
             $this->_saveCache($data);
@@ -1127,17 +1125,12 @@ protected function _loadCache()
                 $this->inlineTranslation->resume();
             }
         };
-        $saveAction->bindTo($this);
-
-        $cleanAction = function () {
-        };
 
         return $this->lockQuery->lockedLoadData(
             $this->getCacheKey(),
             $loadAction,
             $collectAction,
-            $saveAction,
-            $cleanAction
+            $saveAction
         );
     }
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
index 833b1ced20c06..dbc16b808c47e 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\View\Test\Unit\Element;
 
-use Magento\Framework\Cache\LockQueryInterface;
+use Magento\Framework\Cache\LockGuardedCacheLoader;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Context;
 use Magento\Framework\Config\View;
@@ -53,7 +53,7 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
     private $sessionMock;
 
     /**
-     * @var LockQueryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LockGuardedCacheLoader|\PHPUnit_Framework_MockObject_MockObject
      */
     private $lockQuery;
 
@@ -65,7 +65,7 @@ protected function setUp()
         $this->eventManagerMock = $this->getMockForAbstractClass(EventManagerInterface::class);
         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->cacheStateMock = $this->getMockForAbstractClass(CacheStateInterface::class);
-        $this->lockQuery = $this->getMockForAbstractClass(LockQueryInterface::class);
+        $this->lockQuery = $this->getMockForAbstractClass(LockGuardedCacheLoader::class);
         $this->sidResolverMock = $this->getMockForAbstractClass(SidResolverInterface::class);
         $this->sessionMock = $this->getMockForAbstractClass(SessionManagerInterface::class);
         $contextMock = $this->createMock(Context::class);

From 49bbec42b9e03e0d95314bc215f2581ecdd99061 Mon Sep 17 00:00:00 2001
From: Mike Hatch <4390485+mikeshatch@users.noreply.github.com>
Date: Fri, 15 Mar 2019 16:30:41 -0500
Subject: [PATCH 0613/1055] Edited headings to be more consistent

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e73da84d66f46..9e3cf448f99fb 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,14 @@
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
-## Magento system requirements
-[Magento system requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
+## Magento System Requirements
+[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
 
 ## Install Magento
 
-*	[Installation guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
+*	[Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
 
-<h2>Contributing to the Magento 2 code base</h2>
+<h2>Contributing to the Magento 2 Code Base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
 
 To learn about how to make a contribution, click [here][1].
@@ -39,11 +39,11 @@ Magento is thankful for any contribution that can improve our code base, documen
     <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
 </a>
 
-### Labels applied by the Magento team
+### Labels Applied by the Magento Team
 We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
 Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
 
-## Reporting security issues
+## Reporting Security Issues
 
 To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
 

From b3a9e2122cf59eeb2cdd72145dad8596ac33ee4f Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 15 Mar 2019 16:45:35 -0500
Subject: [PATCH 0614/1055] MQE-1476: Deliver weekly PR

---
 .../StorefrontCatalogSearchActionGroup.xml     |  5 ++---
 .../AdminMassDeleteSearchTermEntityTest.xml    | 18 +++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index d99d1b69887ed..4b52b2c669edf 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -11,10 +11,9 @@
     <!-- Quick search the phrase and check if the result page contains correct information -->
     <actionGroup name="StorefrontCheckQuickSearchActionGroup">
         <arguments>
-            <argument name="phrase" type="string"/>
+            <argument name="phrase" />
         </arguments>
-        <fillField stepKey="fillInput" selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{phrase}}"/>
-        <submitForm selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" parameterArray="[]" stepKey="submitQuickSearch" />
+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{phrase}}]" stepKey="fillQuickSearch" />
         <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
         <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
         <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
index eb0797d07bf18..67ccb51bf401e 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
@@ -39,13 +39,13 @@
 
         <!-- Select all created below search terms -->
         <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByFirstSearchQuery">
-            <argument name="searchQuery" value="$createFirstSearchTerm.query_text$"/>
+            <argument name="searchQuery" value="$$createFirstSearchTerm.query_text$$"/>
         </actionGroup>
         <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterBySecondSearchQuery">
-            <argument name="searchQuery" value="$createSecondSearchTerm.query_text$"/>
+            <argument name="searchQuery" value="$$createSecondSearchTerm.query_text$$"/>
         </actionGroup>
         <actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByThirdSearchQuery">
-            <argument name="searchQuery" value="$createThirdSearchTerm.query_text$"/>
+            <argument name="searchQuery" value="$$createThirdSearchTerm.query_text$$"/>
         </actionGroup>
 
         <!-- Delete created below search terms -->
@@ -53,13 +53,13 @@
 
         <!-- Assert search terms are absent on the search term page -->
         <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertFirstSearchTermNotInGrid">
-            <argument name="searchQuery" value="$createFirstSearchTerm.query_text$"/>
+            <argument name="searchQuery" value="$$createFirstSearchTerm.query_text$$"/>
         </actionGroup>
         <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertSecondSearchTermNotInGrid">
-            <argument name="searchQuery" value="$createSecondSearchTerm.query_text$"/>
+            <argument name="searchQuery" value="$$createSecondSearchTerm.query_text$$"/>
         </actionGroup>
         <actionGroup ref="AssertSearchTermNotInGrid" stepKey="assertThirdSearchTermNotInGrid">
-            <argument name="searchQuery" value="$createThirdSearchTerm.query_text$"/>
+            <argument name="searchQuery" value="$$createThirdSearchTerm.query_text$$"/>
         </actionGroup>
 
         <!-- Go to storefront page -->
@@ -68,15 +68,15 @@
 
         <!-- Verify search term deletion on storefront -->
         <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForFirstSearchTerm">
-            <argument name="phrase" value="$createFirstSearchTerm.query_text$"/>
+            <argument name="phrase" value="$$createFirstSearchTerm.query_text$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForFirstSearchTerm"/>
         <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForSecondSearchTerm">
-            <argument name="phrase" value="$createSecondSearchTerm.query_text$"/>
+            <argument name="phrase" value="$$createSecondSearchTerm.query_text$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForSecondSearchTerm"/>
         <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="quickSearchForThirdSearchTerm">
-            <argument name="phrase" value="$createThirdSearchTerm.query_text$"/>
+            <argument name="phrase" value="$$createThirdSearchTerm.query_text$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForThirdSearchTerm"/>
     </test>

From b80c9dcbcbb04f61d522f961f5f7b16a60a7d1d5 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Fri, 15 Mar 2019 17:07:16 -0500
Subject: [PATCH 0615/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

- changes after CR
---
 app/code/Magento/Config/App/Config/Type/System.php   | 12 ++++++------
 .../Framework/Cache/LockGuardedCacheLoader.php       |  8 +++++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index 36fefcb86217d..8d197bc6ab045 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -231,8 +231,8 @@ private function loadAllData()
         return $this->lockQuery->lockedLoadData(
             self::$lockName,
             $loadAction,
-            [$this, 'readData'],
-            [$this, 'cacheData']
+            \Closure::fromCallable([$this, 'readData']),
+            \Closure::fromCallable([$this, 'cacheData'])
         );
     }
 
@@ -256,8 +256,8 @@ private function loadDefaultScopeData($scopeType)
         return $this->lockQuery->lockedLoadData(
             self::$lockName,
             $loadAction,
-            [$this, 'readData'],
-            [$this, 'cacheData']
+            \Closure::fromCallable([$this, 'readData']),
+            \Closure::fromCallable([$this, 'cacheData'])
         );
     }
 
@@ -295,8 +295,8 @@ private function loadScopeData($scopeType, $scopeId)
         return $this->lockQuery->lockedLoadData(
             self::$lockName,
             $loadAction,
-            [$this, 'readData'],
-            [$this, 'cacheData']
+            \Closure::fromCallable([$this, 'readData']),
+            \Closure::fromCallable([$this, 'cacheData'])
         );
     }
 
diff --git a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
index 39c132503daf8..8575f208e6c1f 100644
--- a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
+++ b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
@@ -52,7 +52,13 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Load data.
+     *
+     * @param string $lockName
+     * @param callable $dataLoader
+     * @param callable $dataCollector
+     * @param callable $dataSaver
+     * @return array
      */
     public function lockedLoadData(
         string $lockName,

From 96ca3d488bb010959414e391160364ad2264e22b Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Sat, 16 Mar 2019 08:31:53 +0200
Subject: [PATCH 0616/1055] While adding the product to Cart when the requested
 Qty is zero or less then zero, one was unexpectedly added

---
 .../Model/Cart/AddSimpleProductToCart.php        |  5 +++++
 .../GraphQl/Quote/AddSimpleProductToCartTest.php | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index 1b32866ed883c..6868ce3f7f1ff 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -67,6 +67,11 @@ public function execute(Quote $cart, array $cartItemData): void
     {
         $sku = $this->extractSku($cartItemData);
         $qty = $this->extractQty($cartItemData);
+        if ($qty <= 0) {
+            throw new GraphQlInputException(
+                __('Please enter a number greater than 0 in this field.')
+            );
+        }
         $customizableOptions = $this->extractCustomizableOptions($cartItemData);
 
         try {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
index 1e92a2e497bed..d9ab8db62a195 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
@@ -59,6 +59,22 @@ public function testAddSimpleProductToCart()
         self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Please enter a number greater than 0 in this field.
+     */
+    public function testAddSimpleProductToCartWithNegativeQty()
+    {
+        $sku = 'simple';
+        $qty = -2;
+        $maskedQuoteId = $this->getMaskedQuoteId();
+
+        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @return string
      */

From 345b70e3a59743020bb833927bff168899b51f79 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Sat, 16 Mar 2019 10:33:50 +0200
Subject: [PATCH 0617/1055] Covering the Share Wishist by integration test

---
 .../Magento/Wishlist/Controller/ShareTest.php | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
new file mode 100644
index 0000000000000..83d79a43620ff
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Controller;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Area;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * @magentoAppIsolation enabled
+ */
+class ShareTest extends AbstractController
+{
+    /**
+     * Test share wishlist with correct data
+     *
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testSuccessfullyShareWishlist()
+    {
+        $this->login(1);
+        $this->prepareRequestData();
+        $this->dispatch('wishlist/index/send/');
+
+        $this->assertSessionMessages(
+            $this->equalTo(['Your wish list has been shared.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Test share wishlist with incorrect data
+     *
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testShareWishlistWithoutEmails()
+    {
+        $this->login(1);
+        $this->prepareRequestData(true);
+        $this->dispatch('wishlist/index/send/');
+
+        $this->assertSessionMessages(
+            $this->equalTo(['Please enter an email address.']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Login the user
+     *
+     * @param string $customerId Customer to mark as logged in for the session
+     * @return void
+     */
+    protected function login($customerId)
+    {
+        /** @var Session $session */
+        $session = $this->_objectManager->get(Session::class);
+        $session->loginById($customerId);
+    }
+
+    /**
+     * Prepares the request with data
+     *
+     * @param bool $invalidData
+     * @return void
+     */
+    private function prepareRequestData($invalidData = false)
+    {
+        Bootstrap::getInstance()->loadArea(Area::AREA_FRONTEND);
+        $emails = !$invalidData ? 'email-1@example.com,email-1@example.com' : '';
+
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'emails' => $emails,
+            'message' => '',
+            'form_key' => $formKey->getFormKey(),
+        ];
+
+        $this->getRequest()->setMethod(Request::METHOD_POST);
+        $this->getRequest()->setPostValue($post);
+    }
+}

From 01eb7e61c9a3ebadd7d3350b473fd5d0db8d1578 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Sat, 16 Mar 2019 10:41:16 +0200
Subject: [PATCH 0618/1055] Fix clearing admin quote address when removing all
 items

---
 app/code/Magento/Checkout/etc/di.xml                           | 3 ---
 app/code/Magento/Checkout/etc/frontend/di.xml                  | 3 +++
 .../Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
index 71dfd12bb4779..4ebd594a28562 100644
--- a/app/code/Magento/Checkout/etc/di.xml
+++ b/app/code/Magento/Checkout/etc/di.xml
@@ -49,7 +49,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Quote\Model\Quote">
-        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
-    </type>
 </config>
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 00bcd2a27005a..8f35fe9f37abf 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -96,4 +96,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
+    </type>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
index 994076badddae..60ccdb88676aa 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
@@ -22,6 +22,7 @@ class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase
     /**
      * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
      *
+     * @magentoAppArea frontend
      * @return void
      */
     public function testAfterRemoveItem(): void

From b3280d0b0b740d389928618584650bba19309731 Mon Sep 17 00:00:00 2001
From: Vasilii <v.burlacu@atwix.com>
Date: Sat, 16 Mar 2019 11:45:47 +0200
Subject: [PATCH 0619/1055] magento/graphql-ce:#468 -  Resolve coupling between
 objects in `\Magento\QuoteGraphQl\Model\Cart\SetBillingAddressOnCart`

---
 .../CreateQuoteAddressByCustomerAddress.php   | 78 +++++++++++++++++++
 .../Model/Cart/SetBillingAddressOnCart.php    | 50 ++++--------
 2 files changed, 95 insertions(+), 33 deletions(-)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php
new file mode 100644
index 0000000000000..2e2588ea81068
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+
+/**
+ * Creates a quote address based on given context, customer address ID and customer address
+ */
+class CreateQuoteAddressByCustomerAddress
+{
+    /**
+     * @var QuoteAddressFactory
+     */
+    private $quoteAddressFactory;
+
+    /**
+     * @var GetCustomer
+     */
+    private $getCustomer;
+
+    /**
+     * @var GetCustomerAddress
+     */
+    private $getCustomerAddress;
+
+    /**
+     * @param QuoteAddressFactory $quoteAddressFactory
+     * @param GetCustomer $getCustomer
+     * @param GetCustomerAddress $getCustomerAddress
+     */
+    public function __construct(
+        QuoteAddressFactory $quoteAddressFactory,
+        GetCustomer $getCustomer,
+        GetCustomerAddress $getCustomerAddress
+    ) {
+        $this->quoteAddressFactory = $quoteAddressFactory;
+        $this->getCustomer = $getCustomer;
+        $this->getCustomerAddress = $getCustomerAddress;
+    }
+
+    /**
+     * @param ContextInterface $context
+     * @param int|string|null $customerAddressId
+     * @param array|null $customerAddress
+     * @return Address
+     * @throws GraphQlAuthenticationException
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlInputException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(
+        ContextInterface $context,
+        $customerAddressId,
+        $customerAddress
+    ): Address {
+        if (null === $customerAddressId) {
+            return  $this->quoteAddressFactory->createBasedOnInputData($customerAddress);
+        }
+
+        $customer = $this->getCustomer->execute($context);
+        $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
+
+        return $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
index 31524ea023222..65afbecb2c3f5 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -7,8 +7,8 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
-use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -20,41 +20,25 @@
 class SetBillingAddressOnCart
 {
     /**
-     * @var QuoteAddressFactory
-     */
-    private $quoteAddressFactory;
-
-    /**
-     * @var GetCustomer
-     */
-    private $getCustomer;
-
-    /**
-     * @var GetCustomerAddress
+     * @var AssignBillingAddressToCart
      */
-    private $getCustomerAddress;
+    private $assignBillingAddressToCart;
 
     /**
-     * @var AssignBillingAddressToCart
+     * @var CreateQuoteAddressByCustomerAddress
      */
-    private $assignBillingAddressToCart;
+    private $createQuoteAddressByCustomerAddress;
 
     /**
-     * @param QuoteAddressFactory $quoteAddressFactory
-     * @param GetCustomer $getCustomer
-     * @param GetCustomerAddress $getCustomerAddress
      * @param AssignBillingAddressToCart $assignBillingAddressToCart
+     * @param CreateQuoteAddressByCustomerAddress $createQuoteAddressByCustomerAddress
      */
     public function __construct(
-        QuoteAddressFactory $quoteAddressFactory,
-        GetCustomer $getCustomer,
-        GetCustomerAddress $getCustomerAddress,
-        AssignBillingAddressToCart $assignBillingAddressToCart
+        AssignBillingAddressToCart $assignBillingAddressToCart,
+        CreateQuoteAddressByCustomerAddress $createQuoteAddressByCustomerAddress
     ) {
-        $this->quoteAddressFactory = $quoteAddressFactory;
-        $this->getCustomer = $getCustomer;
-        $this->getCustomerAddress = $getCustomerAddress;
         $this->assignBillingAddressToCart = $assignBillingAddressToCart;
+        $this->createQuoteAddressByCustomerAddress = $createQuoteAddressByCustomerAddress;
     }
 
     /**
@@ -66,6 +50,8 @@ public function __construct(
      * @return void
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlAuthenticationException
      */
     public function execute(ContextInterface $context, CartInterface $cart, array $billingAddressInput): void
     {
@@ -93,13 +79,11 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
             );
         }
 
-        if (null === $customerAddressId) {
-            $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
-        } else {
-            $customer = $this->getCustomer->execute($context);
-            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
-            $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
-        }
+        $billingAddress = $this->createQuoteAddressByCustomerAddress->execute(
+            $context,
+            $customerAddressId,
+            $addressInput
+        );
 
         $this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
     }

From bd06fc9457630d44b33b29d359c1cc9593806384 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Sat, 16 Mar 2019 12:03:56 +0200
Subject: [PATCH 0620/1055] magento-engcom/magento2ce#2680: Fixed static tests

---
 .../Order/Create/Form/AbstractForm.php        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index 5ea77b0f71811..6b87c1fe39d8b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -6,6 +6,7 @@
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
 
 /**
  * Sales Order Create Form Abstract Block
@@ -57,8 +58,7 @@ public function __construct(
     }
 
     /**
-     * Prepare global layout
-     * Add renderers to \Magento\Framework\Data\Form
+     * Prepare global layout. Add renderers to \Magento\Framework\Data\Form
      *
      * @return $this
      */
@@ -152,7 +152,7 @@ protected function _addAdditionalFormElementData(\Magento\Framework\Data\Form\El
     /**
      * Add rendering EAV attributes to Form element
      *
-     * @param \Magento\Customer\Api\Data\AttributeMetadataInterface[] $attributes
+     * @param AttributeMetadataInterface[] $attributes
      * @param \Magento\Framework\Data\Form\AbstractForm $form
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -231,11 +231,11 @@ public function getFormValues()
     /**
      * Retrieve frontend classes according validation rules
      *
-     * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
+     * @param AttributeMetadataInterface $attribute
      *
      * @return string
      */
-    private function getValidationClasses(\Magento\Customer\Api\Data\AttributeMetadataInterface $attribute) : string
+    private function getValidationClasses(AttributeMetadataInterface $attribute) : string
     {
         $out = [];
         $out[] = $attribute->getFrontendClass();
@@ -252,23 +252,23 @@ private function getValidationClasses(\Magento\Customer\Api\Data\AttributeMetada
     /**
      * Retrieve validation classes by min_text_length and max_text_length rules
      *
-     * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
+     * @param AttributeMetadataInterface $attribute
      *
      * @return array
      */
-    private function getTextLengthValidateClasses(\Magento\Customer\Api\Data\AttributeMetadataInterface $attribute) : array
+    private function getTextLengthValidateClasses(AttributeMetadataInterface $attribute) : array
     {
         $classes = [];
 
         $validateRules = $attribute->getValidationRules();
-        if(!empty($validateRules)) {
+        if (!empty($validateRules)) {
             foreach ($validateRules as $rule) {
                 switch ($rule->getName()) {
-                    case 'min_text_length' :
+                    case 'min_text_length':
                         $classes[] = 'minimum-length-' . $rule->getValue();
                         break;
 
-                    case 'max_text_length' :
+                    case 'max_text_length':
                         $classes[] = 'maximum-length-' . $rule->getValue();
                         break;
                 }

From 8ed926626330c219c76d9752e513bc0861ea7d05 Mon Sep 17 00:00:00 2001
From: Serhiy Zhovnir <s.zhovnir@atwix.com>
Date: Sat, 16 Mar 2019 12:29:54 +0200
Subject: [PATCH 0621/1055] #21786 Fix asynchronous email sending for the sales
 entities which were created with disabled email sending

---
 .../Model/Order/Creditmemo/Sender/EmailSender.php     |  2 +-
 .../Model/Order/Email/Sender/CreditmemoSender.php     |  2 +-
 .../Sales/Model/Order/Email/Sender/InvoiceSender.php  |  2 +-
 .../Sales/Model/Order/Email/Sender/ShipmentSender.php |  2 +-
 .../Sales/Model/Order/Invoice/Sender/EmailSender.php  |  2 +-
 .../Sales/Model/Order/Shipment/Sender/EmailSender.php |  2 +-
 .../Model/Order/Creditmemo/Sender/EmailSenderTest.php |  4 ++--
 .../Model/Order/Email/Sender/CreditmemoSenderTest.php | 11 +++++++----
 .../Model/Order/Email/Sender/InvoiceSenderTest.php    |  8 ++++----
 .../Model/Order/Email/Sender/ShipmentSenderTest.php   |  8 ++++----
 .../Model/Order/Invoice/Sender/EmailSenderTest.php    |  4 ++--
 .../Model/Order/Shipment/Sender/EmailSenderTest.php   |  4 ++--
 12 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
index ecd5670a319e7..7778a297cc7f3 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
@@ -96,7 +96,7 @@ public function send(
         \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface $comment = null,
         $forceSyncMode = false
     ) {
-        $creditmemo->setSendEmail(true);
+        $creditmemo->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $transport = [
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
index 8004483583114..053959f937509 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -99,7 +99,7 @@ public function __construct(
      */
     public function send(Creditmemo $creditmemo, $forceSyncMode = false)
     {
-        $creditmemo->setSendEmail(true);
+        $creditmemo->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $creditmemo->getOrder();
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
index 994fd79945cfd..7bf3c5c1d2642 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -99,7 +99,7 @@ public function __construct(
      */
     public function send(Invoice $invoice, $forceSyncMode = false)
     {
-        $invoice->setSendEmail(true);
+        $invoice->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $invoice->getOrder();
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
index 6729c746f5565..4dab70bcb3814 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -99,7 +99,7 @@ public function __construct(
      */
     public function send(Shipment $shipment, $forceSyncMode = false)
     {
-        $shipment->setSendEmail(true);
+        $shipment->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $shipment->getOrder();
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
index aa0687bee504f..5dbb5deaf1e8c 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
@@ -96,7 +96,7 @@ public function send(
         \Magento\Sales\Api\Data\InvoiceCommentCreationInterface $comment = null,
         $forceSyncMode = false
     ) {
-        $invoice->setSendEmail(true);
+        $invoice->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $transport = [
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
index 0a393548069f5..d7a974958ab54 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
@@ -96,7 +96,7 @@ public function send(
         \Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
         $forceSyncMode = false
     ) {
-        $shipment->setSendEmail(true);
+        $shipment->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $transport = [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
index 9fd2a8b0d929f..859fbde31f5d8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
@@ -249,7 +249,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
 
         $this->creditmemoMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         if (!$configValue || $forceSyncMode) {
             $transport = [
@@ -279,7 +279,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 ->method('setTemplateVars')
                 ->with($transport->getData());
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
index 31bf846689230..07a7f4d9103da 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
@@ -90,7 +90,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
 
         $this->creditmemoMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -130,7 +130,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                     ]
                 );
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
@@ -197,6 +197,9 @@ public function sendDataProvider()
      * @param bool $isVirtualOrder
      * @param int $formatCallCount
      * @param string|null $expectedShippingAddress
+     * @param bool $emailSendingResult
+     *
+     * @return void
      * @dataProvider sendVirtualOrderDataProvider
      */
     public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expectedShippingAddress)
@@ -207,7 +210,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
 
         $this->creditmemoMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with(false);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -242,7 +245,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                 ]
             );
 
-        $this->identityContainerMock->expects($this->once())
+        $this->identityContainerMock->expects($this->exactly(2))
             ->method('isEnabled')
             ->willReturn(false);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
index 9c54c716e4207..ba2f1166baf3c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
@@ -90,7 +90,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
 
         $this->invoiceMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -136,7 +136,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                     ]
                 );
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
@@ -212,7 +212,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
 
         $this->invoiceMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with(false);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -247,7 +247,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                 ]
             );
 
-        $this->identityContainerMock->expects($this->once())
+        $this->identityContainerMock->expects($this->exactly(2))
             ->method('isEnabled')
             ->willReturn(false);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
index b1b18af63b590..8a71c738e9fbe 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -90,7 +90,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
 
         $this->shipmentMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -136,7 +136,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                     ]
                 );
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
@@ -212,7 +212,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
 
         $this->shipmentMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with(false);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -247,7 +247,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                 ]
             );
 
-        $this->identityContainerMock->expects($this->once())
+        $this->identityContainerMock->expects($this->exactly(2))
             ->method('isEnabled')
             ->willReturn(false);
         $this->shipmentResourceMock->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
index 8a4e2920ba207..dcf689cf7d53b 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
@@ -247,7 +247,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
 
         $this->invoiceMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         if (!$configValue || $forceSyncMode) {
             $transport = [
@@ -277,7 +277,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 ->method('setTemplateVars')
                 ->with($transport->getData());
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
index 94347e8b32d54..391e99ba6f835 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
@@ -249,7 +249,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
 
         $this->shipmentMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         if (!$configValue || $forceSyncMode) {
             $transport = [
@@ -279,7 +279,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 ->method('setTemplateVars')
                 ->with($transport->getData());
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 

From 3ebdbffedbe3505e1a3535a6042f2becdeea127b Mon Sep 17 00:00:00 2001
From: Serhiy Zhovnir <s.zhovnir@atwix.com>
Date: Sat, 16 Mar 2019 12:49:00 +0200
Subject: [PATCH 0622/1055] #21786 Remove unused param docs

---
 .../Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
index 07a7f4d9103da..02a2bbec72389 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
@@ -197,7 +197,6 @@ public function sendDataProvider()
      * @param bool $isVirtualOrder
      * @param int $formatCallCount
      * @param string|null $expectedShippingAddress
-     * @param bool $emailSendingResult
      *
      * @return void
      * @dataProvider sendVirtualOrderDataProvider

From 68d793d81a45035b1d5df2dc883582ef6a37229f Mon Sep 17 00:00:00 2001
From: Oleg Volkov <sirwerwolf@gmail.com>
Date: Sat, 16 Mar 2019 13:56:41 +0200
Subject: [PATCH 0623/1055] #19835 Fix admin header buttons flicker

---
 .../Backend/view/adminhtml/templates/pageactions.phtml        | 2 +-
 .../web/css/source/module/main/_actions-bar.less              | 4 ++++
 lib/web/mage/backend/floating-header.js                       | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
index 69d545f12d075..0a1dcb0b626e6 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <?php if ($block->getChildHtml()):?>
-    <div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
+    <div data-mage-init='{"floatingHeader": {}}' class="page-actions floating-header" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
         <?= $block->getChildHtml() ?>
     </div>
 <?php endif; ?>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
index 07050c1e5111d..131013bacd808 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
@@ -46,6 +46,10 @@
     @_page-action__indent: 1.3rem;
     float: right;
 
+    &.floating-header {
+        &:extend(.page-actions-buttons all);
+    }
+
     .page-main-actions & {
         &._fixed {
             left: @page-wrapper__indent-left;
diff --git a/lib/web/mage/backend/floating-header.js b/lib/web/mage/backend/floating-header.js
index 06861277559a4..a6f767259488a 100644
--- a/lib/web/mage/backend/floating-header.js
+++ b/lib/web/mage/backend/floating-header.js
@@ -48,6 +48,7 @@ define([
             this.element.wrapInner($('<div/>', {
                 'class': 'page-actions-inner', 'data-title': title
             }));
+            this.element.removeClass('floating-header');
         },
 
         /**

From 17cd172dcb809d1329313d4a2b44f4877fbf46b8 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <mitry@atwix.com>
Date: Sat, 16 Mar 2019 15:11:37 +0200
Subject: [PATCH 0624/1055] Add missing throws tags

---
 .../Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php | 2 ++
 .../Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php | 2 ++
 .../Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php    | 2 ++
 .../Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php   | 2 ++
 .../Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php    | 2 ++
 .../Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php   | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
index 7778a297cc7f3..3d2c13cbaaaa9 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
@@ -89,6 +89,7 @@ public function __construct(
      * @param bool $forceSyncMode
      *
      * @return bool
+     * @throws \Exception
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -145,6 +146,7 @@ public function send(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      *
      * @return string
+     * @throws \Exception
      */
     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
index 053959f937509..be7fa8296a264 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -96,6 +96,7 @@ public function __construct(
      * @param Creditmemo $creditmemo
      * @param bool $forceSyncMode
      * @return bool
+     * @throws \Exception
      */
     public function send(Creditmemo $creditmemo, $forceSyncMode = false)
     {
@@ -146,6 +147,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
      *
      * @param Order $order
      * @return string
+     * @throws \Exception
      */
     protected function getPaymentHtml(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
index 7bf3c5c1d2642..bd67de7322a62 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -96,6 +96,7 @@ public function __construct(
      * @param Invoice $invoice
      * @param bool $forceSyncMode
      * @return bool
+     * @throws \Exception
      */
     public function send(Invoice $invoice, $forceSyncMode = false)
     {
@@ -146,6 +147,7 @@ public function send(Invoice $invoice, $forceSyncMode = false)
      *
      * @param Order $order
      * @return string
+     * @throws \Exception
      */
     protected function getPaymentHtml(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
index 4dab70bcb3814..2b10d25b87a04 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -96,6 +96,7 @@ public function __construct(
      * @param Shipment $shipment
      * @param bool $forceSyncMode
      * @return bool
+     * @throws \Exception
      */
     public function send(Shipment $shipment, $forceSyncMode = false)
     {
@@ -146,6 +147,7 @@ public function send(Shipment $shipment, $forceSyncMode = false)
      *
      * @param Order $order
      * @return string
+     * @throws \Exception
      */
     protected function getPaymentHtml(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
index 5dbb5deaf1e8c..5ae3306ddf75b 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
@@ -89,6 +89,7 @@ public function __construct(
      * @param bool $forceSyncMode
      *
      * @return bool
+     * @throws \Exception
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -145,6 +146,7 @@ public function send(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      *
      * @return string
+     * @throws \Exception
      */
     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
index d7a974958ab54..3657f84d4445d 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
@@ -89,6 +89,7 @@ public function __construct(
      * @param bool $forceSyncMode
      *
      * @return bool
+     * @throws \Exception
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -145,6 +146,7 @@ public function send(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      *
      * @return string
+     * @throws \Exception
      */
     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
     {

From e91cff303581f43b93b7ca4ec210712fb505f063 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sat, 16 Mar 2019 10:33:15 +0200
Subject: [PATCH 0625/1055] Convert UpdateShoppingCartTest to MFTF

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    |   5 +
 .../Section/CheckoutCartProductSection.xml    |   3 +
 .../Test/StorefrontUpdateShoppingCartTest.xml | 114 ++++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 0b3a31194ea36..44635e9b93f9a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -386,6 +386,11 @@
         <var key="sku" entityType="product" entityKey="sku" />
         <requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
     </entity>
+    <entity name="productWithOptions3" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionField</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionArea</requiredEntity>
+    </entity>
     <entity name="ApiVirtualProductWithDescription" type="product">
         <data key="sku" unique="suffix">api-virtual-product</data>
         <data key="type_id">virtual</data>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index dcfb12fd4e965..a63dc5be2de30 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -15,6 +15,9 @@
         <element name="ProductPriceByName" type="text"
                  selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'price')]//span[@class='price']"
                  parameterized="true"/>
+        <element name="ProductSubtotalByName" type="text"
+                 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="ProductImageByName" type="text"
                  selector="//main//table[@id='shopping-cart-table']//tbody//tr//img[contains(@class, 'product-image-photo') and @alt='{{var1}}']"
                  parameterized="true"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartTest.xml
new file mode 100644
index 0000000000000..94abf4b26c347
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartTest.xml
@@ -0,0 +1,114 @@
+<?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="UpdateShoppingCartTestVariation1">
+        <annotations>
+            <features value="Checkout"/>
+            <title value="Check updating shopping cart while updating items qty"/>
+            <description value="Check updating shopping cart while updating items qty"/>
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">100</field>
+            </createData>
+
+            <!-- Add the newly created product to the shopping cart -->
+            <amOnPage url="$$createProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
+            <waitForPageLoad stepKey="waitForCatalogPageLoad1"/>
+            <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage1">
+                <argument name="productName" value="$$createProduct.name$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Go to the shopping cart -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad1"/>
+
+        <!-- Change the product QTY -->
+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="3" stepKey="changeCartQty"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="openShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad2"/>
+
+        <!-- The price and QTY values should be updated for the product -->
+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
+        <see userInput="$300" selector="{{CheckoutCartProductSection.ProductSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
+        <assertEquals expected="3" actual="$grabProductQtyInCart" stepKey="assertProductQtyInCart"/>
+
+        <!-- Subtotal should be updated -->
+        <see userInput="$300" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertCartSubtotal"/>
+
+        <!-- Minicart product price and subtotal should be updated -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
+        <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
+        <assertEquals expected="3" actual="$grabProductQtyInMinicart" stepKey="assertProductQtyInMinicart"/>
+        <see userInput="$300" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
+    </test>
+    <test name="UpdateShoppingCartTestVariation2">
+        <annotations>
+            <features value="Checkout"/>
+            <title value="Check updating shopping cart while updating qty of items with custom options"/>
+            <description value="Check updating shopping cart while updating qty of items with custom options"/>
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">100</field>
+            </createData>
+
+            <!-- Add two custom options to the product: field and textarea -->
+            <updateData createDataKey="createProduct" entity="productWithOptions3" stepKey="updateProductWithOption"/>
+
+            <!-- Go to the product page, fill the custom options values and add the product to the shopping cart -->
+            <amOnPage url="{{StorefrontHomePage.url}}$createProduct.custom_attributes[url_key]$.html" stepKey="amOnProductPage"/>
+            <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+            <fillField userInput="OptionField" selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" stepKey="fillProductOptionInputField"/>
+            <fillField userInput="OptionArea" selector="{{StorefrontProductInfoMainSection.productOptionAreaInput(ProductOptionArea.title)}}" stepKey="fillProductOptionInputArea"/>
+            <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+                <argument name="productName" value="$createProduct.name$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Go to the shopping cart -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad1"/>
+
+        <!-- Change the product QTY -->
+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="11" stepKey="changeCartQty"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="openShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad2"/>
+
+        <!-- The price and QTY values should be updated for the product -->
+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
+        <see userInput="$1,320.00" selector="{{CheckoutCartProductSection.ProductSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
+        <assertEquals expected="11" actual="$grabProductQtyInCart" stepKey="assertProductQtyInCart"/>
+        <see userInput="$1,320.00" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
+
+        <!-- Minicart product price and subtotal should be updated -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
+        <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
+        <assertEquals expected="11" actual="$grabProductQtyInMinicart" stepKey="assertProductQtyInMinicart"/>
+        <see userInput="1,320.00" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
+    </test>
+</tests>

From 5c101bfefda20e54168a1e5a7ed044b40ec3889c Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Sat, 16 Mar 2019 16:07:32 +0200
Subject: [PATCH 0626/1055] Covering the Wishlist classes by integration and
 Unit Tests

---
 .../Product/AttributeValueProviderTest.php    | 178 ++++++++++++++++++
 .../Magento/Wishlist/Controller/ShareTest.php |   2 +-
 2 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php

diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
new file mode 100644
index 0000000000000..baafbdef47fe8
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Test\Unit\Model\Product;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Wishlist\Model\Product\AttributeValueProvider;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+
+/**
+ * @covers CreditCardTokenFormatter
+ */
+class AttributeValueProviderTest extends TestCase
+{
+    /**
+     * @var AttributeValueProvider|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeValueProvider;
+
+    /**
+     * @var CollectionFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productCollectionFactoryMock;
+
+    /**
+     * @var @var Product|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productMock;
+
+    /**
+     * @var AdapterInterface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->productCollectionFactoryMock = $this->createPartialMock(
+            CollectionFactory::class,
+            ['create']
+        );
+        $this->attributeValueProvider = new AttributeValueProvider(
+            $this->productCollectionFactoryMock
+        );
+    }
+
+    /**
+     * Get attribute text when the flat table is disabled
+     *
+     * @param int $productId
+     * @param string $attributeCode
+     * @param string $attributeText
+     * @return void
+     * @dataProvider attributeDataProvider
+     */
+    public function testGetAttributeTextWhenFlatIsDisabled(int $productId, string $attributeCode, string $attributeText)
+    {
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData'])
+            ->getMock();
+
+        $this->productMock->expects($this->any())
+            ->method('getData')
+            ->with($attributeCode)
+            ->willReturn($attributeText);
+
+        $productCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'addIdFilter', 'addStoreFilter', 'addAttributeToSelect', 'isEnabledFlat', 'getFirstItem'
+            ])->getMock();
+
+        $productCollection->expects($this->any())
+            ->method('addIdFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addStoreFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addAttributeToSelect')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('isEnabledFlat')
+            ->willReturn(false);
+        $productCollection->expects($this->any())
+            ->method('getFirstItem')
+            ->willReturn($this->productMock);
+
+        $this->productCollectionFactoryMock->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($productCollection);
+
+        $actual = $this->attributeValueProvider->getRawAttributeValue($productId, $attributeCode);
+
+        $this->assertEquals($attributeText, $actual);
+    }
+
+
+    /**
+     * Get attribute text when the flat table is enabled
+     *
+     * @dataProvider attributeDataProvider
+     * @param int $productId
+     * @param string $attributeCode
+     * @param string $attributeText
+     * @return void
+     */
+    public function testGetAttributeTextWhenFlatIsEnabled(int $productId, string $attributeCode, string $attributeText)
+    {
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)->getMockForAbstractClass();
+        $this->connectionMock->expects($this->any())
+            ->method('fetchRow')
+            ->willReturn([
+                $attributeCode => $attributeText
+            ]);
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData'])
+            ->getMock();
+        $this->productMock->expects($this->any())
+            ->method('getData')
+            ->with($attributeCode)
+            ->willReturn($attributeText);
+
+        $productCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'addIdFilter', 'addStoreFilter', 'addAttributeToSelect', 'isEnabledFlat', 'getConnection'
+            ])->getMock();
+
+        $productCollection->expects($this->any())
+            ->method('addIdFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addStoreFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addAttributeToSelect')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('isEnabledFlat')
+            ->willReturn(true);
+        $productCollection->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->productCollectionFactoryMock->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($productCollection);
+
+        $actual = $this->attributeValueProvider->getRawAttributeValue($productId, $attributeCode);
+
+        $this->assertEquals($attributeText, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function attributeDataProvider(): array
+    {
+        return [
+            [1, 'attribute_code', 'Attribute Text']
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
index 83d79a43620ff..47705262caaf3 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
@@ -76,7 +76,7 @@ protected function login($customerId)
     private function prepareRequestData($invalidData = false)
     {
         Bootstrap::getInstance()->loadArea(Area::AREA_FRONTEND);
-        $emails = !$invalidData ? 'email-1@example.com,email-1@example.com' : '';
+        $emails = !$invalidData ? 'email-1@example.com,email-2@example.com' : '';
 
         /** @var FormKey $formKey */
         $formKey = $this->_objectManager->get(FormKey::class);

From d49aa76497ee603ceb7ede6e7b6bc21137ef2ddd Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Sat, 16 Mar 2019 16:12:16 +0200
Subject: [PATCH 0627/1055] Small adjustment

---
 .../Test/Unit/Model/Product/AttributeValueProviderTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
index baafbdef47fe8..e5f6b84bfc3da 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
@@ -16,7 +16,7 @@
 use PHPUnit_Framework_MockObject_MockObject;
 
 /**
- * @covers CreditCardTokenFormatter
+ * AttributeValueProviderTest
  */
 class AttributeValueProviderTest extends TestCase
 {

From 7a2774318fe8056d0ef44e1338bf3984fc46857d Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Sat, 16 Mar 2019 16:17:55 +0200
Subject: [PATCH 0628/1055] Small adjustments

---
 .../Test/Unit/Model/Product/AttributeValueProviderTest.php     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
index e5f6b84bfc3da..fb0113eb6ae75 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
@@ -31,7 +31,7 @@ class AttributeValueProviderTest extends TestCase
     private $productCollectionFactoryMock;
 
     /**
-     * @var @var Product|PHPUnit_Framework_MockObject_MockObject
+     * @var Product|PHPUnit_Framework_MockObject_MockObject
      */
     private $productMock;
 
@@ -108,7 +108,6 @@ public function testGetAttributeTextWhenFlatIsDisabled(int $productId, string $a
         $this->assertEquals($attributeText, $actual);
     }
 
-
     /**
      * Get attribute text when the flat table is enabled
      *

From 60d40e1681c8e2e7121373df2dba38d9357ed12a Mon Sep 17 00:00:00 2001
From: Roman Rudavskyi <roman.rudavskyi@gmail.com>
Date: Sat, 16 Mar 2019 16:27:58 +0200
Subject: [PATCH 0629/1055] Add API Test For Selected Shipping Method
 functionality #478

---
 .../Customer/SelectedShippingMethodTest.php   | 223 ++++++++++++++++++
 .../Guest/SelectedShippingMethodTest.php      | 220 +++++++++++++++++
 2 files changed, 443 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SelectedShippingMethodTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SelectedShippingMethodTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SelectedShippingMethodTest.php
new file mode 100644
index 0000000000000..a3e9188bb82f2
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SelectedShippingMethodTest.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class SelectedShippingMethodTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var \Magento\Framework\Api\SortOrderBuilder
+     */
+    private $sortOrderBuilder;
+
+    /**
+     * @var \Magento\Framework\Api\FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var \Magento\Quote\Model\ResourceModel\Quote
+     */
+    private $quoteResource;
+
+    /**
+     * @var \Magento\Quote\Model\QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var \Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var \Magento\Integration\Api\CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @param $response
+     * @return mixed
+     */
+    public function getSelectedShippingMethod($response)
+    {
+        return $response['cart']['shipping_addresses'][0]['selected_shipping_method'];
+    }
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->filterBuilder = $this->objectManager->create(
+            \Magento\Framework\Api\FilterBuilder::class
+        );
+        $this->sortOrderBuilder = $this->objectManager->create(
+            \Magento\Framework\Api\SortOrderBuilder::class
+        );
+        $this->searchCriteriaBuilder = $this->objectManager->create(
+            \Magento\Framework\Api\SearchCriteriaBuilder::class
+        );
+        $this->quoteResource = $this->objectManager->get(
+            \Magento\Quote\Model\ResourceModel\Quote::class
+        );
+        $this->quoteFactory = $this->objectManager->get(
+            \Magento\Quote\Model\QuoteFactory::class
+        );
+        $this->quoteIdToMaskedId = $this->objectManager->get(
+            \Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface::class
+        );
+        $this->customerTokenService = $this->objectManager->get(
+            \Magento\Integration\Api\CustomerTokenServiceInterface::class
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
+     */
+    public function testGetCartWithShippingMethod()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertInternalType(
+            'array',
+            $response['cart']['shipping_addresses'][0]['selected_shipping_method'],
+            'There are no selected shipping method for customer cart!'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
+     */
+    public function testGetShippingMethodFromCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('cart', $response);
+
+        $selectedShippingMethod = $this->getSelectedShippingMethod($response);
+
+        self::assertEquals('flatrate', $selectedShippingMethod['carrier_code']);
+        self::assertEquals('flatrate', $selectedShippingMethod['method_code']);
+        self::assertEquals('Flat Rate - Fixed', $selectedShippingMethod['label']);
+        self::assertEquals(0, $selectedShippingMethod['amount']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
+     */
+    public function testGetShippingMethodIfShippingMethodIsNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('cart', $response);
+
+        $selectedShippingMethod = $this->getSelectedShippingMethod($response);
+
+        self::assertNull($selectedShippingMethod['carrier_code']);
+        self::assertNull($selectedShippingMethod['method_code']);
+        self::assertNull($selectedShippingMethod['label']);
+        self::assertNull($selectedShippingMethod['amount']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
+     */
+    public function testGetShippingMethodOfNonExistentCart()
+    {
+        $query = $this->getQuery('nonExistentCart');
+        self::expectException(\Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException::class);
+        self::expectExceptionMessage(
+            'GraphQL response contains errors: Could not find a cart with ID "nonExistentCart"'
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * Retrieve quote by given reserved order ID
+     *
+     * @param string $reservedOrderId
+     * @return \Magento\Quote\Model\Quote
+     * @throws \InvalidArgumentException
+     */
+    protected function getCart($reservedOrderId)
+    {
+        /** @var $cart \Magento\Quote\Model\Quote */
+        $cart = $this->objectManager->get(\Magento\Quote\Model\Quote::class);
+        $cart->load($reservedOrderId, 'reserved_order_id');
+        if (!$cart->getId()) {
+            throw new \InvalidArgumentException('There is no quote with provided reserved order ID.');
+        }
+        return $cart;
+    }
+
+    /**
+     * @param string $reservedOrderId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId
+    ): string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    shipping_addresses {
+      selected_shipping_method {
+        carrier_code
+        method_code
+        label
+        amount
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SelectedShippingMethodTest.php
new file mode 100644
index 0000000000000..3e52abfbe7d58
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SelectedShippingMethodTest.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class SelectedShippingMethodTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var \Magento\Framework\Api\SortOrderBuilder
+     */
+    private $sortOrderBuilder;
+
+    /**
+     * @var \Magento\Framework\Api\FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var \Magento\Quote\Model\ResourceModel\Quote
+     */
+    private $quoteResource;
+
+    /**
+     * @var \Magento\Quote\Model\QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var \Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @param $response
+     * @return mixed
+     */
+    public function getSelectedShippingMethod($response)
+    {
+        $selectedShippingMethod = $response['cart']['shipping_addresses'][0]['selected_shipping_method'];
+        return $selectedShippingMethod;
+    }
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->filterBuilder = $this->objectManager->create(
+            \Magento\Framework\Api\FilterBuilder::class
+        );
+        $this->sortOrderBuilder = $this->objectManager->create(
+            \Magento\Framework\Api\SortOrderBuilder::class
+        );
+        $this->searchCriteriaBuilder = $this->objectManager->create(
+            \Magento\Framework\Api\SearchCriteriaBuilder::class
+        );
+        $this->quoteResource = $this->objectManager->get(
+            \Magento\Quote\Model\ResourceModel\Quote::class
+        );
+        $this->quoteFactory = $this->objectManager->get(
+            \Magento\Quote\Model\QuoteFactory::class
+        );
+        $this->quoteIdToMaskedId = $this->objectManager->get(
+            \Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface::class
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
+     */
+    public function testGetCartWithShippingMethod()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $this->unAssignCustomerFromQuote('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertInternalType(
+            'array',
+            $response['cart']['shipping_addresses'][0]['selected_shipping_method'],
+            'There are no selected shipping method for customer cart!'
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
+     */
+    public function testGetShippingMethodFromCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $this->unAssignCustomerFromQuote('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('cart', $response);
+
+        $selectedShippingMethod = $this->getSelectedShippingMethod($response);
+
+        self::assertEquals('flatrate', $selectedShippingMethod['carrier_code']);
+        self::assertEquals('flatrate', $selectedShippingMethod['method_code']);
+        self::assertEquals('Flat Rate - Fixed', $selectedShippingMethod['label']);
+        self::assertEquals(0, $selectedShippingMethod['amount']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
+     */
+    public function testGetShippingMethodIfShippingMethodIsNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
+        $this->unAssignCustomerFromQuote('test_order_1');
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('cart', $response);
+
+        $selectedShippingMethod = $this->getSelectedShippingMethod($response);
+
+        self::assertNull($selectedShippingMethod['carrier_code']);
+        self::assertNull($selectedShippingMethod['method_code']);
+        self::assertNull($selectedShippingMethod['label']);
+        self::assertNull($selectedShippingMethod['amount']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
+     */
+    public function testGetShippingMethodOfNonExistentCart()
+    {
+        $query = $this->getQuery('nonExistentCart');
+        self::expectException(\Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException::class);
+        self::expectExceptionMessage(
+            'GraphQL response contains errors: Could not find a cart with ID "nonExistentCart"'
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Retrieve quote by given reserved order ID
+     *
+     * @param string $reservedOrderId
+     * @return \Magento\Quote\Model\Quote
+     * @throws \InvalidArgumentException
+     */
+    protected function getCart($reservedOrderId)
+    {
+        /** @var $cart \Magento\Quote\Model\Quote */
+        $cart = $this->objectManager->get(\Magento\Quote\Model\Quote::class);
+        $cart->load($reservedOrderId, 'reserved_order_id');
+        if (!$cart->getId()) {
+            throw new \InvalidArgumentException('There is no quote with provided reserved order ID.');
+        }
+        return $cart;
+    }
+
+    /**
+     * @param string $reservedOrderId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId
+    ): string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    shipping_addresses {
+      selected_shipping_method {
+        carrier_code
+        method_code
+        label
+        amount
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return string
+     */
+    private function unAssignCustomerFromQuote(
+        string $reversedQuoteId
+    ): string {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $quote->setCustomerId(0);
+        $this->quoteResource->save($quote);
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+}

From b5803c581bf0debfc7e7b45be41cf3e869a4fc20 Mon Sep 17 00:00:00 2001
From: Harniuk Bohdan <bohar@smile.fr>
Date: Sat, 16 Mar 2019 16:44:06 +0200
Subject: [PATCH 0630/1055] magento/graphql-ce#482: [Test Coverage]
 'SetBillingAddressOnCart' functionality

---
 .../Customer/SetBillingAddressOnCartTest.php  | 50 +++++++++++++++++++
 .../Guest/SetBillingAddressOnCartTest.php     | 49 ++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 67a086311d71a..02cd428767ccc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -423,6 +423,39 @@ public function testSetBillingAddressOnNonExistentCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @dataProvider dataProviderSetWithoutRequiredParameters
+     * @param string $input
+     * @param string $message
+     * @throws \Exception
+     */
+    public function testSetBillingAddressWithoutRequiredParameters(string $input, string $message)
+    {
+        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+        billing_address {
+            city
+          }
+    }
+  }
+}
+QUERY;
+
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
@@ -506,4 +539,21 @@ private function assignQuoteToCustomer(
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
+
+    /**
+     * @return array
+     */
+    public function dataProviderSetWithoutRequiredParameters()
+    {
+        return [
+            'missed_billing_address' => [
+                'cart_id: "cart_id_value"',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput! was not provided.',
+            ],
+            'missed_cart_id' => [
+                'billing_address: {}',
+                'Required parameter "cart_id" is missing'
+            ]
+        ];
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 27de0d12e413d..de07b80b39592 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -263,6 +263,38 @@ public function testSetBillingAddressOnNonExistentCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @dataProvider dataProviderSetWithoutRequiredParameters
+     * @param string $input
+     * @param string $message
+     * @throws \Exception
+     */
+    public function testSetBillingAddressWithoutRequiredParameters(string $input, string $message)
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+        billing_address {
+            city
+          }
+    }
+  }
+}
+QUERY;
+
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
@@ -297,4 +329,21 @@ private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): str
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
+
+    /**
+     * @return array
+     */
+    public function dataProviderSetWithoutRequiredParameters()
+    {
+        return [
+            'missed_billing_address' => [
+                'cart_id: "cart_id_value"',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput! was not provided.',
+            ],
+            'missed_cart_id' => [
+                'billing_address: {}',
+                'Required parameter "cart_id" is missing'
+            ]
+        ];
+    }
 }

From 305ccd1492c96fa9098d55da0a91dc98b9461da9 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Sat, 16 Mar 2019 16:57:19 +0200
Subject: [PATCH 0631/1055] magento/graphql-ce#480: [Test Coverage]
 'GetBillingAddress' functionality

---
 .../Quote/Customer/GetBillingAddressTest.php  | 212 ++++++++++++++++++
 .../Quote/Guest/GetBillingAddressTest.php     | 185 +++++++++++++++
 2 files changed, 397 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
new file mode 100644
index 0000000000000..574e17721db57
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+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 get billing address
+ */
+class GetBillingAddressTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testGetCartWithBillingAddress()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        $expectedBillingAddressData = [
+            'firstname' => 'John',
+            'lastname' => 'Smith',
+            'company' => 'CompanyName',
+            'street' => [
+                'Green str, 67'
+            ],
+            'city' => 'CityM',
+            'region' => [
+                'code' => 'AL',
+                'label' => 'Alabama',
+            ],
+            'postcode' => '75477',
+            'country' => [
+                'code' => 'US',
+                'label' => 'US',
+            ],
+            'telephone' => '3468676',
+            'address_type' => 'BILLING',
+            'customer_notes' => null,
+        ];
+
+        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     */
+    public function testGetBillingAddressFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery(
+            $this->getGetBillingAddressQuery($maskedQuoteId),
+            [],
+            '',
+            $this->getHeaderMap('customer2@search.example.com')
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GiftMessage/_files/quote_with_customer_and_message.php
+     */
+    public function testGetBillingAddressIfBillingAddressIsNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('message_order_21');
+        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        $expectedBillingAddressData = [
+            'firstname' => null,
+            'lastname' => null,
+            'company' => null,
+            'street' => [
+                ''
+            ],
+            'city' => null,
+            'region' => [
+                'code' => null,
+                'label' => null,
+            ],
+            'postcode' => null,
+            'country' => [
+                'code' => null,
+                'label' => null,
+            ],
+            'telephone' => null,
+            'address_type' => 'BILLING',
+            'customer_notes' => null,
+        ];
+
+        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetBillingAddressOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getGetBillingAddressQuery(
+        string $maskedQuoteId
+    ): string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    billing_address {
+      firstname
+      lastname
+      company
+      street
+      city
+      region 
+      {
+        code
+        label
+      }
+      postcode
+      country 
+      {
+        code
+        label
+      }
+      telephone
+      address_type
+      customer_notes
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+
+    /**
+     * @param string $reservedOrderId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
new file mode 100644
index 0000000000000..3afc8c3ecdd1c
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+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 get billing address
+ */
+class GetBillingAddressTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
+    public function testGetCartWithBillingAddress()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
+        $response = $this->graphQlQuery($this->getGetBillingAddressQuery($maskedQuoteId));
+
+        $expectedBillingAddressData = [
+            'firstname' => 'John',
+            'lastname' => 'Smith',
+            'company' => null,
+            'street' => [
+                'Black str, 48'
+            ],
+            'city' => 'CityX',
+            'region' => [
+                'code' => 'AL',
+                'label' => 'Alabama',
+            ],
+            'postcode' => '47676',
+            'country' => [
+                'code' => 'US',
+                'label' => 'US',
+            ],
+            'telephone' => '3234676',
+            'address_type' => 'BILLING',
+        ];
+
+        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testGetBillingAddressFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testGetBillingAddressIfBillingAddressIsNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
+        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        $expectedBillingAddressData = [
+            'firstname' => null,
+            'lastname' => null,
+            'company' => null,
+            'street' => [
+                ''
+            ],
+            'city' => null,
+            'region' => [
+                'code' => null,
+                'label' => null,
+            ],
+            'postcode' => null,
+            'country' => [
+                'code' => null,
+                'label' => null,
+            ],
+            'telephone' => null,
+            'address_type' => 'BILLING',
+        ];
+
+        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetBillingAddressOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getGetBillingAddressQuery(
+        string $maskedQuoteId
+    ): string {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    billing_address {
+      firstname
+      lastname
+      company
+      street
+      city
+      region 
+      {
+        code
+        label
+      }
+      postcode
+      country 
+      {
+        code
+        label
+      }
+      telephone
+      address_type
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $reservedOrderId
+     * @return string
+     */
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+}

From 7d998a75d37f1098ab0528e7d5d50736584941cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Ca=C3=A7ador?= <samuelmoreira27@gmail.com>
Date: Sat, 16 Mar 2019 17:26:49 +0000
Subject: [PATCH 0632/1055] Restore multishipping_agreements file for backward
 compatibility

---
 .../templates/multishipping_agreements.phtml  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml

diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
new file mode 100644
index 0000000000000..2d0667ee27cf8
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<?php
+/**
+ * @var $block \Magento\CheckoutAgreements\Block\Agreements
+ */
+?>
+<?php if (!$block->getAgreements()) {
+    return;
+} ?>
+<ol id="checkout-agreements" class="agreements checkout items">
+    <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
+    <?php foreach ($block->getAgreements() as $agreement): ?>
+        <li class="item">
+            <div class="checkout-agreement-item-content"<?= ($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
+                <?php if ($agreement->getIsHtml()):?>
+                    <?= /* @escapeNotVerified */ $agreement->getContent() ?>
+                <?php else:?>
+                    <?= nl2br($block->escapeHtml($agreement->getContent())) ?>
+                <?php endif; ?>
+            </div>
+            <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
+            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
+                <input type="checkbox"
+                       id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
+                       name="agreement[<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>]"
+                       value="1"
+                       title="<?= $block->escapeHtml($agreement->getCheckboxText()) ?>"
+                       class="checkbox"
+                       data-validate="{required:true}"/>
+                <label class="label" for="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>">
+                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+                </label>
+            </div>
+            <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
+            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
+                <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+            </div>
+            <?php endif; ?>
+        </li>
+    <?php endforeach ?>
+</ol>
\ No newline at end of file

From 5d9a64e4ffffb037523233ffea3da941c83fa90f Mon Sep 17 00:00:00 2001
From: Volodymyr Vygovskyi <v.vygovskyi@atwix.com>
Date: Sat, 16 Mar 2019 23:17:02 +0200
Subject: [PATCH 0633/1055] issue #485 [Test coverage] testReSetShippingMethod

---
 .../Customer/SetShippingMethodsOnCartTest.php | 51 +++++++++++--
 .../Guest/SetShippingMethodsOnCartTest.php    | 72 +++++++++++++++++--
 2 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 736ea69440753..eae7a0374d210 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -13,6 +13,7 @@
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Quote\Model\Quote;
 
 /**
  * Test for setting shipping methods on cart for customer
@@ -116,6 +117,33 @@ public function testSetMultipleShippingMethods()
         $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
+     */
+    public function testReSetShippingMethod()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $quote = $this->getQuoteByReversedQuoteId('test_order_1');
+        $shippingAddressId = $quote->getShippingAddress()->getId();
+        
+        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode, $carrierCode, $shippingAddressId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        foreach ($response['setShippingMethodsOnCart']['cart']['shipping_addresses'] as $address) {
+            self::assertArrayHasKey('address_id', $address);
+            if ($address['address_id'] == $shippingAddressId) {
+                self::assertArrayHasKey('selected_shipping_method', $address);
+                self::assertEquals($methodCode, $address['selected_shipping_method']['method_code']);
+                self::assertEquals($carrierCode, $address['selected_shipping_method']['carrier_code']);
+            }
+        }
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $shippingMethodCode
@@ -135,18 +163,15 @@ private function prepareMutationQuery(
   setShippingMethodsOnCart(input: 
     {
       cart_id: "$maskedQuoteId", 
-      shipping_addresses: [{
+      shipping_methods: [{
         cart_address_id: $shippingAddressId
-        shipping_method: {
-          method_code: "$shippingMethodCode"
-          carrier_code: "$shippingCarrierCode"
-        }
+        method_code: "$shippingMethodCode"
+        carrier_code: "$shippingCarrierCode"
       }]
       }) {
-    
     cart {
-      cart_id,
       shipping_addresses {
+        address_id
         selected_shipping_method {
           carrier_code
           method_code
@@ -174,6 +199,18 @@ private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): str
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
 
+    /**
+     * @param string $reversedQuoteId
+     * @return Quote
+     */
+    private function getQuoteByReversedQuoteId(string $reversedQuoteId): Quote
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        return $quote;
+    }
+
     /**
      * @param string $reversedQuoteId
      * @param int $customerId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index f159cb6f6151e..14662148b32dc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -109,6 +110,34 @@ public function testSetMultipleShippingMethods()
         $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/422');
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
+     */
+    public function testReSetShippingMethod()
+    {
+        $maskedQuoteId = $this->unAssignCustomerFromQuoteAndShippingAddress('test_order_1');
+        $methodCode = 'flatrate';
+        $carrierCode = 'flatrate';
+        $quote = $this->getQuoteByReversedQuoteId('test_order_1');
+        $shippingAddress = $quote->getShippingAddress();
+        $shippingAddressId = $shippingAddress->getId();
+        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode, $carrierCode, $shippingAddressId);
+
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        foreach ($response['setShippingMethodsOnCart']['cart']['shipping_addresses'] as $address) {
+            self::assertArrayHasKey('address_id', $address);
+            if ($address['address_id'] == $shippingAddressId) {
+                self::assertArrayHasKey('selected_shipping_method', $address);
+                self::assertEquals($methodCode, $address['selected_shipping_method']['method_code']);
+                self::assertEquals($carrierCode, $address['selected_shipping_method']['carrier_code']);
+            }
+        }
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $shippingMethodCode
@@ -128,16 +157,15 @@ private function prepareMutationQuery(
   setShippingMethodsOnCart(input: 
     {
       cart_id: "$maskedQuoteId", 
-      shipping_addresses: [{
+      shipping_methods: [{
         cart_address_id: $shippingAddressId
-        shipping_method: {
-          method_code: "$shippingMethodCode"
-          carrier_code: "$shippingCarrierCode"
-        }
+        method_code: "$shippingMethodCode"
+        carrier_code: "$shippingCarrierCode"
       }]
       }) {
     cart {
       shipping_addresses {
+        address_id
         selected_shipping_method {
           carrier_code
           method_code
@@ -152,6 +180,40 @@ private function prepareMutationQuery(
 QUERY;
     }
 
+    /**
+     * @param string $reversedQuoteId
+     * @param int $customerId
+     * @return string
+     */
+    private function unAssignCustomerFromQuoteAndShippingAddress(
+        string $reversedQuoteId
+    ): string {
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+        $quote->setCustomerId(0);
+
+        $shippingAddress = $quote->getShippingAddress();
+        $shippingAddress->setCustomerId(0);
+        $shippingAddress->setCustomerAddressId(0);
+
+        $this->quoteResource->save($quote);
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
+
+    /**
+     * @param string $reversedQuoteId
+     * @return Quote
+     */
+    private function getQuoteByReversedQuoteId(string $reversedQuoteId): Quote
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
+
+        return $quote;
+    }
+
     /**
      * @param string $reversedQuoteId
      * @return string

From b93da7a4b8c1e0df65ca505dbdc47be2ed8d3d2c Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sat, 16 Mar 2019 23:44:21 +0200
Subject: [PATCH 0634/1055] #481 Created a webapi test for removing coupon from
 the guest quote

---
 .../Quote/Guest/RemoveCouponFromCartTest.php  | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
new file mode 100644
index 0000000000000..45b2ff8313e41
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+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 RemoveCouponFromCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveCouponFromCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        /* Apply coupon to the quote */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->graphQlQuery($query);
+
+        /* Remove coupon from quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testRemoveCouponFromCustomerCart()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query);
+    }
+
+    public function testRemoveCouponFromNonExistentCart()
+    {
+        $maskedQuoteId = '1234000000099912';
+
+        /* Remove coupon from quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+
+        self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId. '"');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $couponCode
+     * @return string
+     */
+    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    {
+        return <<<QUERY
+mutation {
+  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function prepareRemoveCouponRequestQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+mutation {
+  removeCouponFromCart(input: {cart_id: "$maskedQuoteId"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+    }
+}

From 3d421d431f12a8b5186e468af1636d111a385818 Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sat, 16 Mar 2019 23:45:24 +0200
Subject: [PATCH 0635/1055] #481 Removed extracted code from the test

---
 .../Magento/GraphQl/Quote/CouponTest.php      | 77 -------------------
 1 file changed, 77 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
index 54fdc3ac0f360..d24c3d6e78340 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
@@ -126,63 +126,6 @@ public function testGuestCustomerAttemptToChangeCustomerCart()
         $this->graphQlQuery($query);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     */
-    public function testRemoveCoupon()
-    {
-        $couponCode = '2?ds5!2d';
-
-        /* Apply coupon to the quote */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->graphQlQuery($query);
-
-        /* Remove coupon from quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('removeCouponFromCart', $response);
-        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     */
-    public function testRemoveCouponFromCustomerCartByGuest()
-    {
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-
-        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query);
-    }
-
     /**
      * @param string $maskedQuoteId
      * @param string $couponCode
@@ -200,26 +143,6 @@ private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $cou
     }
   }
 }
-QUERY;
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @return string
-     */
-    private function prepareRemoveCouponRequestQuery(string $maskedQuoteId): string
-    {
-        return <<<QUERY
-mutation {
-  removeCouponFromCart(input: {cart_id: "$maskedQuoteId"}) {
-    cart {
-      applied_coupon {
-        code
-      }
-    }
-  }
-}
-
 QUERY;
     }
 }

From 96543cf2d8bec2714daaa36b659bd2ffb5213663 Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sun, 17 Mar 2019 00:04:38 +0200
Subject: [PATCH 0636/1055] #481 Added a wapapi test to cover
 removeCouponFromCart case

---
 .../Customer/RemoveCouponFromCartTest.php     | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
new file mode 100644
index 0000000000000..51eac60d45282
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\Framework\Exception\AuthenticationException;
+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;
+
+/**
+ * Check removing of the coupon from customer quotes
+ */
+class RemoveCouponFromCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    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/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveCouponFromCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        /* Apply coupon to the quote */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        /* Remove coupon from quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * Retrieve customer authorization headers
+     *
+     * @param string $email
+     * @param string $password
+     * @return array
+     * @throws AuthenticationException
+     */
+    private function prepareAuthorizationHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+
+    /**
+     * Retrieve add coupon GraphQL query
+     *
+     * @param string $maskedQuoteId
+     * @param string $couponCode
+     * @return string
+     */
+    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    {
+        return <<<QUERY
+mutation {
+  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * Retrieve remove coupon GraphQL query
+     *
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function prepareRemoveCouponRequestQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+mutation {
+  removeCouponFromCart(input: {cart_id: "$maskedQuoteId"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+
+QUERY;
+    }
+}

From 36d8c88ffb326fc8514aba5c52b5e833df35d804 Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sun, 17 Mar 2019 13:30:56 +0200
Subject: [PATCH 0637/1055] #481 Added testRemoveCouponFromAonotherCustomerCart
 and testRemoveCouponFromGuestCart

---
 .../Customer/RemoveCouponFromCartTest.php     | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
index 51eac60d45282..f9cba5526b864 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -81,6 +81,66 @@ public function testRemoveCouponFromCart()
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveCouponFromAonotherCustomerCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        /* Apply coupon to the quote */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        /* Remove coupon from quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer_two@example.com', 'password');
+
+        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$maskedQuoteId\"");
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveCouponFromGuestCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        /* Apply coupon to the quote */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->graphQlQuery($query);
+
+        /* Remove coupon from quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        
+        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$maskedQuoteId\"");
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
     /**
      * Retrieve customer authorization headers
      *

From d7a53792d6df758da54dc3c12698df1ca59b35bb Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sun, 17 Mar 2019 13:34:34 +0200
Subject: [PATCH 0638/1055] #481 Added comments

---
 .../Quote/Customer/RemoveCouponFromCartTest.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
index f9cba5526b864..cba25e0c40e39 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -58,7 +58,7 @@ public function testRemoveCouponFromCart()
     {
         $couponCode = '2?ds5!2d';
 
-        /* Apply coupon to the quote */
+        /* Apply coupon to the customer quote */
         $this->quoteResource->load(
             $this->quote,
             'test_order_with_simple_product_without_address',
@@ -73,7 +73,7 @@ public function testRemoveCouponFromCart()
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
         $this->graphQlQuery($query, [], '', $queryHeaders);
 
-        /* Remove coupon from quote */
+        /* Remove coupon from the quote */
         $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query, [], '', $queryHeaders);
 
@@ -90,7 +90,7 @@ public function testRemoveCouponFromAonotherCustomerCart()
     {
         $couponCode = '2?ds5!2d';
 
-        /* Apply coupon to the quote */
+        /* Apply coupon to the first customer quote */
         $this->quoteResource->load(
             $this->quote,
             'test_order_with_simple_product_without_address',
@@ -105,7 +105,7 @@ public function testRemoveCouponFromAonotherCustomerCart()
         $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
         $this->graphQlQuery($query, [], '', $queryHeaders);
 
-        /* Remove coupon from quote */
+        /* Remove coupon from the quote from the second customer */
         $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
         $queryHeaders = $this->prepareAuthorizationHeaders('customer_two@example.com', 'password');
 
@@ -122,7 +122,7 @@ public function testRemoveCouponFromGuestCart()
     {
         $couponCode = '2?ds5!2d';
 
-        /* Apply coupon to the quote */
+        /* Apply coupon to the guest quote */
         $this->quoteResource->load(
             $this->quote,
             'test_order_with_simple_product_without_address',
@@ -136,7 +136,7 @@ public function testRemoveCouponFromGuestCart()
         /* Remove coupon from quote */
         $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
         $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        
+
         $this->expectExceptionMessage("The current user cannot perform operations on cart \"$maskedQuoteId\"");
         $this->graphQlQuery($query, [], '', $queryHeaders);
     }

From 9000000a7cad2bbd8ddb320bfcf643a92e8cd1c9 Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sun, 17 Mar 2019 14:34:14 +0200
Subject: [PATCH 0639/1055] #481 Added more test cases covered

---
 .../Customer/RemoveCouponFromCartTest.php     | 178 +++++++++++++++++-
 1 file changed, 176 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
index cba25e0c40e39..818af4c8853ec 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -8,10 +8,14 @@
 namespace Magento\GraphQl\Quote\Customer;
 
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 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\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -40,6 +44,16 @@ class RemoveCouponFromCartTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
+    /**
+     * @var CouponRepositoryInterface
+     */
+    private $couponRepository;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
@@ -47,6 +61,8 @@ protected function setUp()
         $this->quote = $objectManager->create(Quote::class);
         $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->couponRepository = $objectManager->get(CouponRepositoryInterface::class);
+        $this->coupon = $objectManager->create(Coupon::class);
     }
 
     /**
@@ -81,16 +97,119 @@ public function testRemoveCouponFromCart()
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveCouponFromCartTwice()
+    {
+        $couponCode = '2?ds5!2d';
+
+        /* Apply coupon to the customer quote */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        /* Remove coupon from the quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+
+        /* Remove coupon from the quote the second time */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testRemoveCouponFromEmptyCart()
+    {
+        /* Assign the empty quote to the customer */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $quoteId = (int)$this->quote->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute($quoteId);
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+
+        /* Remove coupon from the empty quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+
+        $this->expectExceptionMessage("The \"$quoteId\" Cart doesn't contain products");
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveCouponFromCartWithoutItems()
+    {
+        $couponCode = '2?ds5!2d';
+
+        /* Assign the quote to the customer */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+
+        /* Apply coupon to the customer quote */
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        /* Clear the quote */
+        $this->quote->removeAllItems();
+        $this->quoteResource->save($this->quote);
+
+        /* Remove coupon from the customer quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      */
-    public function testRemoveCouponFromAonotherCustomerCart()
+    public function testRemoveCouponFromAnotherCustomerCart()
     {
         $couponCode = '2?ds5!2d';
 
-        /* Apply coupon to the first customer quote */
+        /* Assign the quote to the customer */
         $this->quoteResource->load(
             $this->quote,
             'test_order_with_simple_product_without_address',
@@ -101,6 +220,7 @@ public function testRemoveCouponFromAonotherCustomerCart()
         $this->quote->setCustomerId(1);
         $this->quoteResource->save($this->quote);
 
+        /* Apply coupon to the first customer quote */
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
         $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
         $this->graphQlQuery($query, [], '', $queryHeaders);
@@ -141,6 +261,60 @@ public function testRemoveCouponFromGuestCart()
         $this->graphQlQuery($query, [], '', $queryHeaders);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveNonExistentCouponFromCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        /* Assign the quote to the customer */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+
+        /* Apply coupon to the customer quote */
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        /* Remove the coupon */
+        $this->removeCoupon($couponCode);
+
+        /* Remove the non-existent coupon from the quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * Remove the given coupon code from the database
+     *
+     * @param string $couponCode
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    private function removeCoupon(string $couponCode): void
+    {
+        $this->coupon->loadByCode($couponCode);
+        $couponId = $this->coupon->getCouponId();
+
+        if ($couponId) {
+            $this->couponRepository->deleteById($couponId);
+        }
+    }
+
     /**
      * Retrieve customer authorization headers
      *

From a8b4cc992eda5ec163676e3699630e0e5d5144a0 Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sun, 17 Mar 2019 14:38:37 +0200
Subject: [PATCH 0640/1055] #481 Added
 testRemoveCouponFromCartWithNoCouponApplied case

---
 .../Customer/RemoveCouponFromCartTest.php     | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
index 818af4c8853ec..b228d315f8890 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -74,7 +74,7 @@ public function testRemoveCouponFromCart()
     {
         $couponCode = '2?ds5!2d';
 
-        /* Apply coupon to the customer quote */
+        /* Assign the quote to the customer */
         $this->quoteResource->load(
             $this->quote,
             'test_order_with_simple_product_without_address',
@@ -85,6 +85,7 @@ public function testRemoveCouponFromCart()
         $this->quote->setCustomerId(1);
         $this->quoteResource->save($this->quote);
 
+        /* Apply coupon to the customer quote */
         $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
         $this->graphQlQuery($query, [], '', $queryHeaders);
@@ -106,7 +107,7 @@ public function testRemoveCouponFromCartTwice()
     {
         $couponCode = '2?ds5!2d';
 
-        /* Apply coupon to the customer quote */
+        /* Assign the quote to the customer */
         $this->quoteResource->load(
             $this->quote,
             'test_order_with_simple_product_without_address',
@@ -117,6 +118,7 @@ public function testRemoveCouponFromCartTwice()
         $this->quote->setCustomerId(1);
         $this->quoteResource->save($this->quote);
 
+        /* Apply coupon to the customer quote */
         $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
         $this->graphQlQuery($query, [], '', $queryHeaders);
@@ -136,6 +138,32 @@ public function testRemoveCouponFromCartTwice()
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     */
+    public function testRemoveCouponFromCartWithNoCouponApplied()
+    {
+        /* Assign the quote to the customer */
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+
+        /* Remove coupon from the quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php

From 7677da6c9f1597ba5e92a9fdd3360cbd97da1c61 Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sun, 17 Mar 2019 14:47:38 +0200
Subject: [PATCH 0641/1055] #481 Added cases to the guest coupon test

---
 .../Quote/Guest/RemoveCouponFromCartTest.php  | 116 ++++++++++++++++++
 1 file changed, 116 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
index 45b2ff8313e41..c5929795b534a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
@@ -7,9 +7,13 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -33,12 +37,24 @@ class RemoveCouponFromCartTest extends GraphQlAbstract
      */
     private $quoteIdToMaskedId;
 
+    /**
+     * @var CouponRepositoryInterface
+     */
+    private $couponRepository;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
     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->couponRepository = $objectManager->get(CouponRepositoryInterface::class);
+        $this->coupon = $objectManager->create(Coupon::class);
     }
 
     /**
@@ -102,6 +118,106 @@ public function testRemoveCouponFromNonExistentCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testRemoveCouponFromEmptyCart()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $quoteId = (int)$this->quote->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute($quoteId);
+
+        /* Remove coupon from the empty quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage("The \"$quoteId\" Cart doesn't contain products");
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveCouponFromCartWithoutItems()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        /* Apply coupon to the guest quote */
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->graphQlQuery($query);
+
+        /* Clear the quote */
+        $this->quote->removeAllItems();
+        $this->quoteResource->save($this->quote);
+
+        /* Remove coupon from the guest quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testRemoveNonExistentCouponFromCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        /* Apply coupon to the guest quote */
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->graphQlQuery($query);
+
+        /* Remove the coupon */
+        $this->removeCoupon($couponCode);
+
+        /* Remove the non-existent coupon from the quote */
+        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('removeCouponFromCart', $response);
+        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * Remove the given coupon code from the database
+     *
+     * @param string $couponCode
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    private function removeCoupon(string $couponCode): void
+    {
+        $this->coupon->loadByCode($couponCode);
+        $couponId = $this->coupon->getCouponId();
+
+        if ($couponId) {
+            $this->couponRepository->deleteById($couponId);
+        }
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $couponCode

From 904a4a8c80b95da48d5095dde7fdec34540952f7 Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Mon, 18 Mar 2019 01:17:48 +0200
Subject: [PATCH 0642/1055] Convert FlushStaticFilesCacheButtonVisibilityTest
 to MFTF

---
 .../Section/AdminCacheManagementSection.xml   |  1 +
 ...shStaticFilesCacheButtonVisibilityTest.xml | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml

diff --git a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
index 34a77095d524d..12d35df42bcc5 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
@@ -30,5 +30,6 @@
         <element name="pageCacheCheckbox" type="checkbox" selector="input[value='full_page']"/>
         <element name="webServicesConfigCheckbox" type="checkbox" selector="input[value='config_webservice']"/>
         <element name="translationsCheckbox" type="checkbox" selector="input[value='translate']"/>
+        <element name="FlushStaticFilesCache" type="button" selector="//*[@id='container']//button[contains(., 'Flush Static Files Cache')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
new file mode 100644
index 0000000000000..6cd280bb7add3
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
@@ -0,0 +1,32 @@
+<?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="FlushStaticFilesCacheButtonVisibilityTest">
+        <annotations>
+            <features value="PageCache"/>
+            <title value="Check visibility of flush static files cache button"/>
+            <description value="Flush Static Files Cache button visibility"/>
+            <severity value="MAJOR"/>
+            <stories value="Check flush static files cache button"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Log in to Admin Panel -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!-- Open Cache Management page -->
+        <amOnPage url="{{AdminCacheManagementPage.url}}" stepKey="amOnPageCacheManagement"/>
+        <waitForPageLoad stepKey="waitForPageCacheManagementLoad"/>
+
+        <!-- Check 'Flush Static Files Cache' not visible in production mode. -->
+        <dontSee selector="{{AdminCacheManagementSection.FlushStaticFilesCache}}" stepKey="seeFlushStaticFilesButton" />
+    </test>
+</tests>

From fda4377384169d385a04057e7edf2f1ac32bc5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Mon, 18 Mar 2019 09:21:23 +0100
Subject: [PATCH 0643/1055] Move deploymentConfig to constructor in Locale
 Resolver

---
 .../Magento/Framework/Locale/Resolver.php     | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/lib/internal/Magento/Framework/Locale/Resolver.php b/lib/internal/Magento/Framework/Locale/Resolver.php
index 3a516fcea5e91..83637dac9c475 100644
--- a/lib/internal/Magento/Framework/Locale/Resolver.php
+++ b/lib/internal/Magento/Framework/Locale/Resolver.php
@@ -64,16 +64,19 @@ class Resolver implements ResolverInterface
      * @param string $defaultLocalePath
      * @param string $scopeType
      * @param mixed $locale
+     * @param DeploymentConfig|null $deploymentConfig
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         $defaultLocalePath,
         $scopeType,
-        $locale = null
+        $locale = null,
+        DeploymentConfig $deploymentConfig = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->defaultLocalePath = $defaultLocalePath;
         $this->scopeType = $scopeType;
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->create(DeploymentConfig::class);
         $this->setLocale($locale);
     }
 
@@ -101,7 +104,7 @@ public function getDefaultLocale()
     {
         if (!$this->defaultLocale) {
             $locale = false;
-            if ($this->getDeploymentConfig()->isAvailable() && $this->getDeploymentConfig()->isDbAvailable()) {
+            if ($this->deploymentConfig->isAvailable() && $this->deploymentConfig->isDbAvailable()) {
                 $locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
             }
             if (!$locale) {
@@ -169,18 +172,4 @@ public function revert()
         }
         return $result;
     }
-
-    /**
-     * Retrieve Deployment Config
-     *
-     * @return DeploymentConfig
-     */
-    private function getDeploymentConfig()
-    {
-        if (!$this->deploymentConfig) {
-            $this->deploymentConfig = ObjectManager::getInstance()->get(DeploymentConfig::class);
-        }
-
-        return $this->deploymentConfig;
-    }
 }

From b2004c3f74f7cdd2654986f056f6ba8d8beaa5ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Mon, 18 Mar 2019 09:21:48 +0100
Subject: [PATCH 0644/1055] fix NumberFormatter initialization when no currency
 is set

---
 lib/internal/Magento/Framework/Locale/Format.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
index ca50cdb2440f4..0cdd80208fbcf 100644
--- a/lib/internal/Magento/Framework/Locale/Format.php
+++ b/lib/internal/Magento/Framework/Locale/Format.php
@@ -100,7 +100,7 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
         }
 
         $formatter = new \NumberFormatter(
-            $localeCode . '@currency=' . $currency->getCode(),
+            $currency->getCode() ? $localeCode . '@currency=' . $currency->getCode() : $localeCode,
             \NumberFormatter::CURRENCY
         );
         $format = $formatter->getPattern();

From b86f981ad04f63c7ca8d2c3ca5f3b4abe999ca4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Mon, 18 Mar 2019 09:22:34 +0100
Subject: [PATCH 0645/1055] fix de_CH group symbol in unit test

---
 lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
index 1141f451c13a5..72cc08b7c015c 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
@@ -91,7 +91,7 @@ public function getPriceFormatDataProvider(): array
         return [
             ['en_US', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
             ['de_DE', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
-            ['de_CH', ['decimalSymbol' => '.', 'groupSymbol' => '\'']],
+            ['de_CH', ['decimalSymbol' => '.', 'groupSymbol' => '’']],
             ['uk_UA', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
         ];
     }

From dc71ef160d300f1bec2e2a0c610953738d3907a8 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 18 Mar 2019 11:01:13 +0200
Subject: [PATCH 0646/1055] ENGCOM-4502: Static tests fix.

---
 .../Model/Spi/StockRegistryProviderInterface.php  |  6 ++++++
 .../Model/Spi/StockStateProviderInterface.php     | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
index 49d9b4aaa34e8..0fa4b919c40fa 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
@@ -15,12 +15,16 @@
 interface StockRegistryProviderInterface
 {
     /**
+     * Get stock.
+     *
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
      */
     public function getStock($scopeId);
 
     /**
+     * Get stock item.
+     *
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
@@ -28,6 +32,8 @@ public function getStock($scopeId);
     public function getStockItem($productId, $scopeId);
 
     /**
+     * Get stock status.
+     *
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
index 31bdc19f9cf7a..30f703b5b928f 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * Interface StockStateProviderInterface
- * 
+ *
  * @deprecated 2.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
@@ -17,18 +17,24 @@
 interface StockStateProviderInterface
 {
     /**
+     * Verify stock.
+     *
      * @param StockItemInterface $stockItem
      * @return bool
      */
     public function verifyStock(StockItemInterface $stockItem);
 
     /**
+     * Verify notification.
+     *
      * @param StockItemInterface $stockItem
      * @return bool
      */
     public function verifyNotification(StockItemInterface $stockItem);
 
     /**
+     * Validate quote qty.
+     *
      * @param StockItemInterface $stockItem
      * @param int|float $itemQty
      * @param int|float $qtyToCheck
@@ -48,8 +54,9 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $itemQty, $qtyT
     public function checkQty(StockItemInterface $stockItem, $qty);
 
     /**
-     * Returns suggested qty that satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions
-     * or original qty if such value does not exist
+     * Returns suggested qty or original qty if such value does not exist.
+     *
+     * Suggested qty satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions.
      *
      * @param StockItemInterface $stockItem
      * @param int|float $qty
@@ -58,6 +65,8 @@ public function checkQty(StockItemInterface $stockItem, $qty);
     public function suggestQty(StockItemInterface $stockItem, $qty);
 
     /**
+     * Check qty increments.
+     *
      * @param StockItemInterface $stockItem
      * @param int|float $qty
      * @return \Magento\Framework\DataObject

From 091fc8eb46c3fe5bff172c991c2bb6b140fb11f3 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Mon, 18 Mar 2019 11:07:59 +0200
Subject: [PATCH 0647/1055] magento/graphql-ce#480: [Test Coverage]
 'GetBillingAddress' functionality 1. Fix PHP Fatal error:  Uncaught
 Exception: Exception occurred when running the
 "\/home\/travis\/build\/magento\/graphql-ce\/dev\/tests\/integration\/testsuite\/Magento\/Sales\/_files\/guest_quote_with_addresses.php"
 fixture: URL key for specified store already exists. in
 /home/travis/build/magento/graphql-ce/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php:114

---
 .../_files/guest_quote_with_addresses.php     | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

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
index b8f2ca38e2489..c97d20b2f8b48 100644
--- 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
@@ -10,27 +10,31 @@
 \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);
+
+try {
+    /** @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();
+} catch (\Magento\Framework\Exception\AlreadyExistsException $exception) {
+    //Product already exists
+}
 $product = $productRepository->get('simple-product-guest-quote');
 
 $addressData = reset($addresses);

From 73d88aaeaa7da30c68608d7f048b7b88557e936d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Mon, 18 Mar 2019 11:34:08 +0100
Subject: [PATCH 0648/1055] Revert "fix de_CH group symbol in unit test"

This reverts commit b86f981ad04f63c7ca8d2c3ca5f3b4abe999ca4d.
---
 lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
index 72cc08b7c015c..1141f451c13a5 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
@@ -91,7 +91,7 @@ public function getPriceFormatDataProvider(): array
         return [
             ['en_US', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
             ['de_DE', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
-            ['de_CH', ['decimalSymbol' => '.', 'groupSymbol' => '’']],
+            ['de_CH', ['decimalSymbol' => '.', 'groupSymbol' => '\'']],
             ['uk_UA', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
         ];
     }

From 88b64017288d02c3849301cabfdc230c1bd70ab1 Mon Sep 17 00:00:00 2001
From: Alex <silyadev@gmail.com>
Date: Mon, 18 Mar 2019 12:43:37 +0200
Subject: [PATCH 0649/1055] Fill data_hash from BULK response with correct data

---
 .../Model/MassSchedule.php                      | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
index eae92e1663fc8..eb760a82916a6 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -20,6 +20,7 @@
 use Psr\Log\LoggerInterface;
 use Magento\AsynchronousOperations\Model\ResourceModel\Operation\OperationRepository;
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Encryption\Encryptor;
 
 /**
  * Class MassSchedule used for adding multiple entities as Operations to Bulk Management with the status tracking
@@ -63,6 +64,11 @@ class MassSchedule
      */
     private $userContext;
 
+    /**
+     * @var Encryptor
+     */
+    private $encryptor;
+
     /**
      * Initialize dependencies.
      *
@@ -73,6 +79,7 @@ class MassSchedule
      * @param LoggerInterface $logger
      * @param OperationRepository $operationRepository
      * @param UserContextInterface $userContext
+     * @param Encryptor|null $encryptor
      */
     public function __construct(
         IdentityGeneratorInterface $identityService,
@@ -81,7 +88,8 @@ public function __construct(
         BulkManagementInterface $bulkManagement,
         LoggerInterface $logger,
         OperationRepository $operationRepository,
-        UserContextInterface $userContext = null
+        UserContextInterface $userContext = null,
+        Encryptor $encryptor = null
     ) {
         $this->identityService = $identityService;
         $this->itemStatusInterfaceFactory = $itemStatusInterfaceFactory;
@@ -90,6 +98,7 @@ public function __construct(
         $this->logger = $logger;
         $this->operationRepository = $operationRepository;
         $this->userContext = $userContext ?: ObjectManager::getInstance()->get(UserContextInterface::class);
+        $this->encryptor = $encryptor ?: ObjectManager::getInstance()->get(Encryptor::class);
     }
 
     /**
@@ -130,10 +139,12 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
             $requestItem = $this->itemStatusInterfaceFactory->create();
 
             try {
-                $operations[] = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
+                $operation = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
+                $operations[] = $operation;
                 $requestItem->setId($key);
                 $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);
-                $requestItems[] = $requestItem;
+                $requestItem->setDataHash($this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256));
+                $requestItems[] = $requestItem;git
             } catch (\Exception $exception) {
                 $this->logger->error($exception);
                 $requestItem->setId($key);

From 705416eb167111285653c5656673f5bc6655f63c Mon Sep 17 00:00:00 2001
From: Alex <silyadev@gmail.com>
Date: Mon, 18 Mar 2019 13:10:54 +0200
Subject: [PATCH 0650/1055] Fix extra symbols

---
 app/code/Magento/AsynchronousOperations/Model/MassSchedule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
index eb760a82916a6..3ab6dc12054be 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -144,7 +144,7 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
                 $requestItem->setId($key);
                 $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);
                 $requestItem->setDataHash($this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256));
-                $requestItems[] = $requestItem;git
+                $requestItems[] = $requestItem;
             } catch (\Exception $exception) {
                 $this->logger->error($exception);
                 $requestItem->setId($key);

From 2ce4ab0ffcd5d7f791c28f543037ff7f31bc7bdf Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Mon, 18 Mar 2019 12:11:30 +0000
Subject: [PATCH 0651/1055] Moved generation of Gallery options and Gallery
 fullscreen options to own block functions.

---
 .../Block/Product/View/GalleryOptions.php     | 152 ++++++++++
 .../Block/Product/View/GalleryOptionsTest.php | 275 ++++++++++++++++++
 .../frontend/layout/catalog_product_view.xml  |   6 +-
 .../templates/product/view/gallery.phtml      |  40 +--
 4 files changed, 434 insertions(+), 39 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
 create mode 100644 app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php

diff --git a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
new file mode 100644
index 0000000000000..084da345a12d4
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Block\Product\View;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Catalog\Block\Product\Context;
+use Magento\Framework\Stdlib\ArrayUtils;
+
+class GalleryOptions extends AbstractView implements ArgumentInterface
+{
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var Gallery
+     */
+    private $gallery;
+
+    /**
+     * @param Context $context
+     * @param ArrayUtils $arrayUtils
+     * @param Json $jsonSerializer
+     * @param Gallery $gallery
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        ArrayUtils $arrayUtils,
+        Json $jsonSerializer,
+        Gallery $gallery,
+        array $data = []
+    ) {
+        $this->gallery = $gallery;
+        $this->jsonSerializer = $jsonSerializer;
+        parent::__construct($context, $arrayUtils, $data);
+    }
+
+    /**
+     * Retrieve gallery options in JSON format
+     *
+     * @return string
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function getOptionsJson()
+    {
+        $optionItems = null;
+
+        //Special case for gallery/nav which can be the string "thumbs/false/dots"
+        if (is_bool($this->getVar("gallery/nav"))) {
+            $optionItems['nav'] = $this->getVar("gallery/nav") ? 'true' : 'false';
+        } else {
+            $optionItems['nav'] = $this->escapeHtml($this->getVar("gallery/nav"));
+        }
+
+        $optionItems['loop'] = $this->getVar("gallery/loop");
+        $optionItems['keyboard'] = $this->getVar("gallery/keyboard");
+        $optionItems['arrows'] = $this->getVar("gallery/arrows");
+        $optionItems['allowfullscreen'] = $this->getVar("gallery/allowfullscreen");
+        $optionItems['showCaption'] = $this->getVar("gallery/caption");
+        $optionItems['width'] = (int)$this->escapeHtml(
+            $this->gallery->getImageAttribute('product_page_image_medium', 'width')
+        );
+        $optionItems['thumbwidth'] = (int)$this->escapeHtml(
+            $this->gallery->getImageAttribute('product_page_image_small', 'width')
+        );
+
+        if ($this->gallery->getImageAttribute('product_page_image_small', 'height') ||
+            $this->gallery->getImageAttribute('product_page_image_small', 'width')) {
+            $optionItems['thumbheight'] = (int)$this->escapeHtml(
+                $this->gallery->getImageAttribute('product_page_image_small', 'height') ?:
+                    $this->gallery->getImageAttribute('product_page_image_small', 'width')
+            );
+        }
+
+        if ($this->gallery->getImageAttribute('product_page_image_medium', 'height') ||
+            $this->gallery->getImageAttribute('product_page_image_medium', 'width')) {
+            $optionItems['height'] = (int)$this->escapeHtml(
+                $this->gallery->getImageAttribute('product_page_image_medium', 'height') ?:
+                    $this->gallery->getImageAttribute('product_page_image_medium', 'width')
+            );
+        }
+
+        if ($this->getVar("gallery/transition/duration")) {
+            $optionItems['transitionduration'] =
+                (int)$this->escapeHtml($this->getVar("gallery/transition/duration"));
+        }
+
+        $optionItems['transition'] = $this->escapeHtml($this->getVar("gallery/transition/effect"));
+        $optionItems['navarrows'] = $this->getVar("gallery/navarrows");
+        $optionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/navtype"));
+        $optionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/navdir"));
+
+        if ($this->getVar("gallery/thumbmargin")) {
+            $optionItems['thumbmargin'] = (int)$this->escapeHtml($this->getVar("gallery/thumbmargin"));
+        }
+
+        return $this->jsonSerializer->serialize($optionItems);
+    }
+
+    /**
+     * Retrieve gallery fullscreen options in JSON format
+     *
+     * @return string
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function getFSOptionsJson()
+    {
+        $fsOptionItems = null;
+
+        //Special case for gallery/nav which can be the string "thumbs/false/dots"
+        if (is_bool($this->getVar("gallery/fullscreen/nav"))) {
+            $fsOptionItems['nav'] = $this->getVar("gallery/fullscreen/nav") ? 'true' : 'false';
+        } else {
+            $fsOptionItems['nav'] = $this->escapeHtml($this->getVar("gallery/fullscreen/nav"));
+        }
+
+        $fsOptionItems['loop'] = $this->getVar("gallery/fullscreen/loop");
+        $fsOptionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navdir"));
+        $fsOptionItems['navarrows'] = $this->getVar("gallery/fullscreen/navarrows");
+        $fsOptionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navtype"));
+        $fsOptionItems['arrows'] = $this->getVar("gallery/fullscreen/arrows");
+        $fsOptionItems['showCaption'] = $this->getVar("gallery/fullscreen/caption");
+
+        if ($this->getVar("gallery/fullscreen/transition/duration")) {
+            $fsOptionItems['transitionduration'] = (int)$this->escapeHtml(
+                $this->getVar("gallery/fullscreen/transition/duration")
+            );
+        }
+
+        $fsOptionItems['transition'] = $this->escapeHtml($this->getVar("gallery/fullscreen/transition/effect"));
+
+        if ($this->getVar("gallery/fullscreen/keyboard")) {
+            $fsOptionItems['keyboard'] = $this->getVar("gallery/fullscreen/keyboard");
+        }
+
+        if ($this->getVar("gallery/fullscreen/thumbmargin")) {
+            $fsOptionItems['thumbmargin'] =
+                (int)$this->escapeHtml($this->getVar("gallery/fullscreen/thumbmargin"));
+        }
+
+        return $this->jsonSerializer->serialize($fsOptionItems);
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
new file mode 100644
index 0000000000000..3a5b96ec53267
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Unit\Block\Product\View;
+
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Block\Product\View\Gallery;
+use Magento\Catalog\Block\Product\View\GalleryOptions;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Config;
+use Magento\Framework\Config\View;
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class GalleryOptionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GalleryOptions
+     */
+    private $model;
+
+    /**
+     * @var Gallery|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $gallery;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var View|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configView;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $viewConfig;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->escaper = $objectManager->getObject(Escaper::class);
+        $this->configView = $this->createMock(View::class);
+
+        $this->viewConfig = $this->createConfiguredMock(
+            Config::class,
+            [
+                'getViewConfig' => $this->configView
+            ]
+        );
+
+        $this->context = $this->createConfiguredMock(
+            Context::class,
+            [
+                'getEscaper' => $this->escaper,
+                'getViewConfig' => $this->viewConfig
+            ]
+        );
+
+        $this->gallery = $this->createMock(Gallery::class);
+
+        $this->jsonSerializer = $objectManager->getObject(
+            Json::class
+        );
+
+        $this->model =  $objectManager->getObject(GalleryOptions::class, [
+            'context' => $this->context,
+            'jsonSerializer' => $this->jsonSerializer,
+            'gallery' => $this->gallery
+        ]);
+    }
+
+    public function testGetOptionsJson()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/nav', 'thumbs'],
+            ['Magento_Catalog', 'gallery/loop', false],
+            ['Magento_Catalog', 'gallery/keyboard', true],
+            ['Magento_Catalog', 'gallery/arrows', true],
+            ['Magento_Catalog', 'gallery/caption', false],
+            ['Magento_Catalog', 'gallery/allowfullscreen', true],
+            ['Magento_Catalog', 'gallery/navdir', 'horizontal'],
+            ['Magento_Catalog', 'gallery/navarrows', true],
+            ['Magento_Catalog', 'gallery/navtype', 'slides'],
+            ['Magento_Catalog', 'gallery/thumbmargin', '5'],
+            ['Magento_Catalog', 'gallery/transition/effect', 'slide'],
+            ['Magento_Catalog', 'gallery/transition/duration', '500'],
+        ];
+
+        $imageAttributesMap = [
+            ['product_page_image_medium','height',null, 100],
+            ['product_page_image_medium','width',null, 200],
+            ['product_page_image_small','height',null, 300],
+            ['product_page_image_small','width',null, 400]
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+        $this->gallery->expects($this->any())
+            ->method('getImageAttribute')
+            ->will($this->returnValueMap($imageAttributesMap));
+
+        $json = $this->model->getOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        $this->assertSame('thumbs', $decodedJson['nav']);
+        $this->assertInternalType("string", $decodedJson['nav']);
+
+        $this->assertSame(false, $decodedJson['loop']);
+        $this->assertInternalType("bool", $decodedJson['loop']);
+
+        $this->assertSame(true, $decodedJson['keyboard']);
+        $this->assertInternalType("bool", $decodedJson['keyboard']);
+
+        $this->assertSame(true, $decodedJson['arrows']);
+        $this->assertInternalType("bool", $decodedJson['arrows']);
+
+        $this->assertSame(false, $decodedJson['showCaption']);
+        $this->assertInternalType("bool", $decodedJson['showCaption']);
+
+        $this->assertSame(true, $decodedJson['allowfullscreen']);
+        $this->assertInternalType("bool", $decodedJson['allowfullscreen']);
+
+        $this->assertSame('horizontal', $decodedJson['navdir']);
+        $this->assertInternalType("string", $decodedJson['navdir']);
+
+        $this->assertSame(true, $decodedJson['navarrows']);
+        $this->assertInternalType("bool", $decodedJson['navarrows']);
+
+        $this->assertSame('slides', $decodedJson['navtype']);
+        $this->assertInternalType("string", $decodedJson['navtype']);
+
+        $this->assertSame(5, $decodedJson['thumbmargin']);
+        $this->assertInternalType("int", $decodedJson['thumbmargin']);
+
+        $this->assertSame('slide', $decodedJson['transition']);
+        $this->assertInternalType("string", $decodedJson['transition']);
+
+        $this->assertSame(500, $decodedJson['transitionduration']);
+        $this->assertInternalType("int", $decodedJson['transitionduration']);
+
+        $this->assertSame(100, $decodedJson['height']);
+        $this->assertInternalType("int", $decodedJson['height']);
+
+        $this->assertSame(200, $decodedJson['width']);
+        $this->assertInternalType("int", $decodedJson['width']);
+
+        $this->assertSame(300, $decodedJson['thumbheight']);
+        $this->assertInternalType("int", $decodedJson['thumbheight']);
+
+        $this->assertSame(400, $decodedJson['thumbwidth']);
+        $this->assertInternalType("int", $decodedJson['thumbwidth']);
+    }
+
+    public function testGetFSOptionsJson()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/fullscreen/nav', false],
+            ['Magento_Catalog', 'gallery/fullscreen/loop', true],
+            ['Magento_Catalog', 'gallery/fullscreen/keyboard', true],
+            ['Magento_Catalog', 'gallery/fullscreen/arrows', false],
+            ['Magento_Catalog', 'gallery/fullscreen/caption', true],
+            ['Magento_Catalog', 'gallery/fullscreen/navdir', 'vertical'],
+            ['Magento_Catalog', 'gallery/fullscreen/navarrows', false],
+            ['Magento_Catalog', 'gallery/fullscreen/navtype', 'thumbs'],
+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', '10'],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/effect', 'dissolve'],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', '300']
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+
+        $json = $this->model->getFSOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        //Note, this tests the special case for nav variable set to false. It
+        //Should not be converted to boolean.
+        $this->assertSame('false', $decodedJson['nav']);
+        $this->assertInternalType("string", $decodedJson['nav']);
+
+        $this->assertSame(true, $decodedJson['loop']);
+        $this->assertInternalType("bool", $decodedJson['loop']);
+
+        $this->assertSame(false, $decodedJson['arrows']);
+        $this->assertInternalType("bool", $decodedJson['arrows']);
+
+        $this->assertSame(true, $decodedJson['keyboard']);
+        $this->assertInternalType("bool", $decodedJson['keyboard']);
+
+        $this->assertSame(true, $decodedJson['showCaption']);
+        $this->assertInternalType("bool", $decodedJson['showCaption']);
+
+        $this->assertSame('vertical', $decodedJson['navdir']);
+        $this->assertInternalType("string", $decodedJson['navdir']);
+
+        $this->assertSame(false, $decodedJson['navarrows']);
+        $this->assertInternalType("bool", $decodedJson['navarrows']);
+
+        $this->assertSame(10, $decodedJson['thumbmargin']);
+        $this->assertInternalType("int", $decodedJson['thumbmargin']);
+
+        $this->assertSame('thumbs', $decodedJson['navtype']);
+        $this->assertInternalType("string", $decodedJson['navtype']);
+
+        $this->assertSame('dissolve', $decodedJson['transition']);
+        $this->assertInternalType("string", $decodedJson['transition']);
+
+        $this->assertSame(300, $decodedJson['transitionduration']);
+        $this->assertInternalType("int", $decodedJson['transitionduration']);
+    }
+
+    public function testGetOptionsJsonOptionals()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+
+        $json = $this->model->getOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
+        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
+    }
+
+    public function testGetFSOptionsJsonOptionals()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/fullscreen/keyboard', false],
+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+
+        $json = $this->model->getFSOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
+        $this->assertArrayNotHasKey('keyboard', $decodedJson);
+        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
+    }
+}
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..aa6ffa1bd33c4 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
@@ -121,7 +121,11 @@
                         </arguments>
                     </block>
                 </container>
-                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml"/>
+                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml">
+                    <arguments>
+                        <argument name="gallery_options" xsi:type="object">Magento\Catalog\Block\Product\View\GalleryOptions</argument>
+                    </arguments>
+                </block>
                 <container name="skip_gallery_after.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
                     <block class="Magento\Framework\View\Element\Template" after="product.info.media.image" name="skip_gallery_after" template="Magento_Theme::html/skip.phtml">
                         <arguments>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 1bfa30478df8a..a810dc2916152 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -45,44 +45,8 @@
                 "mixins":["magnifier/magnify"],
                 "magnifierOpts": <?= /* @escapeNotVerified */ $block->getMagnifier() ?>,
                 "data": <?= /* @escapeNotVerified */ $block->getGalleryImagesJson() ?>,
-                "options": {
-                    "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/nav") ?>",
-                    "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ? 'true' : 'false' ?>,
-                    "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ? 'true' : 'false' ?>,
-                    "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ? 'true' : 'false' ?>,
-                    "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ? 'true' : 'false' ?>,
-                    "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ? 'true' : 'false' ?>,
-                    "width": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>",
-                    "thumbwidth": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_small', 'width') ?>",
-                    <?php if ($block->getImageAttribute('product_page_image_small', 'height') || $block->getImageAttribute('product_page_image_small', 'width')): ?>
-                        "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
-                        ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
-                    <?php endif; ?>
-                    <?php if ($block->getImageAttribute('product_page_image_medium', 'height') || $block->getImageAttribute('product_page_image_medium', 'width')): ?>
-                        "height": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'height')
-                        ?: $block->getImageAttribute('product_page_image_medium', 'width'); ?>,
-                    <?php endif; ?>
-                    <?php if ($block->getVar("gallery/transition/duration")): ?>
-                        "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/transition/duration") ?>,
-                    <?php endif; ?>
-                    "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/transition/effect") ?>",
-                    "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ? 'true' : 'false' ?>,
-                    "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
-                    "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navdir") ?>"
-                },
-                "fullscreen": {
-                    "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/nav") ?>",
-                    "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ? 'true' : 'false' ?>,
-                    "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navdir") ?>",
-                    "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ? 'true' : 'false' ?>,
-                    "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navtype") ?>",
-                    "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ? 'true' : 'false' ?>,
-                    "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ? 'true' : 'false' ?>,
-                    <?php if ($block->getVar("gallery/fullscreen/transition/duration")): ?>
-                        "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/duration") ?>,
-                    <?php endif; ?>
-                    "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/effect") ?>"
-                },
+                "options": <?= /* @noEscape */ $block->getGalleryOptions()->getOptionsJson() ?>,
+                "fullscreen": <?= /* @noEscape */ $block->getGalleryOptions()->getFSOptionsJson() ?>,
                 "breakpoints": <?= /* @escapeNotVerified */ $block->getBreakpoints() ?>
             }
         }

From dcc71bfccccd814980064208acd552a4a758a808 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Mon, 18 Mar 2019 12:24:18 +0000
Subject: [PATCH 0652/1055] Removed Unnecessary type checking on tests

---
 .../Block/Product/View/GalleryOptionsTest.php | 52 -------------------
 1 file changed, 52 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
index 3a5b96ec53267..5ade6af9fac33 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
@@ -125,52 +125,21 @@ public function testGetOptionsJson()
         $decodedJson = $this->jsonSerializer->unserialize($json);
 
         $this->assertSame('thumbs', $decodedJson['nav']);
-        $this->assertInternalType("string", $decodedJson['nav']);
-
         $this->assertSame(false, $decodedJson['loop']);
-        $this->assertInternalType("bool", $decodedJson['loop']);
-
         $this->assertSame(true, $decodedJson['keyboard']);
-        $this->assertInternalType("bool", $decodedJson['keyboard']);
-
         $this->assertSame(true, $decodedJson['arrows']);
-        $this->assertInternalType("bool", $decodedJson['arrows']);
-
         $this->assertSame(false, $decodedJson['showCaption']);
-        $this->assertInternalType("bool", $decodedJson['showCaption']);
-
         $this->assertSame(true, $decodedJson['allowfullscreen']);
-        $this->assertInternalType("bool", $decodedJson['allowfullscreen']);
-
         $this->assertSame('horizontal', $decodedJson['navdir']);
-        $this->assertInternalType("string", $decodedJson['navdir']);
-
         $this->assertSame(true, $decodedJson['navarrows']);
-        $this->assertInternalType("bool", $decodedJson['navarrows']);
-
         $this->assertSame('slides', $decodedJson['navtype']);
-        $this->assertInternalType("string", $decodedJson['navtype']);
-
         $this->assertSame(5, $decodedJson['thumbmargin']);
-        $this->assertInternalType("int", $decodedJson['thumbmargin']);
-
         $this->assertSame('slide', $decodedJson['transition']);
-        $this->assertInternalType("string", $decodedJson['transition']);
-
         $this->assertSame(500, $decodedJson['transitionduration']);
-        $this->assertInternalType("int", $decodedJson['transitionduration']);
-
         $this->assertSame(100, $decodedJson['height']);
-        $this->assertInternalType("int", $decodedJson['height']);
-
         $this->assertSame(200, $decodedJson['width']);
-        $this->assertInternalType("int", $decodedJson['width']);
-
         $this->assertSame(300, $decodedJson['thumbheight']);
-        $this->assertInternalType("int", $decodedJson['thumbheight']);
-
         $this->assertSame(400, $decodedJson['thumbwidth']);
-        $this->assertInternalType("int", $decodedJson['thumbwidth']);
     }
 
     public function testGetFSOptionsJson()
@@ -200,37 +169,16 @@ public function testGetFSOptionsJson()
         //Note, this tests the special case for nav variable set to false. It
         //Should not be converted to boolean.
         $this->assertSame('false', $decodedJson['nav']);
-        $this->assertInternalType("string", $decodedJson['nav']);
-
         $this->assertSame(true, $decodedJson['loop']);
-        $this->assertInternalType("bool", $decodedJson['loop']);
-
         $this->assertSame(false, $decodedJson['arrows']);
-        $this->assertInternalType("bool", $decodedJson['arrows']);
-
         $this->assertSame(true, $decodedJson['keyboard']);
-        $this->assertInternalType("bool", $decodedJson['keyboard']);
-
         $this->assertSame(true, $decodedJson['showCaption']);
-        $this->assertInternalType("bool", $decodedJson['showCaption']);
-
         $this->assertSame('vertical', $decodedJson['navdir']);
-        $this->assertInternalType("string", $decodedJson['navdir']);
-
         $this->assertSame(false, $decodedJson['navarrows']);
-        $this->assertInternalType("bool", $decodedJson['navarrows']);
-
         $this->assertSame(10, $decodedJson['thumbmargin']);
-        $this->assertInternalType("int", $decodedJson['thumbmargin']);
-
         $this->assertSame('thumbs', $decodedJson['navtype']);
-        $this->assertInternalType("string", $decodedJson['navtype']);
-
         $this->assertSame('dissolve', $decodedJson['transition']);
-        $this->assertInternalType("string", $decodedJson['transition']);
-
         $this->assertSame(300, $decodedJson['transitionduration']);
-        $this->assertInternalType("int", $decodedJson['transitionduration']);
     }
 
     public function testGetOptionsJsonOptionals()

From f2483b5b679c60d63bb02848e015e7379aeb7e78 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Mon, 18 Mar 2019 15:11:21 +0200
Subject: [PATCH 0653/1055] Remove all marketing get params on Varnish to
 minimize the cache objects

---
 app/code/Magento/PageCache/etc/varnish4.vcl | 9 +++++----
 app/code/Magento/PageCache/etc/varnish5.vcl | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
index 8068447e5ca99..c73c4e39170e6 100644
--- a/app/code/Magento/PageCache/etc/varnish4.vcl
+++ b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -91,10 +91,11 @@ sub vcl_recv {
         }
     }
 
-    # Remove Google gclid parameters to minimize the cache objects
-    set req.url = regsuball(req.url,"\?gclid=[^&]+$",""); # strips when QS = "?gclid=AAA"
-    set req.url = regsuball(req.url,"\?gclid=[^&]+&","?"); # strips when QS = "?gclid=AAA&foo=bar"
-    set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
+    # Remove all marketing get parameters to minimize the cache objects
+    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=") {
+        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
+        set req.url = regsub(req.url, "[?|&]+$", "");
+    }
 
     # Static files caching
     if (req.url ~ "^/(pub/)?(media|static)/") {
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
index 6c8414a5cb641..ea586858eff75 100644
--- a/app/code/Magento/PageCache/etc/varnish5.vcl
+++ b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -92,10 +92,11 @@ sub vcl_recv {
         }
     }
 
-    # Remove Google gclid parameters to minimize the cache objects
-    set req.url = regsuball(req.url,"\?gclid=[^&]+$",""); # strips when QS = "?gclid=AAA"
-    set req.url = regsuball(req.url,"\?gclid=[^&]+&","?"); # strips when QS = "?gclid=AAA&foo=bar"
-    set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
+    # Remove all marketing get parameters to minimize the cache objects
+    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=") {
+        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
+        set req.url = regsub(req.url, "[?|&]+$", "");
+    }
 
     # Static files caching
     if (req.url ~ "^/(pub/)?(media|static)/") {

From ea676d653d1a7adf016a2c520aed356e609ce0d9 Mon Sep 17 00:00:00 2001
From: Maria Kovdrysh <kovdrysh@adobe.com>
Date: Mon, 18 Mar 2019 08:18:46 -0500
Subject: [PATCH 0654/1055] MC-4343: Convert NavigateMenuTest to MFTF

---
 .../Test/Mftf/Data/AdminMenuData.xml          | 21 +++++
 ...dminSystemNotificationNavigateMenuTest.xml |  6 +-
 .../Test/Mftf/Data/AdminMenuData.xml          | 21 +++++
 ...AdminAdvancedReportingNavigateMenuTest.xml |  4 +-
 .../AdminNavigateMenuActionGroup.xml          | 10 +--
 .../Backend/Test/Mftf/Data/AdminMenuData.xml  | 46 ++++++++++
 .../Test/Mftf/Section/AdminMenuSection.xml    |  3 +-
 .../AdminContentScheduleNavigateMenuTest.xml  |  6 +-
 .../Test/AdminDashboardNavigateMenuTest.xml   |  4 +-
 .../AdminStoresAllStoresNavigateMenuTest.xml  |  6 +-
 ...minStoresConfigurationNavigateMenuTest.xml |  6 +-
 ...nSystemCacheManagementNavigateMenuTest.xml |  6 +-
 .../Catalog/Test/Mftf/Data/AdminMenuData.xml  | 36 ++++++++
 ...AdminCatalogCategoriesNavigateMenuTest.xml |  6 +-
 .../AdminCatalogProductsNavigateMenuTest.xml  |  6 +-
 ...dminStoresAttributeSetNavigateMenuTest.xml |  6 +-
 .../AdminStoresProductNavigateMenuTest.xml    |  6 +-
 .../Test/Mftf/Data/AdminMenuData.xml          | 21 +++++
 ...ketingCatalogPriceRuleNavigateMenuTest.xml |  6 +-
 .../Test/Mftf/Data/AdminMenuData.xml          | 21 +++++
 ...inMarketingSearchTermsNavigateMenuTest.xml |  6 +-
 ...dminReportsSearchTermsNavigateMenuTest.xml |  6 +-
 .../Test/Mftf/Data/AdminModuleData.xml        | 16 ++++
 ...oresTermsAndConditionsNavigateMenuTest.xml |  6 +-
 .../Cms/Test/Mftf/Data/AdminMenuData.xml      | 26 ++++++
 .../AdminContentBlocksNavigateMenuTest.xml    |  6 +-
 .../AdminContentPagesNavigateMenuTest.xml     |  6 +-
 .../Test/Mftf/Data/AdminMenuData.xml          | 21 +++++
 ...minStoresCurrencyRatesNavigateMenuTest.xml |  6 +-
 ...nStoresCurrencySymbolsNavigateMenuTest.xml |  6 +-
 .../Customer/Test/Mftf/Data/AdminMenuData.xml | 31 +++++++
 ...nCustomersAllCustomersNavigateMenuTest.xml |  6 +-
 ...ustomersCustomerGroupsNavigateMenuTest.xml |  6 +-
 ...dminCustomersNowOnlineNavigateMenuTest.xml |  6 +-
 .../Email/Test/Mftf/Data/AdminMenuData.xml    | 16 ++++
 ...arketingEmailTemplatesNavigateMenuTest.xml |  6 +-
 .../Test/Mftf/Data/AdminMenuData.xml          | 21 +++++
 .../Test/AdminExportPageNavigateMenuTest.xml  |  6 +-
 .../AdminSystemImportNavigateMenuTest.xml     |  6 +-
 .../Indexer/Test/Mftf/Data/AdminMenuData.xml  | 16 ++++
 ...nSystemIndexManagementNavigateMenuTest.xml |  6 +-
 .../Test/Mftf/Data/AdminMenuData.xml          | 16 ++++
 ...dminSystemIntegrationsNavigateMenuTest.xml |  6 +-
 .../Test/Mftf/Data/AdminMenuData.xml          | 31 +++++++
 ...rketingNewsletterQueueNavigateMenuTest.xml |  6 +-
 ...gNewsletterSubscribersNavigateMenuTest.xml |  6 +-
 ...tingNewsletterTemplateNavigateMenuTest.xml |  7 +-
 ...wsletterProblemReportsNavigateMenuTest.xml |  6 +-
 .../Paypal/Test/Mftf/Data/AdminMenuData.xml   | 26 ++++++
 ...eportsPayPalSettlementNavigateMenuTest.xml |  6 +-
 ...SalesBillingAgreementsNavigateMenuTest.xml |  6 +-
 .../Reports/Test/Mftf/Data/AdminMenuData.xml  | 86 +++++++++++++++++++
 ...nReportsAbandonedCartsNavigateMenuTest.xml |  6 +-
 ...dminReportsBestsellersNavigateMenuTest.xml |  6 +-
 .../AdminReportsCouponsNavigateMenuTest.xml   |  6 +-
 .../AdminReportsDownloadsNavigateMenuTest.xml |  6 +-
 .../AdminReportsInvoicedNavigateMenuTest.xml  |  6 +-
 .../AdminReportsLowStockNavigateMenuTest.xml  |  6 +-
 .../Test/AdminReportsNewNavigateMenuTest.xml  |  6 +-
 ...AdminReportsOrderCountNavigateMenuTest.xml |  6 +-
 ...AdminReportsOrderTotalNavigateMenuTest.xml |  6 +-
 .../AdminReportsOrderedNavigateMenuTest.xml   |  6 +-
 .../AdminReportsOrdersNavigateMenuTest.xml    |  6 +-
 ...nReportsProductsInCartNavigateMenuTest.xml |  6 +-
 ...portsRefreshStatisticsNavigateMenuTest.xml |  7 +-
 .../Test/AdminReportsTaxNavigateMenuTest.xml  |  6 +-
 .../AdminReportsViewsNavigateMenuTest.xml     |  6 +-
 .../Review/Test/Mftf/Data/AdminMenuData.xml   | 31 +++++++
 .../AdminMarketingReviewsNavigateMenuTest.xml |  8 +-
 ...dminReportsByCustomersNavigateMenuTest.xml |  6 +-
 ...AdminReportsByProductsNavigateMenuTest.xml |  6 +-
 .../AdminStoresRatingNavigateMenuTest.xml     |  6 +-
 .../Sales/Test/Mftf/Data/AdminMenuData.xml    | 41 +++++++++
 .../AdminSalesCreditMemosNavigateMenuTest.xml |  6 +-
 .../AdminSalesInvoicesNavigateMenuTest.xml    |  6 +-
 .../Test/AdminSalesOrdersNavigateMenuTest.xml |  6 +-
 .../AdminSalesShipmentsNavigateMenuTest.xml   |  6 +-
 ...AdminSalesTransactionsNavigateMenuTest.xml |  6 +-
 ...AdminStoresOrderStatusNavigateMenuTest.xml |  6 +-
 .../Test/Mftf/Data/AdminMenuData.xml          | 16 ++++
 ...arketingCartPriceRulesNavigateMenuTest.xml |  6 +-
 .../Sitemap/Test/Mftf/Data/AdminMenuData.xml  | 16 ++++
 .../AdminMarketingSiteMapNavigateMenuTest.xml |  6 +-
 .../Tax/Test/Mftf/Data/AdminMenuData.xml      | 26 ++++++
 .../AdminStoresTaxRulesNavigateMenuTest.xml   |  6 +-
 ...StoresTaxZonesAndRatesNavigateMenuTest.xml |  6 +-
 ...emImportExportTaxRatesNavigateMenuTest.xml |  6 +-
 .../Theme/Test/Mftf/Data/AdminMenuData.xml    | 16 ++++
 .../AdminContentThemesNavigateMenuTest.xml    |  6 +-
 .../Test/Mftf/Data/AdminMenuData.xml          | 16 ++++
 ...inMarketingUrlRewritesNavigateMenuTest.xml |  6 +-
 .../User/Test/Mftf/Data/AdminMenuData.xml     | 31 +++++++
 .../AdminSystemAllUsersNavigateMenuTest.xml   |  6 +-
 ...AdminSystemLockedUsersNavigateMenuTest.xml |  6 +-
 ...temManageEncryptionKeyNavigateMenuTest.xml |  6 +-
 .../AdminSystemUserRolesNavigateMenuTest.xml  |  6 +-
 .../Variable/Test/Mftf/Data/AdminMenuData.xml | 16 ++++
 ...nSystemCustomVariablesNavigateMenuTest.xml |  6 +-
 .../Widget/Test/Mftf/Data/AdminMenuData.xml   | 16 ++++
 .../AdminContentWidgetsNavigateMenuTest.xml   |  6 +-
 100 files changed, 915 insertions(+), 221 deletions(-)
 create mode 100644 app/code/Magento/AdminNotification/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Analytics/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/CatalogRule/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/CheckoutAgreements/Test/Mftf/Data/AdminModuleData.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Email/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Indexer/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Integration/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Sitemap/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Tax/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Theme/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/UrlRewrite/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Variable/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/Widget/Test/Mftf/Data/AdminMenuData.xml

diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/AdminNotification/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..3f0f251ce7ee4
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Mftf/Data/AdminMenuData.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="AdminMenuSystem">
+        <data key="pageTitle">System</data>
+        <data key="title">Notifications</data>
+        <data key="dataUiId">magento-backend-system</data>
+    </entity>
+    <entity name="AdminMenuSystemOtherSettingsNotifications">
+        <data key="pageTitle">Notifications</data>
+        <data key="title">Notifications</data>
+        <data key="dataUiId">magento-adminnotification-system-adminnotification</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
index c886a7c67de2a..75dceb4028622 100644
--- a/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
+++ b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemNotificationPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-adminnotification"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemOtherSettingsNotifications.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Notifications"/>
+            <argument name="title" value="{{AdminMenuSystemOtherSettingsNotifications.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..01b86101def28
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/Data/AdminMenuData.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="AdminMenuReports">
+        <data key="pageTitle">Reports</data>
+        <data key="title">Reports</data>
+        <data key="dataUiId">magento-reports-report</data>
+    </entity>
+    <entity name="AdminMenuReportsBusinessIntelligenceAdvancedReporting">
+        <data key="pageTitle">AdvancedReporting</data>
+        <data key="title">AdvancedReporting</data>
+        <data key="dataUiId">magento-analytics-advanced-reporting</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
index 6452bd0554f00..67d6715285697 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
@@ -26,8 +26,8 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateAdvancedReportingPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="advanced-reporting"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsBusinessIntelligenceAdvancedReporting.dataUiId}}"/>
         </actionGroup>
         <switchToNextTab stepKey="switchToNewTab"/>
         <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
index 3dec005529911..8e0f5a067610d 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
@@ -10,10 +10,10 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminNavigateMenuActionGroup">
         <arguments>
-            <argument name="menuItem" type="string"/>
-            <argument name="submenuItem" type="string"/>
+            <argument name="menuUiId" type="string"/>
+            <argument name="submenuUiId" type="string"/>
         </arguments>
-        <click selector="{{AdminMenuSection.mainMenuItem(menuItem)}}" stepKey="clickOnMenuItem"/>
-        <click selector="{{AdminMenuSection.submenuItem(submenuItem)}}" stepKey="clickOnSubmenuItem"/>
+        <click selector="{{AdminMenuSection.menuItem(menuUiId)}}" stepKey="clickOnMenuItem"/>
+        <click selector="{{AdminMenuSection.menuItem(submenuUiId)}}" stepKey="clickOnSubmenuItem"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Backend/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..4fe600d194e61
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,46 @@
+<?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="AdminMenuContent">
+        <data key="pageTitle">Content</data>
+        <data key="title">Content</data>
+        <data key="dataUiId">magento-backend-content</data>
+    </entity>
+    <entity name="AdminMenuContentDesignSchedule">
+        <data key="pageTitle">Store Design Schedule</data>
+        <data key="title">Schedule</data>
+        <data key="dataUiId">magento-backend-system-design-schedule</data>
+    </entity>
+    <entity name="AdminMenuDashboard">
+        <data key="pageTitle">Dashboard</data>
+        <data key="title">Dashboard</data>
+        <data key="dataUiId">magento-backend-dashboard</data>
+    </entity>
+    <entity name="AdminMenuStores">
+        <data key="pageTitle">Stores</data>
+        <data key="title">Stores</data>
+        <data key="dataUiId">magento-backend-stores</data>
+    </entity>
+    <entity name="AdminMenuStoresSettingsAllStores">
+        <data key="pageTitle">Stores</data>
+        <data key="title">All Stores</data>
+        <data key="dataUiId">magento-backend-system-store</data>
+    </entity>
+    <entity name="AdminMenuStoresSettingsConfiguration">
+        <data key="pageTitle">Configuration</data>
+        <data key="title">Configuration</data>
+        <data key="dataUiId">magento-config-system-config</data>
+    </entity>
+    <entity name="AdminMenuSystemToolsCacheManagement">
+        <data key="pageTitle">Cache Management</data>
+        <data key="title">Cache Management</data>
+        <data key="dataUiId">magento-backend-system-cache</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index 16f29230efb60..8498ad8c52e41 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -23,7 +23,6 @@
         <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
 
         <!-- Navigate menu selectors -->
-        <element name="mainMenuItem" type="button" selector="//li[contains(@id, 'menu-magento') and contains(@id, '{{var}}')]" parameterized="true" timeout="30"/>
-        <element name="submenuItem" type="button" selector="//li[contains(@class, 'item') and contains(@class, '{{var}}')][position()=1]" parameterized="true" timeout="30"/>
+        <element name="menuItem" type="button" selector="li[data-ui-id='menu-{{dataUiId}}']" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml
index d7d46790ff911..bead59653eee8 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentSchedulePage">
-            <argument name="menuItem" value="backend-content"/>
-            <argument name="submenuItem" value="system-design-schedule"/>
+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuContentDesignSchedule.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Store Design Schedule"/>
+            <argument name="title" value="{{AdminMenuContentDesignSchedule.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
index 2cd2d79c8121d..33561d7c3b03e 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
@@ -25,9 +25,9 @@
         <after>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <click selector="{{AdminMenuSection.mainMenuItem('backend-dashboard')}}" stepKey="clickOnMenuItem"/>
+        <click selector="{{AdminMenuSection.menuItem(AdminMenuDashboard.dataUiId)}}" stepKey="clickOnMenuItem"/>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Dashboard"/>
+            <argument name="title" value="{{AdminMenuDashboard.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml
index 1ae87eb90a176..7758b387e393b 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresAllStoresPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="system-store"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresSettingsAllStores.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Stores"/>
+            <argument name="title" value="{{AdminMenuStoresSettingsAllStores.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml
index fd2c5a6978f1d..a54269b186ba0 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresConfigurationPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="system-config"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresSettingsConfiguration.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Configuration"/>
+            <argument name="title" value="{{AdminMenuStoresSettingsConfiguration.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml
index dd7a7318cc1df..516631c1bd166 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemCacheManagementPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-cache"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemToolsCacheManagement.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Cache Management"/>
+            <argument name="title" value="{{AdminMenuSystemToolsCacheManagement.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..24e1fe9cf5ecd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,36 @@
+<?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="AdminMenuCatalog">
+        <data key="pageTitle">Catalog</data>
+        <data key="title">Catalog</data>
+        <data key="dataUiId">magento-catalog-catalog</data>
+    </entity>
+    <entity name="AdminMenuCatalogCategories">
+        <data key="pageTitle">Default Category (ID: 2)</data>
+        <data key="title">Categories</data>
+        <data key="dataUiId">magento-catalog-catalog-categories</data>
+    </entity>
+    <entity name="AdminMenuCatalogProducts">
+        <data key="pageTitle">Products</data>
+        <data key="title">Products</data>
+        <data key="dataUiId">magento-catalog-catalog-products</data>
+    </entity>
+    <entity name="AdminMenuStoresAttributesAttributeSet">
+        <data key="pageTitle">Attribute Sets</data>
+        <data key="title">Attribute Set</data>
+        <data key="dataUiId">magento-catalog-catalog-attributes-sets</data>
+    </entity>
+    <entity name="AdminMenuStoresAttributesProduct">
+        <data key="pageTitle">Product Attributes</data>
+        <data key="title">Product</data>
+        <data key="dataUiId">magento-catalog-catalog-attributes-attributes</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
index 141a5a53fb713..a51df86d0327a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogCategoriesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCategoriesPage">
-            <argument name="menuItem" value="catalog-catalog"/>
-            <argument name="submenuItem" value="catalog-categories"/>
+            <argument name="menuUiId" value="{{AdminMenuCatalog.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuCatalogCategories.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Default Category (ID: 2)"/>
+            <argument name="title" value="{{AdminMenuCatalogCategories.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
index 16fa1ecc0a6f2..1d9400bf81e4d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCatalogProductsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCatalogProductsPage">
-            <argument name="menuItem" value="catalog-catalog"/>
-            <argument name="submenuItem" value="catalog-products"/>
+            <argument name="menuUiId" value="{{AdminMenuCatalog.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuCatalogProducts.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Products"/>
+            <argument name="title" value="{{AdminMenuCatalogProducts.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
index 697828d29c22f..ed29c281b804c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresAttributeSetNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAttributeSetPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="catalog-attributes-sets"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresAttributesAttributeSet.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Attribute Sets"/>
+            <argument name="title" value="{{AdminMenuStoresAttributesAttributeSet.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
index 3ede5a6be3212..28a33c4f20c01 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminStoresProductNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToProductAttributePage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="catalog-attributes-attributes"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresAttributesProduct.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Product Attributes"/>
+            <argument name="title" value="{{AdminMenuStoresAttributesProduct.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/CatalogRule/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..eb9cac1401c36
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Data/AdminMenuData.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="AdminMenuMarketing">
+        <data key="pageTitle">Marketing</data>
+        <data key="title">Marketing</data>
+        <data key="dataUiId">magento-backend-marketing</data>
+    </entity>
+    <entity name="AdminMenuMarketingPromotionsCatalogPriceRule">
+        <data key="pageTitle">Catalog Price Rule</data>
+        <data key="title">Catalog Price Rule</data>
+        <data key="dataUiId">magento-catalogrule-promo-catalog</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml
index 2344d2817907e..0fe35419aaf3e 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminMarketingCatalogPriceRuleNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCatalogPriceRulePage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="promo-catalog"/>
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuMarketingPromotionsCatalogPriceRule.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Catalog Price Rule"/>
+            <argument name="title" value="{{AdminMenuMarketingPromotionsCatalogPriceRule.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..df1c3db6e5661
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/AdminMenuData.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="AdminMenuMarketingSEOAndSearchSearchTerms">
+        <data key="pageTitle">Search Terms</data>
+        <data key="title">Search Terms</data>
+        <data key="dataUiId">magento-search-search-terms</data>
+    </entity>
+    <entity name="AdminMenuReportsMarketingSearchTerms">
+        <data key="pageTitle">Search Terms Report</data>
+        <data key="title">Search Terms</data>
+        <data key="dataUiId">magento-search-report-search-term</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml
index 031c31dd93595..bc255020d98b3 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminMarketingSearchTermsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingSearchTermsPage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="search-terms"/>
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuMarketingSEOAndSearchSearchTerms.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Search Terms"/>
+            <argument name="title" value="{{AdminMenuMarketingSEOAndSearchSearchTerms.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml
index bfcd8918e76bb..85cf0e3ba90ed 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminReportsSearchTermsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportSearchTermsPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-search-term"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsMarketingSearchTerms.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Search Terms Report"/>
+            <argument name="title" value="{{AdminMenuReportsMarketingSearchTerms.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/CheckoutAgreements/Test/Mftf/Data/AdminModuleData.xml b/app/code/Magento/CheckoutAgreements/Test/Mftf/Data/AdminModuleData.xml
new file mode 100644
index 0000000000000..d42c2c8139425
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Test/Mftf/Data/AdminModuleData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuStoresSettingsTermsAndConditions">
+        <data key="pageTitle">Terms and Conditions</data>
+        <data key="title">Terms and Conditions</data>
+        <data key="dataUiId">magento-checkoutagreements-sales-checkoutagreement</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml b/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml
index 8a1dee3041fe5..d2d4cb9138bd5 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml
+++ b/app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminStoresTermsAndConditionsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresTermsAndConditionsPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="sales-checkoutagreement"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresSettingsTermsAndConditions.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Terms and Conditions"/>
+            <argument name="title" value="{{AdminMenuStoresSettingsTermsAndConditions.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Cms/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..3e227df56c909
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,26 @@
+<?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="AdminMenuContent">
+        <data key="pageTitle">Content</data>
+        <data key="title">Content</data>
+        <data key="dataUiId">magento-backend-content</data>
+    </entity>
+    <entity name="AdminMenuContentElementsPages">
+        <data key="pageTitle">Pages</data>
+        <data key="title">Pages</data>
+        <data key="dataUiId">magento-cms-cms-page</data>
+    </entity>
+    <entity name="AdminMenuContentElementsBlocks">
+        <data key="pageTitle">Blocks</data>
+        <data key="title">Blocks</data>
+        <data key="dataUiId">magento-cms-cms-block</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml
index bf3d2321cd6cb..19f501d6aa209 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentBlocksNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentBlocksPage">
-            <argument name="menuItem" value="backend-content"/>
-            <argument name="submenuItem" value="cms-block"/>
+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuContentElementsBlocks.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Blocks"/>
+            <argument name="title" value="{{AdminMenuContentElementsBlocks.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
index 23e03fe049360..323a1de7b9a4e 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminContentPagesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentPagesPage">
-            <argument name="menuItem" value="backend-content"/>
-            <argument name="submenuItem" value="cms-page"/>
+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuContentElementsPages.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Pages"/>
+            <argument name="title" value="{{AdminMenuContentElementsPages.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..9166c8745c9e1
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminMenuData.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="AdminMenuStoresCurrencyCurrencyRates">
+        <data key="pageTitle">Currency Rates</data>
+        <data key="title">Currency Rates</data>
+        <data key="dataUiId">magento-currencysymbol-system-currency-rates</data>
+    </entity>
+    <entity name="AdminMenuStoresCurrencyCurrencySymbols">
+        <data key="pageTitle">Currency Symbols</data>
+        <data key="title">Currency Symbols</data>
+        <data key="dataUiId">magento-currencysymbol-system-currency-symbols</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
index bff16edfc5ca5..4a33d40d2a35f 100644
--- a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencyRatesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresCurrencyRatesPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="system-currency-rates"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresCurrencyCurrencyRates.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Currency Rates"/>
+            <argument name="title" value="{{AdminMenuStoresCurrencyCurrencyRates.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml
index 10c21a227d59a..978917772f2dd 100644
--- a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminStoresCurrencySymbolsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresCurrencySymbolsPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="system-currency-symbols"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresCurrencyCurrencySymbols.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Currency Symbols"/>
+            <argument name="title" value="{{AdminMenuStoresCurrencyCurrencySymbols.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..4e433c76b3ddb
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,31 @@
+<?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="AdminMenuCustomers">
+        <data key="pageTitle">Customers</data>
+        <data key="title">Customers</data>
+        <data key="dataUiId">magento-customer-customer</data>
+    </entity>
+    <entity name="AdminMenuCustomersAllCustomers">
+        <data key="pageTitle">Customers</data>
+        <data key="title">All Customers</data>
+        <data key="dataUiId">magento-customer-customer-manage</data>
+    </entity>
+    <entity name="AdminMenuCustomersCustomerGroups">
+        <data key="pageTitle">Customer Groups</data>
+        <data key="title">Customer Groups</data>
+        <data key="dataUiId">magento-customer-customer-group</data>
+    </entity>
+    <entity name="AdminMenuCustomersNowOnline">
+        <data key="pageTitle">Customers Now Online</data>
+        <data key="title">Now Online</data>
+        <data key="dataUiId">magento-customer-customer-online</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml
index 381862cbdb06d..76e4407675e4c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersAllCustomersNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAllCustomerPage">
-            <argument name="menuItem" value="customer-customer"/>
-            <argument name="submenuItem" value="customer-manage"/>
+            <argument name="menuUiId" value="{{AdminMenuCustomers.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuCustomersAllCustomers.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Customers"/>
+            <argument name="title" value="{{AdminMenuCustomersAllCustomers.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml
index 6c591120a8e9b..13a4b1c714337 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersCustomerGroupsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToCustomerGroupsPage">
-            <argument name="menuItem" value="customer-customer"/>
-            <argument name="submenuItem" value="customer-group"/>
+            <argument name="menuUiId" value="{{AdminMenuCustomers.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuCustomersCustomerGroups.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Customer Groups"/>
+            <argument name="title" value="{{AdminMenuCustomersCustomerGroups.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml
index 2f3d5eec309ed..e9eb7803e01ea 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomersNowOnlineNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNowOnlinePage">
-            <argument name="menuItem" value="customer-customer"/>
-            <argument name="submenuItem" value="customer-online"/>
+            <argument name="menuUiId" value="{{AdminMenuCustomers.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuCustomersNowOnline.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Customers Now Online"/>
+            <argument name="title" value="{{AdminMenuCustomersNowOnline.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Email/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Email/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..5086d74efa606
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuMarketingCommunicationsEmailTemplates">
+        <data key="pageTitle">Email Templates</data>
+        <data key="title">Email Templates</data>
+        <data key="dataUiId">magento-email-template</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml b/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml
index 6abe94b685517..d512fc263ef2c 100644
--- a/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml
+++ b/app/code/Magento/Email/Test/Mftf/Test/AdminMarketingEmailTemplatesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingEmailTemplatesPage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="template"/>
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsEmailTemplates.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Email Templates"/>
+            <argument name="title" value="{{AdminMenuMarketingCommunicationsEmailTemplates.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/ImportExport/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..c09cd192d05c7
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Data/AdminMenuData.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="AdminMenuSystemDataTransferExport">
+        <data key="pageTitle">Export</data>
+        <data key="title">Export</data>
+        <data key="dataUiId">magento-importexport-system-convert-export</data>
+    </entity>
+    <entity name="AdminMenuSystemDataTransferImport">
+        <data key="pageTitle">Import</data>
+        <data key="title">Import</data>
+        <data key="dataUiId">magento-importexport-system-convert-import</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml
index acb340ccbba4f..e8fb12ca521c2 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPageNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToExportPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-convert-export"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemDataTransferExport.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Export"/>
+            <argument name="title" value="{{AdminMenuSystemDataTransferExport.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml
index 8840767c48c2e..9913933d857a8 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminSystemImportNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToImportPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-convert-import"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemDataTransferImport.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Import"/>
+            <argument name="title" value="{{AdminMenuSystemDataTransferImport.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Indexer/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Indexer/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..b74d521f2cb36
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuSystemToolsIndexManagement">
+        <data key="pageTitle">Index Management</data>
+        <data key="title">Index Management</data>
+        <data key="dataUiId">magento-indexer-system-index</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml b/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml
index 23edc4bc7311c..140c93f7f2b48 100644
--- a/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml
+++ b/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToIndexManagementPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-index"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemToolsIndexManagement.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Index Management"/>
+            <argument name="title" value="{{AdminMenuSystemToolsIndexManagement.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Integration/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Integration/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..be5b3f16ad3c5
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuSystemExtensionsIntegrations">
+        <data key="pageTitle">Integrations</data>
+        <data key="title">Integrations</data>
+        <data key="dataUiId">magento-integration-system-integrations</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml
index 1a663421f7c0a..3bd149d222c0e 100644
--- a/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml
+++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminSystemIntegrationsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToIntegrationsPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-integrations"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemExtensionsIntegrations.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Integrations"/>
+            <argument name="title" value="{{AdminMenuSystemExtensionsIntegrations.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Newsletter/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..1df1cd5f8dae8
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,31 @@
+<?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="AdminMenuMarketingCommunicationsNewsletterQueue">
+        <data key="pageTitle">Newsletter Queue</data>
+        <data key="title">Newsletter Queue</data>
+        <data key="dataUiId">magento-newsletter-newsletter-queue</data>
+    </entity>
+    <entity name="AdminMenuMarketingCommunicationsNewsletterSubscribers">
+        <data key="pageTitle">Newsletter Subscribers</data>
+        <data key="title">Newsletter Subscribers</data>
+        <data key="dataUiId">magento-newsletter-newsletter-subscriber</data>
+    </entity>
+    <entity name="AdminMenuMarketingCommunicationsNewsletterTemplate">
+        <data key="pageTitle">Newsletter Template</data>
+        <data key="title">Newsletter Template</data>
+        <data key="dataUiId">magento-newsletter-newsletter-template</data>
+    </entity>
+    <entity name="AdminMenuReportsMarketingNewsletterProblemReports">
+        <data key="pageTitle">Newsletter Problems Report</data>
+        <data key="title">Newsletter Problem Reports</data>
+        <data key="dataUiId">magento-newsletter-newsletter-problem</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml
index a6e650b894900..31da588250a0a 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterQueueNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterQueuePage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="newsletter-queue"/>
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterQueue.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Newsletter Queue"/>
+            <argument name="title" value="{{AdminMenuMarketingCommunicationsNewsletterQueue.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
index a37373056df28..8ced2690322f8 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterSubscribersNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterSubscribersPage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="newsletter-subscriber"/>
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterSubscribers.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Newsletter Subscribers"/>
+            <argument name="title" value="{{AdminMenuMarketingCommunicationsNewsletterSubscribers.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml
index cc371138bb071..ca994aa1d6269 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingNewsletterTemplateNavigateMenuTest.xml
@@ -8,7 +8,6 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-
     <test name="AdminMarketingNewsletterTemplateNavigateMenuTest">
         <annotations>
             <features value="Newsletter"/>
@@ -27,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterTemplatePage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="newsletter-template"/>
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterTemplate.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Newsletter Templates"/>
+            <argument name="title" value="{{AdminMenuMarketingCommunicationsNewsletterTemplate.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml
index 0bee062d89790..3891b90536a17 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminReportsNewsletterProblemReportsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterProblemsReportPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="newsletter-problem"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsMarketingNewsletterProblemReports.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Newsletter Problems Report"/>
+            <argument name="title" value="{{AdminMenuReportsMarketingNewsletterProblemReports.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..207bf62abf3ce
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,26 @@
+<?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="AdminMenuReportsSalesPayPalSettlement">
+        <data key="pageTitle">PayPal Settlement Reports</data>
+        <data key="title">PayPal Settlement</data>
+        <data key="dataUiId">magento-paypal-report-salesroot-paypal-settlement-reports</data>
+    </entity>
+    <entity name="AdminMenuSales">
+        <data key="pageTitle">Sales</data>
+        <data key="title">Sales</data>
+        <data key="dataUiId">magento-sales-sales</data>
+    </entity>
+    <entity name="AdminMenuSalesBillingAgreements">
+        <data key="pageTitle">Billing Agreements</data>
+        <data key="title">Billing Agreements</data>
+        <data key="dataUiId">magento-paypal-paypal-billing-agreement</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
index bbc7aca87f461..03f0167230e9f 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminReportsPayPalSettlementNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToPayPalSettlementPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="salesroot-paypal-settlement-reports"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesPayPalSettlement.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="PayPal Settlement Reports"/>
+            <argument name="title" value="{{AdminMenuReportsSalesPayPalSettlement.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
index da4091c8050d8..8c3735fcbd253 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminSalesBillingAgreementsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToBillingAgreementsPage">
-            <argument name="menuItem" value="sales-sales"/>
-            <argument name="submenuItem" value="paypal-billing-agreement"/>
+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSalesBillingAgreements.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Billing Agreements"/>
+            <argument name="title" value="{{AdminMenuSalesBillingAgreements.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..e77e3ee8abd87
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,86 @@
+<?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="AdminMenuReportsMarketingAbandonedCarts">
+        <data key="pageTitle">Abandoned Carts</data>
+        <data key="title">Abandoned Carts</data>
+        <data key="dataUiId">magento-reports-report-shopcart-abandoned</data>
+    </entity>
+    <entity name="AdminMenuReportsProductsBestsellers">
+        <data key="pageTitle">Bestsellers Report</data>
+        <data key="title">Bestsellers</data>
+        <data key="dataUiId">magento-reports-report-products-bestsellers</data>
+    </entity>
+    <entity name="AdminMenuReportsSalesCoupons">
+        <data key="pageTitle">Coupons Report</data>
+        <data key="title">Coupons</data>
+        <data key="dataUiId">magento-reports-report-salesroot-coupons</data>
+    </entity>
+    <entity name="AdminMenuReportsProductsDownloads">
+        <data key="pageTitle">Downloads Report</data>
+        <data key="title">Downloads</data>
+        <data key="dataUiId">magento-downloadable-report-products-downloads</data>
+    </entity>
+    <entity name="AdminMenuReportsSalesInvoiced">
+        <data key="pageTitle">Invoice Report</data>
+        <data key="title">Invoiced</data>
+        <data key="dataUiId">magento-reports-report-salesroot-invoiced</data>
+    </entity>
+    <entity name="AdminMenuReportsProductsLowStock">
+        <data key="pageTitle">Low Stock Report</data>
+        <data key="title">Low Stock</data>
+        <data key="dataUiId">magento-reports-report-products-lowstock</data>
+    </entity>
+    <entity name="AdminMenuReportsCustomersNew">
+        <data key="pageTitle">New Accounts Report</data>
+        <data key="title">New</data>
+        <data key="dataUiId">magento-reports-report-customers-accounts</data>
+    </entity>
+    <entity name="AdminMenuReportsCustomersOrderCount">
+        <data key="pageTitle">Order Count Report</data>
+        <data key="title">Order Count</data>
+        <data key="dataUiId">magento-reports-report-customers-orders</data>
+    </entity>
+    <entity name="AdminMenuReportsProductsOrdered">
+        <data key="pageTitle">Ordered Products Report</data>
+        <data key="title">Ordered</data>
+        <data key="dataUiId">magento-reports-report-products-sold</data>
+    </entity>
+    <entity name="AdminMenuReportsSalesOrders">
+        <data key="pageTitle">Orders Report</data>
+        <data key="title">Orders</data>
+        <data key="dataUiId">magento-reports-report-salesroot-sales</data>
+    </entity>
+    <entity name="AdminMenuReportsCustomersOrderTotal">
+        <data key="pageTitle">Order Total Report</data>
+        <data key="title">Order Total</data>
+        <data key="dataUiId">magento-reports-report-customers-totals</data>
+    </entity>
+    <entity name="AdminMenuReportsMarketingProductsInCarts">
+        <data key="pageTitle">Products in Carts</data>
+        <data key="title">Products in Cart</data>
+        <data key="dataUiId">magento-reports-report-shopcart-product</data>
+    </entity>
+    <entity name="AdminMenuReportsStatisticsRefreshStatistics">
+        <data key="pageTitle">Refresh Statistics</data>
+        <data key="title">Refresh Statistics</data>
+        <data key="dataUiId">magento-reports-report-statistics-refresh</data>
+    </entity>
+    <entity name="AdminMenuReportsSalesTax">
+        <data key="pageTitle">Tax Report</data>
+        <data key="title">Tax</data>
+        <data key="dataUiId">magento-reports-report-salesroot-tax</data>
+    </entity>
+    <entity name="AdminMenuReportsProductsViews">
+        <data key="pageTitle">Product Views Report</data>
+        <data key="title">Views</data>
+        <data key="dataUiId">magento-reports-report-products-viewed</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
index 8d7a2f896f0fa..342955e0684b3 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsAbandonedCartsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToAbandonedCartsPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-shopcart-abandoned"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsMarketingAbandonedCarts.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Abandoned Carts"/>
+            <argument name="title" value="{{AdminMenuReportsMarketingAbandonedCarts.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
index 73445a89585f6..259f2cde2786a 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsBestsellersNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsBestsellersPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-products-bestsellers"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsBestsellers.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Bestsellers Report"/>
+            <argument name="title" value="{{AdminMenuReportsProductsBestsellers.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
index 189295a0f9b96..321f3078bc63f 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsCouponsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsCouponsPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-salesroot-coupons"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesCoupons.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Coupons Report"/>
+            <argument name="title" value="{{AdminMenuReportsSalesCoupons.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
index 33506966a2f57..584c1af6683aa 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsDownloadsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsDownloadsPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-products-downloads"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsDownloads.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Downloads Report"/>
+            <argument name="title" value="{{AdminMenuReportsProductsDownloads.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
index 9e1397d679777..34aec0620cad9 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsInvoicedNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsInvoicedPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-salesroot-invoiced"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesInvoiced.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Invoice Report"/>
+            <argument name="title" value="{{AdminMenuReportsSalesInvoiced.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
index 2947cb23f8219..5d91d65a3a457 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsLowStockNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsLowStockPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-products-lowstock"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsLowStock.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Low Stock Report"/>
+            <argument name="title" value="{{AdminMenuReportsProductsLowStock.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
index a40b8a71f6594..aeb35ba65a380 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsNewNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsNewPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-customers-accounts"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsCustomersNew.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="New Accounts Report"/>
+            <argument name="title" value="{{AdminMenuReportsCustomersNew.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
index 3a15b7f1e4644..1bfbc654746e6 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderCountNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderCountPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-customers-orders"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsCustomersOrderCount.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Order Count Report"/>
+            <argument name="title" value="{{AdminMenuReportsCustomersOrderCount.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
index d491fd4e00a6a..88c94b53f5233 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderTotalPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-customers-totals"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsCustomersOrderTotal.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Order Total Report"/>
+            <argument name="title" value="{{AdminMenuReportsCustomersOrderTotal.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
index 81df84419d7d2..e81239539a5b5 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderedPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-products-sold"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsOrdered.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Ordered Products Report"/>
+            <argument name="title" value="{{AdminMenuReportsProductsOrdered.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
index 5f9de897e2039..13fc8e7353139 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrdersNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrdersPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-salesroot-sales"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesOrders.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Orders Report"/>
+            <argument name="title" value="{{AdminMenuReportsSalesOrders.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
index 22aeaaa95703a..03877f8e58ecc 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsProductsInCartNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsProductsInCartPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-shopcart-product"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsMarketingProductsInCarts.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Products in Carts"/>
+            <argument name="title" value="{{AdminMenuReportsMarketingProductsInCarts.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
index 606a73970d532..d05fc091357df 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsRefreshStatisticsNavigateMenuTest.xml
@@ -26,12 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsRefreshStatisticsPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-statistics-refresh"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsStatisticsRefreshStatistics.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Refresh Statistics"/>
+            <argument name="title" value="{{AdminMenuReportsStatisticsRefreshStatistics.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
-
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
index d5150405564cd..11a065c933a3b 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsTaxNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsTaxPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-salesroot-tax"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsSalesTax.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Tax Report"/>
+            <argument name="title" value="{{AdminMenuReportsSalesTax.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
index 0dab0fd263a3c..9154b96c71e38 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsViewsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsViewsPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-products-viewed"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsProductsViews.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Product Views Report"/>
+            <argument name="title" value="{{AdminMenuReportsProductsViews.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..89882707f5ebd
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,31 @@
+<?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="AdminMenuUserContentReviews">
+        <data key="pageTitle">Reviews</data>
+        <data key="title">Reviews</data>
+        <data key="dataUiId">magento-review-catalog-reviews-ratings-reviews-all</data>
+    </entity>
+    <entity name="AdminMenuReportsReviewsByCustomers">
+        <data key="pageTitle">Customer Reviews Report</data>
+        <data key="title">By Customers</data>
+        <data key="dataUiId">magento-review-report-review-customer</data>
+    </entity>
+    <entity name="AdminMenuReportsReviewsByProducts">
+        <data key="pageTitle">Product Reviews Report</data>
+        <data key="title">By Products</data>
+        <data key="dataUiId">magento-review-report-review-product</data>
+    </entity>
+    <entity name="AdminMenuAttributesRating">
+        <data key="pageTitle">Ratings</data>
+        <data key="title">Rating</data>
+        <data key="dataUiId">magento-review-catalog-reviews-ratings-ratings</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
index eda40968f9ad5..fade220d22100 100644
--- a/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminMarketingReviewsNavigateMenuTest.xml
@@ -25,12 +25,12 @@
         <after>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingReviewsPage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="catalog-reviews-ratings-reviews-all"/>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsViewsPage">
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuUserContentReviews.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Reviews"/>
+            <argument name="title" value="{{AdminMenuUserContentReviews.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
index 783ca2bf3ae72..58492424e76f7 100644
--- a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByCustomersNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsByCustomersPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-review-customer"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsReviewsByCustomers.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Customer Reviews Report"/>
+            <argument name="title" value="{{AdminMenuReportsReviewsByCustomers.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
index 68ca33113799f..e848aa4f22023 100644
--- a/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminReportsByProductsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsByProductsPage">
-            <argument name="menuItem" value="reports-report"/>
-            <argument name="submenuItem" value="report-review-product"/>
+            <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuReportsReviewsByProducts.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Product Reviews Report"/>
+            <argument name="title" value="{{AdminMenuReportsReviewsByProducts.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
index 140441380946d..511ed5439dc3d 100644
--- a/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminStoresRatingNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresRatingPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="catalog-reviews-ratings-ratings"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuAttributesRating.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Ratings"/>
+            <argument name="title" value="{{AdminMenuAttributesRating.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..4f6faccbb26d4
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,41 @@
+<?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="AdminMenuSalesCreditMemos">
+        <data key="pageTitle">Credit Memos</data>
+        <data key="title">Credit Memos</data>
+        <data key="dataUiId">magento-sales-sales-creditmemo</data>
+    </entity>
+    <entity name="AdminMenuSalesInvoices">
+        <data key="pageTitle">Invoices</data>
+        <data key="title">Invoices</data>
+        <data key="dataUiId">magento-sales-sales-invoice</data>
+    </entity>
+    <entity name="AdminMenuSalesOrders">
+        <data key="pageTitle">Orders</data>
+        <data key="title">Orders</data>
+        <data key="dataUiId">magento-sales-sales-order</data>
+    </entity>
+    <entity name="AdminMenuSalesShipments">
+        <data key="pageTitle">Shipments</data>
+        <data key="title">Shipments</data>
+        <data key="dataUiId">magento-sales-sales-shipment</data>
+    </entity>
+    <entity name="AdminMenuSalesTransactions">
+        <data key="pageTitle">Transactions</data>
+        <data key="title">Transactions</data>
+        <data key="dataUiId">magento-sales-sales-transactions</data>
+    </entity>
+    <entity name="AdminMenuStoresSettingsOrderStatus">
+        <data key="pageTitle">Order Status</data>
+        <data key="title">Order Status</data>
+        <data key="dataUiId">magento-sales-system-order-statuses</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
index 7f7423f4fab6c..af7cc1822d215 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesCreditMemosNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesCreditMemosPage">
-            <argument name="menuItem" value="sales-sales"/>
-            <argument name="submenuItem" value="sales-creditmemo"/>
+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSalesCreditMemos.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Credit Memos"/>
+            <argument name="title" value="{{AdminMenuSalesCreditMemos.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
index 99a1fc4f1b94d..5a38a66d1f4b2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesInvoicesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesInvoicesPage">
-            <argument name="menuItem" value="sales-sales"/>
-            <argument name="submenuItem" value="sales-invoice"/>
+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSalesInvoices.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Invoices"/>
+            <argument name="title" value="{{AdminMenuSalesInvoices.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
index 0a9c65068ce32..8099254923a2c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesOrdersNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesOrderPage">
-            <argument name="menuItem" value="sales-sales"/>
-            <argument name="submenuItem" value="sales-order"/>
+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSalesOrders.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Orders"/>
+            <argument name="title" value="{{AdminMenuSalesOrders.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
index 882ca3ee7adca..5717c6c90fc17 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesShipmentsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesShipmentsPage">
-            <argument name="menuItem" value="sales-sales"/>
-            <argument name="submenuItem" value="sales-shipment"/>
+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSalesShipments.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Shipments"/>
+            <argument name="title" value="{{AdminMenuSalesShipments.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
index e53dc220c4890..68933be92efe6 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSalesTransactionsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSalesTransactionsPage">
-            <argument name="menuItem" value="sales-sales"/>
-            <argument name="submenuItem" value="sales-transactions"/>
+            <argument name="menuUiId" value="{{AdminMenuSales.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSalesTransactions.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Transactions"/>
+            <argument name="title" value="{{AdminMenuSalesTransactions.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
index c278638029791..d55cde1449033 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminStoresOrderStatusNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresOrderStatusPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="system-order-statuses"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresSettingsOrderStatus.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Order Status"/>
+            <argument name="title" value="{{AdminMenuStoresSettingsOrderStatus.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..5a42980df1bbf
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuMarketingPromotionsCartPriceRules">
+        <data key="pageTitle">Cart Price Rules</data>
+        <data key="title">Cart Price Rules</data>
+        <data key="dataUiId">magento-salesrule-promo-quote</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml
index dced5468285b6..f281b0abf87a0 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminMarketingCartPriceRulesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingCartPriceRulesPage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="promo-quote"/>
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuMarketingPromotionsCartPriceRules.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Cart Price Rules"/>
+            <argument name="title" value="{{AdminMenuMarketingPromotionsCartPriceRules.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Sitemap/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..c8fd6a751cb22
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuSEOAndSearchSiteMap">
+        <data key="pageTitle">Site Map</data>
+        <data key="title">Site Map</data>
+        <data key="dataUiId">magento-sitemap-catalog-sitemap</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml
index cc85bffa2f5b7..54543fab8649d 100644
--- a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml
+++ b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingSiteMapPage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="catalog-sitemap"/>
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSEOAndSearchSiteMap.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Site Map"/>
+            <argument name="title" value="{{AdminMenuSEOAndSearchSiteMap.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Tax/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..2bed9b0d07918
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,26 @@
+<?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="AdminMenuStoresTaxesTaxRules">
+        <data key="pageTitle">Tax Rules</data>
+        <data key="title">Tax Rules</data>
+        <data key="dataUiId">magento-tax-sales-tax-rules</data>
+    </entity>
+    <entity name="AdminMenuStoresTaxZonesAndRates">
+        <data key="pageTitle">Tax Zones and Rates</data>
+        <data key="title">Tax Zones and Rates</data>
+        <data key="dataUiId">magento-tax-sales-tax-rates</data>
+    </entity>
+    <entity name="AdminMenuSystemDataTransferImportAndExportTaxRates">
+        <data key="pageTitle">Import and Export Tax Rates</data>
+        <data key="title">Import/Export Tax Rates</data>
+        <data key="dataUiId">magento-taximportexport-system-convert-tax</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml
index 529fc5b24641b..1277d6e5f9fd2 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxRulesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresTaxRulesPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="sales-tax-rules"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresTaxesTaxRules.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Tax Rules"/>
+            <argument name="title" value="{{AdminMenuStoresTaxesTaxRules.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml
index 15b41fe536b8a..e0a4d5d9a4016 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminStoresTaxZonesAndRatesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresTaxZonesAndRatesPage">
-            <argument name="menuItem" value="backend-stores"/>
-            <argument name="submenuItem" value="sales-tax-rates"/>
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresTaxZonesAndRates.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Tax Zones and Rates"/>
+            <argument name="title" value="{{AdminMenuStoresTaxZonesAndRates.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml
index 4074b0017710a..a84ae61d66305 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminSystemImportExportTaxRatesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemImportExportTaxRatesPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-convert-tax"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemDataTransferImportAndExportTaxRates.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Import and Export Tax Rates"/>
+            <argument name="title" value="{{AdminMenuSystemDataTransferImportAndExportTaxRates.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Theme/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Theme/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..e826651062562
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuContentDesignThemes">
+        <data key="pageTitle">Themes</data>
+        <data key="title">Themes</data>
+        <data key="dataUiId">magento-theme-system-design-theme</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml
index 97f8849588098..8e7bfd71b07d3 100644
--- a/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentThemesPage">
-            <argument name="menuItem" value="backend-content"/>
-            <argument name="submenuItem" value="system-design-theme"/>
+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuContentDesignThemes.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Themes"/>
+            <argument name="title" value="{{AdminMenuContentDesignThemes.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..66eb3c9ba9f46
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuMarketingSEOAndSearchURLRewrites">
+        <data key="pageTitle">URL Rewrites</data>
+        <data key="title">URL Rewrites</data>
+        <data key="dataUiId">magento-urlrewrite-urlrewrite</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml
index b04c86914ba8d..443307b427b42 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminMarketingUrlRewritesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingURLRewritesPage">
-            <argument name="menuItem" value="backend-marketing"/>
-            <argument name="submenuItem" value="urlrewrite"/>
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuMarketingSEOAndSearchURLRewrites.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="URL Rewrites"/>
+            <argument name="title" value="{{AdminMenuMarketingSEOAndSearchURLRewrites.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/User/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/User/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..e8b7d2aa8e047
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,31 @@
+<?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="AdminMenuSystemPermissionsAllUsers">
+        <data key="pageTitle">Users</data>
+        <data key="title">All Users</data>
+        <data key="dataUiId">magento-user-system-acl-users</data>
+    </entity>
+    <entity name="AdminMenuSystemPermissionsLockedUsers">
+        <data key="pageTitle">Locked Users</data>
+        <data key="title">Locked Users</data>
+        <data key="dataUiId">magento-user-system-acl-locks</data>
+    </entity>
+    <entity name="AdminMenuSystemOtherSettingsManageEncryptionKey">
+        <data key="pageTitle">Encryption Key</data>
+        <data key="title">Manage Encryption Key</data>
+        <data key="dataUiId">magento-encryptionkey-system-crypt-key</data>
+    </entity>
+    <entity name="AdminMenuSystemPermissionsUserRoles">
+        <data key="pageTitle">Roles</data>
+        <data key="title">User Roles</data>
+        <data key="dataUiId">magento-user-system-acl-roles</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml
index e523889875cfe..b899320403d71 100644
--- a/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemAllUsersNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemAllUsersPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-acl-users"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemPermissionsAllUsers.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Users"/>
+            <argument name="title" value="{{AdminMenuSystemPermissionsAllUsers.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml
index 696b22e883bd1..aea46f3273157 100644
--- a/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemLockedUsersNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemLockedUsersPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-acl-locks"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemPermissionsLockedUsers.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Locked Users"/>
+            <argument name="title" value="{{AdminMenuSystemPermissionsLockedUsers.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml
index f76cf0c47012c..f8013a54058c3 100644
--- a/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToManageEncryptionKeyPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-crypt-key"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemOtherSettingsManageEncryptionKey.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Encryption Key"/>
+            <argument name="title" value="{{AdminMenuSystemOtherSettingsManageEncryptionKey.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml
index d4ae7d737d6f7..c4052a7f4219c 100644
--- a/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminSystemUserRolesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemUserRolesPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-acl-roles"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemPermissionsUserRoles.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Roles"/>
+            <argument name="title" value="{{AdminMenuSystemPermissionsUserRoles.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Variable/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Variable/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..e094239767486
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuSystemOtherSettingsCustomVariables">
+    <data key="pageTitle">Custom Variables</data>
+    <data key="title">Custom Variables</data>
+    <data key="dataUiId">magento-variable-system-variable</data>
+</entity>
+</entities>
diff --git a/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml b/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml
index fbe5c2173482c..74446cf601348 100644
--- a/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml
+++ b/app/code/Magento/Variable/Test/Mftf/Test/AdminSystemCustomVariablesNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSystemCustomVariablesPage">
-            <argument name="menuItem" value="backend-system"/>
-            <argument name="submenuItem" value="system-variable"/>
+            <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuSystemOtherSettingsCustomVariables.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Custom Variables"/>
+            <argument name="title" value="{{AdminMenuSystemOtherSettingsCustomVariables.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Widget/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/Widget/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..8fa652b8f73eb
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuContentElementsWidgets">
+        <data key="pageTitle">Widgets</data>
+        <data key="title">Widgets</data>
+        <data key="dataUiId">magento-widget-cms-widget-instance</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml
index 6dd94d692435d..f5af024ec1d51 100644
--- a/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Test/AdminContentWidgetsNavigateMenuTest.xml
@@ -26,11 +26,11 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentWidgetsPage">
-            <argument name="menuItem" value="backend-content"/>
-            <argument name="submenuItem" value="cms-widget-instance"/>
+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuContentElementsWidgets.dataUiId}}"/>
         </actionGroup>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
-            <argument name="title" value="Widgets"/>
+            <argument name="title" value="{{AdminMenuContentElementsWidgets.pageTitle}}"/>
         </actionGroup>
     </test>
 </tests>

From c4f8496dfc4434cc367c101f660e5f318140d502 Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Mon, 18 Mar 2019 15:48:22 +0200
Subject: [PATCH 0655/1055] #20825 Missing required argument
 $productAvailabilityChecks of
 Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker.

---
 .../Magento/ConfigurableProductSales/etc/di.xml  | 16 ----------------
 app/code/Magento/Sales/etc/di.xml                |  7 +++++++
 2 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 app/code/Magento/ConfigurableProductSales/etc/di.xml

diff --git a/app/code/Magento/ConfigurableProductSales/etc/di.xml b/app/code/Magento/ConfigurableProductSales/etc/di.xml
deleted file mode 100644
index b53faf74ffa1d..0000000000000
--- a/app/code/Magento/ConfigurableProductSales/etc/di.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker">
-        <arguments>
-            <argument name="productAvailabilityChecks" xsi:type="array">
-                <item name="configurable" xsi:type="object">Magento\ConfigurableProductSales\Model\Order\Reorder\OrderedProductAvailabilityChecker</item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 5a5dd925a3098..6ed230861e4d0 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -1015,4 +1015,11 @@
     <preference
             for="Magento\Sales\Api\OrderCustomerDelegateInterface"
             type="Magento\Sales\Model\Order\OrderCustomerDelegate" />
+    <type name="Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker">
+        <arguments>
+            <argument name="productAvailabilityChecks" xsi:type="array">
+                <item name="configurable" xsi:type="object">Magento\ConfigurableProductSales\Model\Order\Reorder\OrderedProductAvailabilityChecker</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

From fa1688502f6db0d2e32a2e23082c5a3be7b5ebc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?= <rafaelcg_stz@hotmail.com>
Date: Mon, 18 Mar 2019 10:07:02 -0400
Subject: [PATCH 0656/1055] Aligning tooltip action on dashboard

---
 .../backend/web/css/source/forms/fields/_field-tooltips.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
old mode 100644
new mode 100755
index 8184a5c4bb248..e5891e39648fc
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
@@ -22,7 +22,7 @@
 @field-tooltip-content__width: 32rem;
 @field-tooltip-content__z-index: 1;
 
-@field-tooltip-action__margin-left: 2rem;
+@field-tooltip-action__margin-left: 0rem;
 
 //
 //  Form Fields

From f16e98c4ef015524da5c5c498f3a5c92e4c90c5e Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Mon, 18 Mar 2019 09:20:46 -0500
Subject: [PATCH 0657/1055] MC-4433: Convert SearchEntityResultsTest to MFTF

- Added new actionGroup for backwards compatibility policy.
---
 .../StorefrontCatalogSearchActionGroup.xml    | 13 +++++++
 .../Mftf/Test/SearchEntityResultsTest.xml     | 34 +++++++++----------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index f6d9df63bf31c..b7c0fb6b9335e 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -21,6 +21,19 @@
         <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
     </actionGroup>
 
+    <!-- Quick search the phrase and check if the result page contains correct information, usable with type="string" -->
+    <actionGroup name="StorefrontCheckQuickSearchStringActionGroup">
+        <arguments>
+            <argument name="phrase" type="string"/>
+        </arguments>
+        <fillField stepKey="fillInput" selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{phrase}}"/>
+        <submitForm selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" parameterArray="[]" stepKey="submitQuickSearch" />
+        <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
+        <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
+        <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
+        <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
+    </actionGroup>
+
     <!-- Opens product from QuickSearch and performs assertions-->
     <actionGroup name="StorefrontOpenProductFromQuickSearch">
         <arguments>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
index b65b199507ac1..8c5ea9f8205c4 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -29,7 +29,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createSimpleProduct.sku$"/>
         </actionGroup>
         <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
@@ -48,7 +48,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <!-- Overwrite search to use name -->
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createSimpleProduct.name$"/>
         </actionGroup>
     </test>
@@ -68,7 +68,7 @@
             </createData>
         </before>
         <!-- Overwrite search to use name -->
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createSimpleProduct.name$"/>
         </actionGroup>
     </test>
@@ -93,7 +93,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="ThisShouldn'tReturnAnything"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmpty"/>
@@ -109,7 +109,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,2); return ret;" stepKey="getFirstTwoLetters" before="searchStorefront"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="{$getFirstTwoLetters}"/>
         </actionGroup>
     </test>
@@ -124,7 +124,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,3); return ret;" stepKey="getFirstThreeLetters" before="searchStorefront"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="{$getFirstThreeLetters}"/>
         </actionGroup>
     </test>
@@ -144,7 +144,7 @@
             </createData>
         </before>
         <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,128); return ret;" stepKey="get128Letters" before="searchStorefront"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="{$get128Letters}"/>
         </actionGroup>
     </test>
@@ -219,7 +219,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="{{_defaultProduct.name}}"/>
         </actionGroup>
         <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="assertProduct1Position">
@@ -281,7 +281,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createSimpleProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
@@ -309,7 +309,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createVirtualProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
@@ -341,7 +341,7 @@
             </actionGroup>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="{{_defaultProduct.name}}"/>
         </actionGroup>
         <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
@@ -378,7 +378,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
@@ -407,7 +407,7 @@
             <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
@@ -454,7 +454,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createBundleProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
@@ -517,7 +517,7 @@
         </after>
         <comment userInput="$simpleProduct1.name$" stepKey="asdf"/>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createBundleProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontOpenProductFromQuickSearch" stepKey="openAndCheckProduct">
@@ -600,7 +600,7 @@
             </createData>
         </before>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefront">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createConfigProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontQuickSearchCheckProductNameInGrid" stepKey="seeProductInGrid">
@@ -616,7 +616,7 @@
         <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
 
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPageAgain"/>
-        <actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchStorefrontAgain">
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefrontAgain">
             <argument name="phrase" value="$createConfigProduct.name$"/>
         </actionGroup>
         <actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="dontSeeProductAnymore">

From c02ded0a3080a0e5c13b684dff0223b8a90efcc8 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Mon, 18 Mar 2019 09:36:29 -0500
Subject: [PATCH 0658/1055] MQE-1481: Investigate failing test
 AdminCreateCustomProductAttributeWithDropdownFieldTest

- Remove label part from selector
---
 .../Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
index e218f5ae74fc0..2de7bf19fd378 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
@@ -15,7 +15,7 @@
         <element name="addValue" type="button" selector="//button[contains(@data-action,'add_new_row')]" timeout="30"/>
         <element name="defaultStoreView" type="input" selector="//input[contains(@name,'option[value][option_{{row}}][1]')]" parameterized="true"/>
         <element name="adminOption" type="input" selector="//input[contains(@name,'option[value][option_{{row}}][0]')]" parameterized="true"/>
-        <element name="defaultRadioButton" type="radio" selector="//tr[{{row}}]//input[contains(@name,'default[]')]/..//label" parameterized="true"/>
+        <element name="defaultRadioButton" type="radio" selector="//tr[{{row}}]//input[contains(@name,'default[]')]" parameterized="true"/>
         <element name="isRequired" type="checkbox" selector="//input[contains(@name,'is_required')]/..//label"/>
         <element name="advancedAttributeProperties" type="text" selector="//div[contains(@data-index,'advanced_fieldset')]"/>
         <element name="attributeCode" type="input" selector="//*[@class='admin__fieldset-wrapper-content admin__collapsible-content _show']//input[@name='attribute_code']"/>

From 65634f65e57771932f59cade74b3d6030ce8af06 Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen@reachdigital.nl>
Date: Mon, 18 Mar 2019 15:13:13 +0100
Subject: [PATCH 0659/1055] Refactor \Order\Shipment\AddTrack Controller to use
 ResultInterface

---
 .../Adminhtml/Order/Shipment/AddTrack.php     | 83 ++++++++++++++-----
 1 file changed, 62 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
index fa83db490e380..8abc74b50a00e 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
@@ -1,12 +1,23 @@
 <?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\Backend\App\Action;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Sales\Api\Data\ShipmentTrackInterfaceFactory;
+use Magento\Sales\Api\ShipmentRepositoryInterface;
+use Magento\Sales\Model\Order\Shipment\TrackFactory;
+use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
 
 class AddTrack extends \Magento\Backend\App\Action
 {
@@ -18,56 +29,84 @@ class AddTrack extends \Magento\Backend\App\Action
     const ADMIN_RESOURCE = 'Magento_Sales::shipment';
 
     /**
-     * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
+     * @var ShipmentLoader
      */
     protected $shipmentLoader;
 
+    /**
+     * @var ShipmentRepositoryInterface
+     */
+    private $shipmentRepository;
+
+    /**
+     * @var TrackFactory
+     */
+    private $trackFactory;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
     /**
      * @param Action\Context $context
-     * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
+     * @param ShipmentLoader $shipmentLoader
+     * @param ShipmentRepositoryInterface|null $shipmentRepository
+     * @param TrackFactory|null $trackFactory
+     * @param SerializerInterface|null $serializer
      */
     public function __construct(
         Action\Context $context,
-        \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
+        ShipmentLoader $shipmentLoader,
+        ShipmentRepositoryInterface $shipmentRepository = null,
+        TrackFactory $trackFactory = null,
+        SerializerInterface $serializer = null
     ) {
-        $this->shipmentLoader = $shipmentLoader;
         parent::__construct($context);
+
+        $this->shipmentLoader = $shipmentLoader;
+        $this->shipmentRepository = $shipmentRepository ?: ObjectManager::getInstance()
+            ->get(ShipmentRepositoryInterface::class);
+        $this->trackFactory = $trackFactory ?: ObjectManager::getInstance()
+            ->get(ShipmentTrackInterfaceFactory::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
+            ->get(SerializerInterface::class);
     }
 
     /**
-     * Add new tracking number action
+     * Add new tracking number action.
      *
-     * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return ResultInterface
      */
-    public function execute()
+    public function execute(): ResultInterface
     {
         try {
             $carrier = $this->getRequest()->getPost('carrier');
             $number = $this->getRequest()->getPost('number');
             $title = $this->getRequest()->getPost('title');
+
             if (empty($carrier)) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a carrier.'));
+                throw new LocalizedException(__('Please specify a carrier.'));
             }
             if (empty($number)) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a tracking number.'));
+                throw new LocalizedException(__('Please enter a tracking number.'));
             }
+
             $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
             $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id'));
             $this->shipmentLoader->setShipment($this->getRequest()->getParam('shipment'));
             $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
             $shipment = $this->shipmentLoader->load();
             if ($shipment) {
-                $track = $this->_objectManager->create(
-                    \Magento\Sales\Model\Order\Shipment\Track::class
-                )->setNumber(
+                $track = $this->trackFactory->create()->setNumber(
                     $number
                 )->setCarrierCode(
                     $carrier
                 )->setTitle(
                     $title
                 );
-                $shipment->addTrack($track)->save();
+                $shipment->addTrack($track);
+                $this->shipmentRepository->save($shipment);
 
                 $this->_view->loadLayout();
                 $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Shipments'));
@@ -78,16 +117,18 @@ public function execute()
                     'message' => __('We can\'t initialize shipment for adding tracking number.'),
                 ];
             }
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $response = ['error' => true, 'message' => $e->getMessage()];
         } catch (\Exception $e) {
             $response = ['error' => true, 'message' => __('Cannot add tracking number.')];
         }
-        if (is_array($response)) {
-            $response = $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($response);
-            $this->getResponse()->representJson($response);
-        } else {
-            $this->getResponse()->setBody($response);
+
+        if (\is_array($response)) {
+            $response = $this->serializer->serialize($response);
+
+            return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setJsonData($response);
         }
+
+        return $this->resultFactory->create(ResultFactory::TYPE_RAW)->setContents($response);
     }
 }

From 13126a5355d55ba04631b1d3302566f2420e5fa9 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Mon, 18 Mar 2019 09:52:05 -0500
Subject: [PATCH 0660/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

- fixed unit tests
---
 .../Framework/View/Test/Unit/Element/AbstractBlockTest.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
index dbc16b808c47e..dba775ea894f4 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -65,7 +65,10 @@ protected function setUp()
         $this->eventManagerMock = $this->getMockForAbstractClass(EventManagerInterface::class);
         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->cacheStateMock = $this->getMockForAbstractClass(CacheStateInterface::class);
-        $this->lockQuery = $this->getMockForAbstractClass(LockGuardedCacheLoader::class);
+        $this->lockQuery = $this->getMockBuilder(LockGuardedCacheLoader::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['lockedLoadData'])
+            ->getMockForAbstractClass();
         $this->sidResolverMock = $this->getMockForAbstractClass(SidResolverInterface::class);
         $this->sessionMock = $this->getMockForAbstractClass(SessionManagerInterface::class);
         $contextMock = $this->createMock(Context::class);

From 8b0318efede13c8844616a90c5bf67906a835ecf Mon Sep 17 00:00:00 2001
From: Tomash Khamlai <tomash.khamlai@gmail.com>
Date: Mon, 18 Mar 2019 17:14:49 +0200
Subject: [PATCH 0661/1055] When setting `background` for labels explicitly the
 labels in admin will overlap the `::before` pseudo-element.

I suggest to remove explicit setting for `label` element or replace
`@color-white` to `transparent`.

In some cases developers try to hide elements by setting white
background and higher z-index for the element with white background.
But the proper way of hiding elements is to override templates config or
remove elements by JavaScript.
---
 .../adminhtml/Magento/backend/web/css/source/forms/_fields.less  | 1 -
 1 file changed, 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 d8fd1db5ced47..5698afdaac7ae 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
@@ -545,7 +545,6 @@
             & > .admin__field-label {
                 #mix-grid .column(@field-label-grid__column, @field-grid__columns);
                 cursor: pointer;
-                background: @color-white;
                 left: 0;
                 position: absolute;
                 top: 0;

From f0039d69bf74530d209ab33a5d5a6e97279a1f24 Mon Sep 17 00:00:00 2001
From: Erik Hanson <erik.hanson@gmail.com>
Date: Mon, 18 Mar 2019 10:52:00 -0500
Subject: [PATCH 0662/1055] Flying Fists of Kung Fu Cleanup

* Rename all instances of fist to first in docs and tests :D
---
 app/code/Magento/Authorizenet/Model/Directpost/Request.php    | 2 +-
 ...rtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml | 2 +-
 ...pleProductWithRegularPriceInStockWithCustomOptionsTest.xml | 2 +-
 ...arPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml | 2 +-
 .../Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml  | 4 ++--
 ...onfigurableProductWithTwoOptionsAssignedToCategoryTest.xml | 2 +-
 ...ableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request.php b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
index d518af4e04f55..10be4cd5febf6 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Request.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
@@ -194,7 +194,7 @@ public function setDataFromOrder(
     /**
      * Set sign hash into the request object.
      *
-     * All needed fields should be placed in the object fist.
+     * All needed fields should be placed in the object first.
      *
      * @return $this
      */
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index 70edb0ce3ea7d..17769c79677f7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -139,7 +139,7 @@
         </assertEquals>
 
         <!--Verify we see customizable options are Required -->
-        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFistCustomOptionIsRequired" />
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFirstCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption2.title)}}" stepKey="verifySecondCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption3.title)}}" stepKey="verifyThirdCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption4.title)}}" stepKey="verifyFourthCustomOptionIsRequired" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
index c9a37ec40e8fa..318ab6555235e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
@@ -135,7 +135,7 @@
         </assertEquals>
 
         <!--Verify customer see customizable options are Required -->
-        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(simpleProductCustomizableOption.title)}}" stepKey="verifyFistCustomOptionIsRequired"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(simpleProductCustomizableOption.title)}}" stepKey="verifyFirstCustomOptionIsRequired"/>
 
         <!--Verify customer see customizable option titles and prices -->
         <grabAttributeFrom userInput="for" selector="{{StorefrontProductInfoMainSection.customOptionLabel(simpleProductCustomizableOption.title)}}" stepKey="simpleOptionId"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
index d67d5b36109e6..34d85e7b46850 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -229,7 +229,7 @@
             <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(virtualProductCustomizableOption1.title)}}" stepKey="verifyFirstCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption2.title)}}" stepKey="verifySecondCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption3.title)}}" stepKey="verifyThirdCustomOptionIsRequired" />
         <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption4.title)}}" stepKey="verifyFourthCustomOptionIsRequired" />
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
index 95b86ec3a8587..43dae2d70d416 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -145,8 +145,8 @@
         <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"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFirstAttribute" after="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="clickOnSelectAllForFirstAttribute"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
     </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
index 981985b3f4ea8..1db9b3e5b79b2 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
@@ -144,7 +144,7 @@
         <waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
 
         <!-- Quick search the storefront for the first attribute option -->
-        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute1.sku}}]" stepKey="searchStorefrontFistChildProduct"/>
+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute1.sku}}]" stepKey="searchStorefrontFirstChildProduct"/>
         <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute1.name)}}" stepKey="dontSeeConfigurableProductFirstChild"/>
 
         <!-- Quick search the storefront for the second attribute option -->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
index e278018330aa6..934a410d58a8a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
@@ -126,7 +126,7 @@
         <waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
 
         <!-- Quick search the storefront for the first attribute option -->
-        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute1.sku}}]" stepKey="searchStorefrontFistChildProduct"/>
+        <submitForm selector="{{StorefrontQuickSearchSection.searchMiniForm}}" parameterArray="['q' => {{colorConfigurableProductAttribute1.sku}}]" stepKey="searchStorefrontFirstChildProduct"/>
         <dontSee selector="{{StorefrontCategoryProductSection.ProductTitleByName(colorConfigurableProductAttribute1.name)}}" stepKey="dontSeeConfigurableProductFirstChild"/>
 
         <!-- Quick search the storefront for the second attribute option -->

From e7a723ab66e887c2f5bb3798959809d2f2931b77 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Mon, 18 Mar 2019 13:31:47 -0500
Subject: [PATCH 0663/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 .../Framework/Lock/Backend/ZookeeperTest.php    |  1 +
 .../Framework/Lock/LockBackendFactory.php       |  2 +-
 .../Lock/Test/Unit/Backend/ZookeeperTest.php    | 17 ++++++++++-------
 .../Lock/Test/Unit/LockBackendFactoryTest.php   |  2 +-
 .../Setup/Model/ConfigOptionsList/Lock.php      |  4 ++--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
index 6e312637c7b5a..ae218561377f2 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
@@ -74,6 +74,7 @@ public function testLockAndUnlock()
 
         $this->assertTrue($this->model->lock($name));
         $this->assertTrue($this->model->isLocked($name));
+        $this->assertFalse($this->model->lock($name, 2));
 
         $this->assertTrue($this->model->unlock($name));
         $this->assertFalse($this->model->isLocked($name));
diff --git a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
index ec15736bef534..46cb2998ede70 100644
--- a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
@@ -90,7 +90,7 @@ public function create(): LockManagerInterface
         $config = $this->deploymentConfig->get('lock/config', []);
 
         if (!isset($this->lockers[$provider])) {
-            throw new RuntimeException(new Phrase('Unknown locks provider.'));
+            throw new RuntimeException(new Phrase('Unknown locks provider: %1', [$provider]));
         }
 
         if (self::LOCK_ZOOKEEPER === $provider && !extension_loaded(self::LOCK_ZOOKEEPER)) {
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
index c22c49d3427c5..7c450a09df320 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
@@ -13,11 +13,6 @@
 
 class ZookeeperTest extends TestCase
 {
-    /**
-     * @var \Zookeeper|MockObject
-     */
-    private $zookeeperMock;
-
     /**
      * @var ZookeeperProvider
      */
@@ -41,15 +36,23 @@ protected function setUp()
         if (!extension_loaded('zookeeper')) {
             $this->markTestSkipped('Test was skipped because php extension Zookeeper is not installed.');
         }
-        $this->zookeeperProvider = new ZookeeperProvider($this->host, '/some/path/');
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\RuntimeException
      * @expectedExceptionMessage The path needs to be a non-empty string.
+     * @return void
      */
     public function testConstructionWithException()
     {
-        $this->zookeeperProvider = new ZookeeperProvider('some host', '');
+        $this->zookeeperProvider = new ZookeeperProvider($this->host, '');
+    }
+
+    /**
+     * @return void
+     */
+    public function testConstructionWithoutException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider($this->host, $this->path);
     }
 }
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
index 18053f20f010c..8864ab6f9ead1 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
@@ -46,7 +46,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\RuntimeException
-     * @expectedExceptionMessage Unknown locks provider.
+     * @expectedExceptionMessage Unknown locks provider: someProvider
      */
     public function testCreateWithException()
     {
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
index 912b0e42ca822..ae236c1b5d740 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
@@ -210,12 +210,12 @@ private function validateZookeeperConfig(array $options, DeploymentConfig $deplo
             $errors[] = 'php extension Zookeeper is not installed.';
         }
 
-        $host = (string) $options[self::INPUT_KEY_LOCK_ZOOKEEPER_HOST]
+        $host = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_HOST]
             ?? $deploymentConfig->get(
                    self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
                    $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_HOST)
                );
-        $path = (string) $options[self::INPUT_KEY_LOCK_ZOOKEEPER_PATH]
+        $path = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_PATH]
             ?? $deploymentConfig->get(
                 self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
                 $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_PATH)

From f4be1612bd4ba6d492cf920e7fdb9514fd5ebe56 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <d.cheshun@atwix.com>
Date: Mon, 18 Mar 2019 20:59:08 +0200
Subject: [PATCH 0664/1055] Fix phpcs issue: restore new line at the end of
 file

---
 .../view/frontend/templates/multishipping_agreements.phtml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
index 2d0667ee27cf8..3400770f5cee8 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -46,4 +46,4 @@
             <?php endif; ?>
         </li>
     <?php endforeach ?>
-</ol>
\ No newline at end of file
+</ol>

From 9b83593fab1f5dcbf351a8ae2fb6e88c815cecb8 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <d.cheshun@atwix.com>
Date: Mon, 18 Mar 2019 21:01:44 +0200
Subject: [PATCH 0665/1055] Add deprecated tag for legacy template

---
 .../view/frontend/templates/multishipping_agreements.phtml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
index 3400770f5cee8..33227f0cdce3c 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// @deprecated
 // @codingStandardsIgnoreFile
 
 ?>

From 32764b133e89490d4d123a78456133675f9471e0 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Mon, 18 Mar 2019 14:58:15 -0500
Subject: [PATCH 0666/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

- fixed unit tests
---
 .../View/Test/Unit/Element/Html/LinkTest.php  | 70 +++++++++----------
 1 file changed, 33 insertions(+), 37 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
index b911a38dbb488..96161e12e9773 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
@@ -7,6 +7,13 @@
 
 class LinkTest extends \PHPUnit\Framework\TestCase
 {
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+    }
+
     /**
      * @var array
      */
@@ -24,24 +31,8 @@ class LinkTest extends \PHPUnit\Framework\TestCase
      */
     protected $link;
 
-    /**
-     * @param \Magento\Framework\View\Element\Html\Link $link
-     * @param string $expected
-     *
-     * @dataProvider getLinkAttributesDataProvider
-     */
-    public function testGetLinkAttributes($link, $expected)
+    public function testGetLinkAttributes()
     {
-        $this->assertEquals($expected, $link->getLinkAttributes());
-    }
-
-    /**
-     * @return array
-     */
-    public function getLinkAttributesDataProvider()
-    {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
         $escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
             ->setMethods(['escapeHtml'])->disableOriginalConstructor()->getMock();
 
@@ -54,13 +45,19 @@ public function getLinkAttributesDataProvider()
 
         $urlBuilderMock->expects($this->any())
             ->method('getUrl')
-            ->will($this->returnArgument('http://site.com/link.html'));
+            ->willReturn('http://site.com/link.html');
 
         $validtorMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template\File\Validator::class)
             ->setMethods(['isValid'])->disableOriginalConstructor()->getMock();
+        $validtorMock->expects($this->any())
+            ->method('isValid')
+            ->willReturn(false);
 
         $scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config::class)
             ->setMethods(['isSetFlag'])->disableOriginalConstructor()->getMock();
+        $scopeConfigMock->expects($this->any())
+            ->method('isSetFlag')
+            ->willReturn(true);
 
         $resolverMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template\File\Resolver::class)
             ->setMethods([])->disableOriginalConstructor()->getMock();
@@ -72,48 +69,47 @@ public function getLinkAttributesDataProvider()
 
         $contextMock->expects($this->any())
             ->method('getValidator')
-            ->will($this->returnValue($validtorMock));
+            ->willReturn($validtorMock);
 
         $contextMock->expects($this->any())
             ->method('getResolver')
-            ->will($this->returnValue($resolverMock));
+            ->willReturn($resolverMock);
 
         $contextMock->expects($this->any())
             ->method('getEscaper')
-            ->will($this->returnValue($escaperMock));
+            ->willReturn($escaperMock);
 
         $contextMock->expects($this->any())
             ->method('getUrlBuilder')
-            ->will($this->returnValue($urlBuilderMock));
+            ->willReturn($urlBuilderMock);
 
         $contextMock->expects($this->any())
             ->method('getScopeConfig')
-            ->will($this->returnValue($scopeConfigMock));
+            ->willReturn($scopeConfigMock);
 
         /** @var \Magento\Framework\View\Element\Html\Link $linkWithAttributes */
-        $linkWithAttributes = $objectManagerHelper->getObject(
+        $linkWithAttributes = $this->objectManager->getObject(
             \Magento\Framework\View\Element\Html\Link::class,
             ['context' => $contextMock]
         );
+
+        $this->assertEquals(
+            'href="http://site.com/link.html"',
+            $linkWithAttributes->getLinkAttributes()
+        );
+
         /** @var \Magento\Framework\View\Element\Html\Link $linkWithoutAttributes */
-        $linkWithoutAttributes = $objectManagerHelper->getObject(
+        $linkWithoutAttributes = $this->objectManager->getObject(
             \Magento\Framework\View\Element\Html\Link::class,
             ['context' => $contextMock]
         );
-
         foreach ($this->allowedAttributes as $attribute) {
-            $linkWithAttributes->setDataUsingMethod($attribute, $attribute);
+            $linkWithoutAttributes->setDataUsingMethod($attribute, $attribute);
         }
 
-        return [
-            'full' => [
-                'link' => $linkWithAttributes,
-                'expected' => 'shape="shape" tabindex="tabindex" onfocus="onfocus" onblur="onblur" id="id"',
-            ],
-            'empty' => [
-                'link' => $linkWithoutAttributes,
-                'expected' => '',
-            ],
-        ];
+        $this->assertEquals(
+            'href="http://site.com/link.html" shape="shape" tabindex="tabindex" onfocus="onfocus" onblur="onblur" id="id"',
+            $linkWithoutAttributes->getLinkAttributes()
+        );
     }
 }

From f5653ab878565e22b56e1c303127b2c7b8209e46 Mon Sep 17 00:00:00 2001
From: Dmytro Yushkin <dyushkin@adobe.com>
Date: Mon, 18 Mar 2019 15:13:22 -0500
Subject: [PATCH 0667/1055] MAGETWO-98617: Pager does not work on Newsletter
 Subscribers Admin page - Added strict type declaration

---
 .../Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
index ea361a643dee0..48d3356525f49 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Newsletter\Block\Adminhtml\Subscriber;
 
 /**

From 83a1c236f5d1e9825cc3b498c1c38f8322ffb132 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Mon, 18 Mar 2019 15:43:14 -0500
Subject: [PATCH 0668/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

- fixed integration tests
---
 .../Backend/Block/Widget/Form/ContainerTest.php   |  2 +-
 .../Magento/Framework/Lock/Backend/Cache.php      | 15 ++++++++++++---
 .../Framework/View/Element/AbstractBlock.php      |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Form/ContainerTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Form/ContainerTest.php
index e55bb026af6ff..c11204bcdd358 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Form/ContainerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Form/ContainerTest.php
@@ -30,7 +30,7 @@ public function testGetFormHtml()
         $expectedHtml = '<b>html</b>';
         $this->assertNotEquals($expectedHtml, $block->getFormHtml());
         $form->setText($expectedHtml);
-        $this->assertEquals('', $block->getFormHtml());
+        $this->assertEquals($expectedHtml, $block->getFormHtml());
     }
 
     public function testPseudoConstruct()
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
index 7cfa7274e4e31..256ad2fdbd3e1 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Cache.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
@@ -37,7 +37,7 @@ public function __construct(FrontendInterface $cache)
      */
     public function lock(string $name, int $timeout = -1): bool
     {
-        return $this->cache->save('1', self::LOCK_PREFIX . $name, [], $timeout);
+        return $this->cache->save('1', $this->getIdentifier($name), [], $timeout);
     }
 
     /**
@@ -45,7 +45,7 @@ public function lock(string $name, int $timeout = -1): bool
      */
     public function unlock(string $name): bool
     {
-        return $this->cache->remove(self::LOCK_PREFIX . $name);
+        return $this->cache->remove($this->getIdentifier($name));
     }
 
     /**
@@ -53,6 +53,15 @@ public function unlock(string $name): bool
      */
     public function isLocked(string $name): bool
     {
-        return (bool)$this->cache->test(self::LOCK_PREFIX . $name);
+        return (bool)$this->cache->test($this->getIdentifier($name));
+    }
+
+    /**
+     * @param string $name
+     * @return string
+     */
+    private function getIdentifier(string $name): string
+    {
+        return self::LOCK_PREFIX . $name;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 00edfc628d936..187bb0ea1446f 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -686,7 +686,7 @@ public function toHtml()
         ]);
         $html = $transportObject->getHtml();
 
-        return (string)$html;
+        return $html;
     }
 
     /**

From ac8d63dce52af0e445578fe3011292c54ade9d0b Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Mon, 18 Mar 2019 16:02:19 -0500
Subject: [PATCH 0669/1055] MC-13613: Product mass update

---
 .../Plugin/MassUpdateProductAttribute.php     | 39 ++++++-------------
 .../Magento/CatalogInventory/composer.json    |  1 -
 .../Api/Data/PoisonPillInterface.php          |  8 ----
 .../Magento/MessageQueue/Model/PoisonPill.php |  8 ----
 4 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
index f41fc00b55acb..95fe5ae24d23e 100644
--- a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
+++ b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
@@ -40,19 +40,9 @@ class MassUpdateProductAttribute
     private $stockConfiguration;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface
+     * @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute
      */
-    private $request;
-
-    /**
-     * @var \Magento\Backend\Model\Session
-     */
-    private $session;
-
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface
-     */
-    private $storeManager;
+    private $attributeHelper;
 
     /**
      * @var \Magento\Backend\Model\View\Result\Redirect
@@ -69,9 +59,7 @@ class MassUpdateProductAttribute
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Backend\Model\Session $session
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
      * @param \Magento\Backend\Model\View\Result\RedirectFactory $redirectFactory
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -82,9 +70,7 @@ public function __construct(
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
         \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository,
         \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
-        \Magento\Framework\App\RequestInterface $request,
-        \Magento\Backend\Model\Session $session,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
         \Magento\Backend\Model\View\Result\RedirectFactory $redirectFactory,
         \Magento\Framework\Message\ManagerInterface $messageManager
     ) {
@@ -93,9 +79,7 @@ public function __construct(
         $this->stockRegistry = $stockRegistry;
         $this->stockItemRepository = $stockItemRepository;
         $this->stockConfiguration = $stockConfiguration;
-        $this->request = $request;
-        $this->session = $session;
-        $this->storeManager = $storeManager;
+        $this->attributeHelper = $attributeHelper;
         $this->redirectFactory = $redirectFactory;
         $this->messageManager = $messageManager;
     }
@@ -107,18 +91,19 @@ public function __construct(
      * @param callable $proceed
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundExecute(Save $subject, callable $proceed)
     {
         try {
-            $inventoryData = $this->request->getParam('inventory', []);
-            $storeId = $this->request->getParam('store', \Magento\Store\Model\Store::DEFAULT_STORE_ID);
-            $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
-            $productIds = $this->session->getData('product_ids');
+            /** @var \Magento\Framework\App\RequestInterface $request */
+            $request = $subject->getRequest();
+            $inventoryData = $request->getParam('inventory', []);
             $inventoryData = $this->addConfigSettings($inventoryData);
 
+            $storeId = $this->attributeHelper->getSelectedStoreId();
+            $websiteId = $this->attributeHelper->getStoreWebsiteId($storeId);
+            $productIds = $this->attributeHelper->getProductIds();
+
             if (!empty($inventoryData)) {
                 $this->updateInventoryInProducts($productIds, $websiteId, $inventoryData);
             }
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index f18a5ff1d875a..eb6239ea87ef0 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -7,7 +7,6 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-backend": "*",
         "magento/module-catalog": "*",
         "magento/module-search": "*",
         "magento/module-config": "*",
diff --git a/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php b/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
index b48d6d585492a..37031b4fba4bb 100644
--- a/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
+++ b/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
@@ -20,12 +20,4 @@ interface PoisonPillInterface
      * @return integer
      */
     public function getVersion(): ?int;
-
-    /**
-     * Set version of poison pill.
-     *
-     * @param int $version
-     * @return void
-     */
-    public function setVersion(int $version);
 }
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPill.php b/app/code/Magento/MessageQueue/Model/PoisonPill.php
index ac70034a85da5..ac53a14f19b0c 100644
--- a/app/code/Magento/MessageQueue/Model/PoisonPill.php
+++ b/app/code/Magento/MessageQueue/Model/PoisonPill.php
@@ -21,12 +21,4 @@ public function getVersion(): ?int
     {
         return $this->_getData('version');
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function setVersion(int $version)
-    {
-        $this->setData('version', $version);
-    }
 }

From 9d65684659fce2eb58ead2ec8adc67896fb3e36e Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Mon, 18 Mar 2019 16:04:00 -0500
Subject: [PATCH 0670/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 .../Framework/Lock/Backend/Zookeeper.php      | 25 +++++++++++--------
 .../Lock/Test/Unit/Backend/ZookeeperTest.php  | 12 ++++++++-
 .../Setup/Model/ConfigOptionsList/Lock.php    |  2 +-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index d491678d4d7fc..3b69c8734d9a9 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -84,12 +84,18 @@ class Zookeeper implements LockManagerInterface
      */
     public function __construct(string $host, string $path = self::DEFAULT_PATH)
     {
-        if (empty($path)) {
+        if (!$path) {
             throw new RuntimeException(
                 new Phrase('The path needs to be a non-empty string.')
             );
         }
 
+        if (!$host) {
+            throw new RuntimeException(
+                new Phrase('The host needs to be a non-empty string.')
+            );
+        }
+
         $this->host = $host;
         $this->path = preg_replace('#\/*$#', '', $path) ?: '/';
     }
@@ -221,18 +227,18 @@ private function checkAndCreateParentNode(string $path): bool
      */
     private function getIndex(string $key)
     {
-        if (!preg_match("/[0-9]+$/", $key, $matches))
+        if (!preg_match('/' . $this->lockName . '([0-9]+)$/', $key, $matches))
             return null;
 
-        return intval($matches[0]);
+        return intval($matches[1]);
     }
 
     /**
      * Checks if there is any sequence node under parent of $fullKey.
      * At first checks that the $fullKey node is present, if not - returns false.
      *
-     * If $indexKey is non-null and there is a smaller index that $indexKey then returns true,
-     * if all the nodes are larger than $indexKey then returns false.
+     * If $indexKey is non-null and there is a smaller index than $indexKey then returns true,
+     * otherwise returns false.
      *
      * @param string $fullKey The full path without any sequence info
      * @param int|null $indexKey The index to compare
@@ -249,12 +255,11 @@ private function isAnyLock(string $fullKey, int $indexKey = null): bool
 
         $children = $this->getProvider()->getChildren($parent);
 
-        foreach ($children as $childKey) {
-
-            if (is_null($indexKey)) {
-                return true;
-            }
+        if (is_null($indexKey) && !empty($children)) {
+            return true;
+        }
 
+        foreach ($children as $childKey) {
             $childIndex = $this->getIndex($childKey);
 
             if (is_null($childIndex)) {
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
index 7c450a09df320..62521b9de3082 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
@@ -43,11 +43,21 @@ protected function setUp()
      * @expectedExceptionMessage The path needs to be a non-empty string.
      * @return void
      */
-    public function testConstructionWithException()
+    public function testConstructionWithPathException()
     {
         $this->zookeeperProvider = new ZookeeperProvider($this->host, '');
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage The host needs to be a non-empty string.
+     * @return void
+     */
+    public function testConstructionWithHostException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider('', $this->path);
+    }
+
     /**
      * @return void
      */
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
index ae236c1b5d740..37b5cc38dcbd8 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
@@ -241,7 +241,7 @@ private function validateZookeeperConfig(array $options, DeploymentConfig $deplo
      */
     private function getLockProvider(array $options, DeploymentConfig $deploymentConfig): string
     {
-        if (empty($options[self::INPUT_KEY_LOCK_PROVIDER])) {
+        if (!isset($options[self::INPUT_KEY_LOCK_PROVIDER])) {
             return (string) $deploymentConfig->get(
                 self::CONFIG_PATH_LOCK_PROVIDER,
                 $this->getDefaultValue(self::INPUT_KEY_LOCK_PROVIDER)

From aba95a875f8400cb8e71b62edf22e4d1ec50a742 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Mon, 18 Mar 2019 16:19:09 -0500
Subject: [PATCH 0671/1055] Update test to correspond Magento standards

---
 ...ertMiniShoppingCartSubTotalActionGroup.xml | 25 +++++++++++++++++
 ...oppingCartCheckSummaryTotalActionGroup.xml | 21 --------------
 ...eProductQtyMiniShoppingCartActionGroup.xml | 28 +++++++++++++++++++
 .../Checkout/Test/Mftf/Data/QuoteData.xml     |  1 +
 .../Section/StorefrontMiniCartSection.xml     |  2 ++
 ...eProductFromMiniShoppingCartEntityTest.xml | 27 ++++++------------
 6 files changed, 64 insertions(+), 40 deletions(-)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml
 delete mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/ShoppingCartCheckSummaryTotalActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.xml
new file mode 100644
index 0000000000000..8c5c6f41fffa7
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniShoppingCartSubTotalActionGroup.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="AssertMiniShoppingCartSubTotalActionGroup">
+        <arguments>
+            <argument name="dataQuote" type="entity" />
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad" time="120"/>
+        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabMiniCartTotal" />
+        <assertContains stepKey="assertMiniCartTotal">
+            <actualResult type="variable">$grabMiniCartTotal</actualResult>
+            <expectedResult type="string">{{dataQuote.subtotal}}</expectedResult>
+        </assertContains>
+        <assertContains stepKey="assertMiniCartCurrency">
+            <actualResult type="variable">$grabMiniCartTotal</actualResult>
+            <expectedResult type="string">{{dataQuote.currency}}</expectedResult>
+        </assertContains>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ShoppingCartCheckSummaryTotalActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ShoppingCartCheckSummaryTotalActionGroup.xml
deleted file mode 100644
index 70b4e95124da8..0000000000000
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/ShoppingCartCheckSummaryTotalActionGroup.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.
-  */
--->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="ShoppingCartCheckSummaryTotalActionGroup">
-        <arguments>
-            <argument name="dataQuote" type="entity"/>
-        </arguments>
-        <waitForPageLoad stepKey="waitForPageLoad" time="120"/>
-        <grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabCartTotal" />
-        <assertContains stepKey="assertCartTotal">
-            <actualResult type="variable">$grabCartTotal</actualResult>
-            <expectedResult type="string">{{dataQuote.total}}</expectedResult>
-        </assertContains>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml
new file mode 100644
index 0000000000000..ee8b761a452d4
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontUpdateProductQtyMiniShoppingCartActionGroup.xml
@@ -0,0 +1,28 @@
+<?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="StorefrontUpdateProductQtyMiniShoppingCartActionGroup">
+        <arguments>
+            <argument name="product" type="entity" />
+            <argument name="quote" type="entity" />
+        </arguments>
+
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="goToMiniShoppingCart"/>
+
+        <!-- Clearing QTY field -->
+        <doubleClick selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" stepKey="doubleClickOnQtyInput" />
+        <pressKey selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}" parameterArray="[\WebDriverKeys::DELETE]" stepKey="clearQty"/>
+        <!-- Clearing QTY field -->
+
+        <fillField selector="{{StorefrontMinicartSection.itemQuantityBySku(product.sku)}}"  userInput="{{quote.qty}}" stepKey="changeQty"/>
+        <click selector="{{StorefrontMinicartSection.itemQuantityUpdateBySku(product.sku)}}" stepKey="clickUpdateButton"/>
+        <waitForPageLoad stepKey="waitForProductQtyUpdate" />
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
index be6e1af67fc63..a14ed147aae22 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
@@ -22,5 +22,6 @@
         <data key="shipping">10.00</data>
         <data key="total">1,130.00</data>
         <data key="shippingMethod">Flat Rate - Fixed</data>
+        <data key="currency">$</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
index bdb02835c6276..38c88bf4f80bb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
@@ -25,6 +25,8 @@
         <element name="deleteMiniCartItem" type="button" selector=".action.delete" timeout="30"/>
         <element name="deleteMiniCartItemByName" type="button" selector="//ol[@id='mini-cart']//div[contains(., '{{var}}')]//a[contains(@class, 'delete')]" parameterized="true"/>
         <element name="miniCartSubtotalField" type="text" selector=".block-minicart .amount span.price"/>
+        <element name="itemQuantityBySku" type="input" selector="#minicart-content-wrapper input[data-cart-item-id='{{productSku}}']" parameterized="true"/>
+        <element name="itemQuantityUpdateBySku" type="button" selector="//div[@id='minicart-content-wrapper']//input[@data-cart-item-id='{{productSku}}']/../button[contains(@class, 'update-cart-item')]" parameterized="true"/>
         <element name="itemQuantity" type="input" selector="//a[text()='{{productName}}']/../..//input[contains(@class,'cart-item-qty')]" parameterized="true"/>
         <element name="itemQuantityUpdate" type="button" selector="//a[text()='{{productName}}']/../..//span[text()='Update']" parameterized="true"/>
         <element name="itemDiscount" type="text" selector="//tr[@class='totals']//td[@class='amount']/span"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml
index 451bce9e49a8f..7318f865a0dc1 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/UpdateProductFromMiniShoppingCartEntityTest.xml
@@ -14,7 +14,7 @@
             <title value="Check updating product from mini shopping cart"/>
             <description value="Update Product Qty on Mini Shopping Cart"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-29812"/>
+            <testCaseId value="MC-15068"/>
             <group value="shoppingCart"/>
             <group value="mtf_migrated"/>
         </annotations>
@@ -23,12 +23,9 @@
             <!--Create product according to dataset.-->
             <createData entity="simpleProductWithoutCategory" stepKey="createProduct"/>
 
-            <!-- Go to frontend -->
-            <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="navigateToProductPage"/>
-
             <!--Add product to cart-->
-            <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
-                <argument name="productName" value="$$createProduct.name$$"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="addToCartFromStorefrontProductPage">
+                <argument name="product" value="$$createProduct$$"/>
             </actionGroup>
         </before>
 
@@ -37,21 +34,13 @@
             <deleteData createDataKey="createProduct" stepKey="deleteProduct" />
         </after>
 
-        <!-- Click on mini shopping cart icon -->
-        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="goToMiniShoppingCart"/>
-
-        <!-- Click Edit -->
-        <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="editMiniCartItem"/>
-
-        <!-- Fill data from dataset -->
-        <clearField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="deleteFiled"/>
-        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="{{simpleOrderQty2.qty}}" stepKey="changeQty"/>
-
-        <!-- Click Update -->
-        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="updateQty"/>
+        <actionGroup ref="StorefrontUpdateProductQtyMiniShoppingCartActionGroup" stepKey="updateProductQty">
+            <argument name="product" value="$$createProduct$$" />
+            <argument name="quote" value="simpleOrderQty2" />
+        </actionGroup>
 
         <!-- Perform all assertions -->
-        <actionGroup ref="ShoppingCartCheckSummaryTotalActionGroup" stepKey="checkSummary">
+        <actionGroup ref="AssertMiniShoppingCartSubTotalActionGroup" stepKey="checkSummary">
             <argument name="dataQuote" value="simpleOrderQty2"/>
         </actionGroup>
     </test>

From 1b9a1b46c587166624fe2ec28d7a2dc337799cf4 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Mon, 18 Mar 2019 16:26:01 -0500
Subject: [PATCH 0672/1055] Add test case ids to community contributed tests

---
 .../Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml    | 3 ++-
 .../Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml   | 3 ++-
 .../Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml        | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
index aea1094b4d629..40a731410a899 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingCodeTest.xml
@@ -13,9 +13,10 @@
             <stories value="Create order status"/>
             <title value="Create order status with duplicating code"/>
             <description value="Receive error when creating order status with the code which is already exist"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-15432" />
             <group value="sales"/>
             <group value="mtf_migrated"/>
-            <severity value="AVERAGE"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
index 95582e107da19..d1381bbb1efb0 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusDuplicatingLabelTest.xml
@@ -13,9 +13,10 @@
             <stories value="Create order status"/>
             <title value="Create order status with duplicating label"/>
             <description value="Create an order status and get success message"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-15433" />
             <group value="sales"/>
             <group value="mtf_migrated"/>
-            <severity value="AVERAGE"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
index 6fe25160655fc..c2daaac84dd42 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderStatusTest.xml
@@ -13,9 +13,10 @@
             <stories value="Create custom order status"/>
             <title value="Create custom order status"/>
             <description value="Tests opening admin order status page, create a new order status with success message"/>
+            <testCaseId value="MC-15431" />
+            <severity value="AVERAGE"/>
             <group value="sales"/>
             <group value="mtf_migrated"/>
-            <severity value="AVERAGE"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

From 7dfdd6857d1041008a08822c8528f0b32968a221 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Mon, 18 Mar 2019 16:47:34 -0500
Subject: [PATCH 0673/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

- fixed static tests
---
 app/code/Magento/Config/App/Config/Type/System.php            | 1 +
 .../Framework/View/Test/Unit/Element/Html/LinkTest.php        | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index 8d197bc6ab045..c913716fedee7 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -27,6 +27,7 @@
  * @api
  * @since 100.1.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class System implements ConfigTypeInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
index 96161e12e9773..4c76087bfea12 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View\Test\Unit\Element\Html;
 
 class LinkTest extends \PHPUnit\Framework\TestCase
@@ -108,7 +109,8 @@ public function testGetLinkAttributes()
         }
 
         $this->assertEquals(
-            'href="http://site.com/link.html" shape="shape" tabindex="tabindex" onfocus="onfocus" onblur="onblur" id="id"',
+            'href="http://site.com/link.html" shape="shape" tabindex="tabindex"'
+            . ' onfocus="onfocus" onblur="onblur" id="id"',
             $linkWithoutAttributes->getLinkAttributes()
         );
     }

From d9a5f4aee2cdb6cac39983d6accf52c42fafa653 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Tue, 19 Mar 2019 00:33:52 +0100
Subject: [PATCH 0674/1055] GraphQL-423: Added RateFactory instead of Rate

---
 .../Customer/SetShippingMethodsOnCartTest.php | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 1a39d35005ee0..d2a8be7f12daf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -15,6 +15,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Quote\Model\Quote\Address\Rate;
+use Magento\Quote\Model\Quote\Address\RateFactory;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
@@ -35,9 +36,9 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     private $productRepository;
 
     /**
-     * @var Rate
+     * @var RateFactory
      */
-    private $rate;
+    private $rateFactory;
 
     /**
      * @var QuoteResource
@@ -66,7 +67,7 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
-        $this->rate = $objectManager->get(Rate::class);
+        $this->rateFactory = $objectManager->get(RateFactory::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -88,7 +89,9 @@ public function testShippingMethodWithVirtualProduct()
         $this->quoteResource->load($quote, 'test_order_with_virtual_product', 'reserved_order_id');
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())
@@ -127,7 +130,9 @@ public function testShippingMethodWithSimpleProduct()
         $quote->addProduct($product, 1);
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())
@@ -162,7 +167,9 @@ public function testShippingMethodWithSimpleProductWithoutAddress()
         $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())
@@ -225,7 +232,9 @@ public function testSetNonExistentShippingMethod()
         $quote->addProduct($product, 1);
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())
@@ -269,7 +278,9 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
         $quote->addProduct($product, 1);
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())

From 5aef2fbe5e78efc8390dbceb4da894f49ac72b81 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Mon, 18 Mar 2019 21:03:52 -0500
Subject: [PATCH 0675/1055] Fix unstable selector

---
 .../Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml | 2 +-
 .../Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
index e218f5ae74fc0..2de7bf19fd378 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml
@@ -15,7 +15,7 @@
         <element name="addValue" type="button" selector="//button[contains(@data-action,'add_new_row')]" timeout="30"/>
         <element name="defaultStoreView" type="input" selector="//input[contains(@name,'option[value][option_{{row}}][1]')]" parameterized="true"/>
         <element name="adminOption" type="input" selector="//input[contains(@name,'option[value][option_{{row}}][0]')]" parameterized="true"/>
-        <element name="defaultRadioButton" type="radio" selector="//tr[{{row}}]//input[contains(@name,'default[]')]/..//label" parameterized="true"/>
+        <element name="defaultRadioButton" type="radio" selector="//tr[{{row}}]//input[contains(@name,'default[]')]" parameterized="true"/>
         <element name="isRequired" type="checkbox" selector="//input[contains(@name,'is_required')]/..//label"/>
         <element name="advancedAttributeProperties" type="text" selector="//div[contains(@data-index,'advanced_fieldset')]"/>
         <element name="attributeCode" type="input" selector="//*[@class='admin__fieldset-wrapper-content admin__collapsible-content _show']//input[@name='attribute_code']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
index 4447b27360a80..c58479a7b73e5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -11,6 +11,6 @@
     <section name="StorefrontMessagesSection">
         <element name="success" type="text" selector="div.message-success.success.message"/>
         <element name="error" type="text" selector="div.message-error.error.message"/>
-        <element name="noticeMessage" type="text" selector="//div[@class='message notice']/div"/>
+        <element name="noticeMessage" type="text" selector="div.message.notice div"/>
     </section>
 </sections>

From b030da0d92eeb455b03059807b66a9de29d2a1bf Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Tue, 19 Mar 2019 09:48:02 +0200
Subject: [PATCH 0676/1055] #21734 Error in JS validation rule

---
 app/code/Magento/Catalog/etc/adminhtml/system.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index 7a05601fcd666..1d563244f1432 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -59,7 +59,7 @@
                 <field id="grid_per_page_values" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on Grid Allowed Values</label>
                     <comment>Comma-separated.</comment>
-                    <validate>validate-per-page-value-list</validate>
+                    <validate>validate-per-page-value-list required-entry</validate>
                 </field>
                 <field id="grid_per_page" translate="label comment" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on Grid Default Value</label>
@@ -69,7 +69,7 @@
                 <field id="list_per_page_values" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on List Allowed Values</label>
                     <comment>Comma-separated.</comment>
-                    <validate>validate-per-page-value-list</validate>
+                    <validate>validate-per-page-value-list required-entry</validate>
                 </field>
                 <field id="list_per_page" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on List Default Value</label>

From 9dc5f15c0aa82dd8329005972cf30886e44e8849 Mon Sep 17 00:00:00 2001
From: Michalk39 <michalk9339@gmail.com>
Date: Tue, 19 Mar 2019 09:36:03 +0100
Subject: [PATCH 0677/1055] corrections after review

---
 .../Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml  | 6 ++++++
 .../Test/Mftf/Section/AdminCustomerGroupMainSection.xml    | 2 +-
 .../VerifyDisabledCustomerGroupFieldTest.xml               | 7 +++----
 .../Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)
 rename app/code/Magento/Customer/Test/Mftf/{Section => Test}/VerifyDisabledCustomerGroupFieldTest.xml (74%)

diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
index 6b4f3fc9d6b6e..6d3da9715b905 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
@@ -8,6 +8,12 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="NotLoggedInCustomerGroup" type="customerGroup">
+        <data key="id">0</data>
+        <data key="code">NOT LOGGED IN</data>
+        <data key="tax_class_id">3</data>
+        <data key="tax_class_name">Retail Customer</data>
+    </entity>
     <entity name="GeneralCustomerGroup" type="customerGroup">
         <data key="code">General</data>
         <data key="tax_class_id">3</data>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
index af6ff35988e02..182adeade69fe 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
@@ -15,6 +15,6 @@
         <element name="selectFirstRow" type="button" selector="//button[@class='action-select']"/>
         <element name="deleteBtn" type="button" selector="//*[text()='Delete']"/>
         <element name="clearAllBtn" type="button" selector="//button[text()='Clear all']"/>
-        <element name="selectIdZeroRow" type="button" selector="tr.data-row:nth-child(1) td.data-grid-actions-cell:nth-child(4) > a.action-menu-item" />
+        <element name="editButtonByCustomerGroupCode" type="button" selector="//tr[.//td[count(//th[./*[.='Group']]/preceding-sibling::th) + 1][./*[.='{{code}}']]]//a[contains(@href, '/edit/')]" parametrized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/VerifyDisabledCustomerGroupFieldTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
similarity index 74%
rename from app/code/Magento/Customer/Test/Mftf/Section/VerifyDisabledCustomerGroupFieldTest.xml
rename to app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
index 36a760d90e125..bb17b1b3269b5 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/VerifyDisabledCustomerGroupFieldTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
@@ -29,11 +29,10 @@
         <waitForPageLoad stepKey="waitForCustomerGroupsPageLoad" />
 
         <!-- 3. Select system Customer Group specified in data set from grid -->
-        <click selector="{{AdminCustomerGroupMainSection.selectIdZeroRow}}" stepKey="clickOnEditCustomerGroup" />
+        <click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(NotLoggedInCustomerGroup.code)}}" stepKey="clickOnEditCustomerGroup" />
 
         <!-- 4. Perform all assertions -->
-        <seeInField selector="#customer_group_code" userInput="NOT LOGGED IN" stepKey="seeNotLoggedInTextInGroupName" />
-        <assertElementContainsAttribute selector="#customer_group_code" attribute="disabled" expectedValue="true" stepKey="checkIfGroupNameIsDisabled" />
-
+        <seeInField selector="{{AdminNewCustomerGroupSection.groupName}}" userInput="NOT LOGGED IN" stepKey="seeNotLoggedInTextInGroupName" />
+        <assertElementContainsAttribute selector="{{AdminNewCustomerGroupSection.groupName}}" attribute="disabled" expectedValue="true" stepKey="checkIfGroupNameIsDisabled" />
     </test>
 </tests>
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml
index 70a912a3b5ffe..e88e5161e474e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.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\Customer\Test\TestCase\VerifyDisabledCustomerGroupFieldTest" summary="Check that field is disabled in system Customer Group" ticketId="MAGETWO-52481">
         <variation name="VerifyDisabledCustomerGroupField1" summary="Checks that customer_group_code field is disabled in NOT LOGGED IN Customer Group">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customerGroup/dataset" xsi:type="string">NOT_LOGGED_IN</data>
             <data name="disabledFields" xsi:type="array">
                 <item name="0" xsi:type="string">customer_group_code</item>

From 3d049d6b3d8af849caba0ce9a0b64daa18433a6e Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Tue, 19 Mar 2019 10:37:55 +0200
Subject: [PATCH 0678/1055] Add anotation and change additional caches selector
 parametrized

---
 .../Test/Mftf/Section/AdminCacheManagementSection.xml         | 2 +-
 .../Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
index 12d35df42bcc5..ee0c32633569a 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
@@ -30,6 +30,6 @@
         <element name="pageCacheCheckbox" type="checkbox" selector="input[value='full_page']"/>
         <element name="webServicesConfigCheckbox" type="checkbox" selector="input[value='config_webservice']"/>
         <element name="translationsCheckbox" type="checkbox" selector="input[value='translate']"/>
-        <element name="FlushStaticFilesCache" type="button" selector="//*[@id='container']//button[contains(., 'Flush Static Files Cache')]"/>
+        <element name="additionalCacheButton" type="button" selector="//*[@id='container']//button[contains(., '{{cacheType}}')]" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
index 6cd280bb7add3..4a74a62c947fd 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
@@ -15,6 +15,8 @@
             <description value="Flush Static Files Cache button visibility"/>
             <severity value="MAJOR"/>
             <stories value="Check flush static files cache button"/>
+            <group value="production_mode_only"/>
+            <group value="pagecache"/>
             <group value="mtf_migrated"/>
         </annotations>
         <before>
@@ -27,6 +29,6 @@
         <waitForPageLoad stepKey="waitForPageCacheManagementLoad"/>
 
         <!-- Check 'Flush Static Files Cache' not visible in production mode. -->
-        <dontSee selector="{{AdminCacheManagementSection.FlushStaticFilesCache}}" stepKey="seeFlushStaticFilesButton" />
+        <dontSee selector="{{AdminCacheManagementSection.additionalCacheButton('Flush Static Files Cache')}}" stepKey="dontSeeFlushStaticFilesButton" />
     </test>
 </tests>

From 6c0c2fa0b41fce525cec017645454df64b52ac52 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Tue, 19 Mar 2019 09:51:28 +0000
Subject: [PATCH 0679/1055] Ignore PHPMD Else Expression warnings

---
 app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
index 084da345a12d4..dd2c62174a734 100644
--- a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
@@ -48,6 +48,7 @@ public function __construct(
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ElseExpression)
      */
     public function getOptionsJson()
     {
@@ -111,6 +112,7 @@ public function getOptionsJson()
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ElseExpression)
      */
     public function getFSOptionsJson()
     {

From ae6c8bcff2d8203f7e9b36dad790a90047827b84 Mon Sep 17 00:00:00 2001
From: vbmagento <vaibhavbhalerao.15@gmail.com>
Date: Tue, 19 Mar 2019 10:58:24 +0000
Subject: [PATCH 0680/1055] Add argument to show filter text in URL rewrite
 grid after click on back button

---
 .../view/adminhtml/layout/adminhtml_url_rewrite_index.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
index 7d8151d270308..10f73829ada2c 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
@@ -14,6 +14,7 @@
                         <argument name="id" xsi:type="string">urlrewriteGrid</argument>
                         <argument name="dataSource" xsi:type="object">Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection</argument>
                         <argument name="default_sort" xsi:type="string">url_rewrite_id</argument>
+						<argument name="save_parameters_in_session" xsi:type="string">1</argument>
                     </arguments>
                     <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.url_rewrite.grid.columnSet">
                         <arguments>

From eb95a3ffa41efa9739d39e9a8309b69ad1e91878 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 19 Mar 2019 13:24:16 +0200
Subject: [PATCH 0681/1055] Reader integration test refactor. Dependency on
 actual config removed.

---
 .../Config/Structure/Reader/ConverterStub.php |   14 +-
 .../Config/Structure/Reader/ReaderStub.php    |   12 +-
 .../Config/Structure/Reader/ReaderTest.php    |  146 +
 .../Structure/Reader/_files}/config.xml       |    0
 .../Config/Structure/Reader/ReaderTest.php    |  135 -
 .../Reader/_files/expected/config.xml         | 2626 -----------------
 6 files changed, 165 insertions(+), 2768 deletions(-)
 rename dev/tests/integration/testsuite/Magento/{Paypal => Config}/Model/Config/Structure/Reader/ConverterStub.php (63%)
 rename dev/tests/integration/testsuite/Magento/{Paypal => Config}/Model/Config/Structure/Reader/ReaderStub.php (53%)
 create mode 100644 dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php
 rename dev/tests/integration/testsuite/Magento/{Paypal/Model/Config/Structure/Reader/_files/actual => Config/Model/Config/Structure/Reader/_files}/config.xml (100%)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml

diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php
similarity index 63%
rename from dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php
index 223ef35c0dcd3..7493d31f02b31 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php
@@ -3,14 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Paypal\Model\Config\Structure\Reader;
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Structure\Reader;
+
+use Magento\Config\Model\Config\Structure\Converter;
 
 /**
- * Class ConverterStub
+ * Class ConverterStub used for ReaderTest.
  */
-class ConverterStub extends \Magento\Config\Model\Config\Structure\Converter
+class ConverterStub extends Converter
 {
     /**
+     * Convert dom document wrapper.
+     *
      * @param \DOMDocument $document
      * @return array|null
      */
@@ -20,7 +26,7 @@ public function getArrayData(\DOMDocument $document)
     }
 
     /**
-     * Convert dom document
+     * Convert dom document.
      *
      * @param \DOMNode $source
      * @return array
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php
similarity index 53%
rename from dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php
index ed1366ad737f9..866ff91678ec4 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php
@@ -3,14 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Paypal\Model\Config\Structure\Reader;
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Structure\Reader;
+
+use Magento\Config\Model\Config\Structure\Reader;
 
 /**
- * Class ReaderStub
+ * Class ReaderStub used for testing protected Reader::_readFiles() method.
  */
-class ReaderStub extends \Magento\Config\Model\Config\Structure\Reader
+class ReaderStub extends Reader
 {
     /**
+     * Wrapper for protected Reader::_readFiles() method.
+     *
      * @param array $fileList
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php
new file mode 100644
index 0000000000000..eef8e68458d91
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Structure\Reader;
+
+use Magento\Config\Model\Config\SchemaLocator;
+use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Config\Dom;
+use Magento\Framework\Config\FileResolverInterface;
+use Magento\Framework\Config\ValidationStateInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class ReaderTest check Magento\Config\Model\Config\Structure\Reader::_readFiles() method.
+ */
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test config location.
+     *
+     * @string
+     */
+    const CONFIG = '/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Files
+     */
+    private $fileUtility;
+
+    /**
+     * @var ValidationStateInterface
+     */
+    private $validationStateMock;
+
+    /**
+     * @var \Magento\Framework\Config\SchemaLocatorInterface
+     */
+    private $schemaLocatorMock;
+
+    /**
+     * @var FileResolverInterface
+     */
+    private $fileResolverMock;
+
+    /**
+     * @var ReaderStub
+     */
+    private $reader;
+
+    /**
+     * @var ConverterStub
+     */
+    private $converter;
+
+    /**
+     * @var CompilerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $compiler;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->fileUtility = Files::init();
+
+        $this->validationStateMock = $this->getMockBuilder(ValidationStateInterface::class)
+            ->setMethods(['isValidationRequired'])
+            ->getMockForAbstractClass();
+        $this->schemaLocatorMock = $this->getMockBuilder(SchemaLocator::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPerFileSchema'])
+            ->getMock();
+        $this->fileResolverMock = $this->getMockBuilder(FileResolverInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->validationStateMock->expects($this->atLeastOnce())
+            ->method('isValidationRequired')
+            ->willReturn(false);
+        $this->schemaLocatorMock->expects($this->atLeastOnce())
+            ->method('getPerFileSchema')
+            ->willReturn(false);
+
+        $this->converter = $this->objectManager->create(ConverterStub::class);
+
+        //Isolate test from actual configuration, and leave only sample data.
+        $this->compiler = $this->getMockBuilder(CompilerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['compile'])
+            ->getMockForAbstractClass();
+
+        $this->reader = $this->objectManager->create(
+            ReaderStub::class,
+            [
+                'fileResolver' => $this->fileResolverMock,
+                'converter' => $this->converter,
+                'schemaLocator' => $this->schemaLocatorMock,
+                'validationState' => $this->validationStateMock,
+                'fileName' => 'no_existing_file.xml',
+                'compiler' => $this->compiler,
+                'domDocumentClass' => Dom::class
+            ]
+        );
+    }
+
+    /**
+     * The test checks the file structure after processing the nodes responsible for inserting content.
+     *
+     * @return void
+     */
+    public function testXmlConvertedConfigurationAndCompereStructure()
+    {
+        $actual = $this->reader->readFiles(['actual' => $this->getContent()]);
+
+        $document = new \DOMDocument();
+        $document->loadXML($this->getContent());
+
+        $expected = $this->converter->getArrayData($document);
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Get config sample data for test.
+     *
+     * @return string
+     */
+    protected function getContent()
+    {
+        $files = $this->fileUtility->getFiles([BP . static::CONFIG], 'config.xml');
+
+        return file_get_contents(reset($files));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php
deleted file mode 100644
index 6b966a045c982..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Paypal\Model\Config\Structure\Reader;
-
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Class ReaderTest
- */
-class ReaderTest extends \PHPUnit\Framework\TestCase
-{
-    const EXPECTED = '/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected';
-
-    const ACTUAL = '/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual';
-
-    /**
-     * @var ObjectManagerInterface
-     */
-    protected $objectManager;
-
-    /**
-     * @var \Magento\Framework\App\Utility\Files
-     */
-    protected $fileUtility;
-
-    /**
-     * @var \Magento\Framework\Config\ValidationStateInterface
-     */
-    protected $validationStateMock;
-
-    /**
-     * @var \Magento\Framework\Config\SchemaLocatorInterface
-     */
-    protected $schemaLocatorMock;
-
-    /**
-     * @var \Magento\Framework\Config\FileResolverInterface
-     */
-    protected $fileResolverMock;
-
-    /**
-     * @var \Magento\Paypal\Model\Config\Structure\Reader\ReaderStub
-     */
-    protected $reader;
-
-    /**
-     * @var \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub
-     */
-    protected $converter;
-
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->fileUtility = \Magento\Framework\App\Utility\Files::init();
-
-        $this->validationStateMock = $this->getMockBuilder(\Magento\Framework\Config\ValidationStateInterface::class)
-            ->setMethods(['isValidationRequired'])
-            ->getMockForAbstractClass();
-        $this->schemaLocatorMock = $this->getMockBuilder(\Magento\Config\Model\Config\SchemaLocator::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getPerFileSchema'])
-            ->getMock();
-        $this->fileResolverMock = $this->getMockBuilder(\Magento\Framework\Config\FileResolverInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->validationStateMock->expects($this->atLeastOnce())
-            ->method('isValidationRequired')
-            ->willReturn(false);
-        $this->schemaLocatorMock->expects($this->atLeastOnce())
-            ->method('getPerFileSchema')
-            ->willReturn(false);
-
-        /** @var \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub $converter */
-        $this->converter = $this->objectManager->create(
-            \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub::class
-        );
-
-        $this->reader = $this->objectManager->create(
-            \Magento\Paypal\Model\Config\Structure\Reader\ReaderStub::class,
-            [
-                'fileResolver' => $this->fileResolverMock,
-                'converter' => $this->converter,
-                'schemaLocator' => $this->schemaLocatorMock,
-                'validationState' => $this->validationStateMock,
-                'fileName' => 'no_existing_file.xml',
-                'domDocumentClass' => \Magento\Framework\Config\Dom::class
-            ]
-        );
-    }
-
-    /**
-     *  The test checks the file structure after processing the nodes responsible for inserting content
-     *
-     * @return void
-     */
-    public function testXmlConvertedConfigurationAndCompereStructure()
-    {
-        $actual = $this->reader->readFiles(['actual' => $this->getActualContent()]);
-
-        $document = new \DOMDocument();
-        $document->loadXML($this->getExpectedContent());
-
-        $expected = $this->converter->getArrayData($document);
-
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * @return string
-     */
-    protected function getActualContent()
-    {
-        $files = $this->fileUtility->getFiles([BP . static::ACTUAL], 'config.xml');
-
-        return file_get_contents(reset($files));
-    }
-
-    /**
-     * @return string
-     */
-    protected function getExpectedContent()
-    {
-        $files = $this->fileUtility->getFiles([BP . static::EXPECTED], 'config.xml');
-
-        return file_get_contents(reset($files));
-    }
-}
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
deleted file mode 100644
index 222b9974177de..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ /dev/null
@@ -1,2626 +0,0 @@
-<?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_Config:etc/system_file.xsd">
-    <system>
-        <section id="payment">
-            <group id="account" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
-                <label>Merchant Location</label>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Merchant Country</label>
-                    <comment>If not specified, Default Country from General Config will be used</comment>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Country</frontend_model>
-                    <source_model>Magento\Paypal\Model\System\Config\Source\MerchantCountry</source_model>
-                    <backend_model>Magento\Paypal\Model\System\Config\Backend\MerchantCountry</backend_model>
-                    <config_path>paypal/general/merchant_country</config_path>
-                </field>
-            </group>
-            <group id="recommended_solutions" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Recommended Solutions:</label>
-                <fieldset_css>paypal-top-section paypal-recommended-header</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-            </group>
-            <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Other PayPal Payment Solutions:</label>
-                <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
-                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            </group>
-            <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Other Payment Methods:</label>
-                <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
-                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            </group>
-        </section>
-        <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payflowpro" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-                <label>Payflow Pro</label>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <fieldset_css>paypal-other-section</fieldset_css>
-                <comment><![CDATA[Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
-                <attribute type="activity_path">payment/payflowpro/active</attribute>
-                <attribute type="paypal_ec_separate">1</attribute>
-                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html</comment>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                </group>
-                <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                    <label>Required PayPal Settings</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <group id="paypal_payflow_api_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Payflow Pro</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="partner" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Partner</label>
-                            <config_path>payment/payflowpro/partner</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="user" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>User</label>
-                            <config_path>payment/payflowpro/user</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="vendor" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>Vendor</label>
-                            <config_path>payment/payflowpro/vendor</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="pwd" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>Password</label>
-                            <config_path>payment/payflowpro/pwd</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sandbox_flag" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                            <label>Test Mode</label>
-                            <config_path>payment/payflowpro/sandbox_flag</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                            <label>Use Proxy</label>
-                            <config_path>payment/payflowpro/use_proxy</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_host" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Host</label>
-                            <config_path>payment/payflowpro/proxy_host</config_path>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Port</label>
-                            <config_path>payment/payflowpro/proxy_port</config_path>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                    </group>
-                    <field id="enable_paypal_payflow" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                        <label>Enable this Solution</label>
-                        <config_path>payment/payflowpro/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        <requires>
-                            <group id="paypal_payflow_api_settings"/>
-                        </requires>
-                    </field>
-                    <field id="payflowpro_cc_vault_active" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
-                        <label>Vault Enabled</label>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <config_path>payment/payflowpro_cc_vault/active</config_path>
-                        <attribute type="shared">1</attribute>
-                        <requires>
-                            <group id="paypal_payflow_api_settings"/>
-                        </requires>
-                    </field>
-                </group>
-                <group id="settings_paypal_payflow" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                    <label>Basic Settings - PayPal Payflow Pro</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Title</label>
-                        <comment>It is recommended to set this value to "Debit or Credit Card" per store views.</comment>
-                        <config_path>payment/payflowpro/title</config_path>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="payflowpro_cc_vault_title" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
-                        <label>Vault Title</label>
-                        <config_path>payment/payflowpro_cc_vault/title</config_path>
-                    </field>
-                    <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Sort Order</label>
-                        <config_path>payment/payflowpro/sort_order</config_path>
-                        <frontend_class>validate-number</frontend_class>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                        <label>Payment Action</label>
-                        <config_path>payment/payflowpro/payment_action</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="heading_cc" translate="label" sortOrder="40" showInDefault="1" showInWebsite="1">
-                        <label>Credit Card Settings</label>
-                        <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="cctypes" translate="label comment" type="multiselect" sortOrder="50" showInDefault="1" showInWebsite="1">
-                        <label>Allowed Credit Card Types</label>
-                        <comment>
-                            <![CDATA[Supporting of American Express cards require additional agreement. Learn more at <a href="http://www.paypal.com/amexupdate">http://www.paypal.com/amexupdate</a>.]]>
-                        </comment>
-                        <config_path>payment/payflowpro/cctypes</config_path>
-                        <source_model>Magento\Paypal\Model\Config::getPayflowproCcTypesAsOptionArray</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <group id="settings_paypal_payflow_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
-                        <label>Advanced Settings</label>
-                        <fieldset_css>config-advanced</fieldset_css>
-                        <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                            <label>Payment Applicable From</label>
-                            <config_path>payment/payflowpro/allowspecific</config_path>
-                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Countries Payment Applicable From</label>
-                            <config_path>payment/payflowpro/specificcountry</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                            <depends>
-                                <field id="allowspecific">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Debug Mode</label>
-                            <config_path>payment/payflowpro/debug</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                            <label>Enable SSL verification</label>
-                            <config_path>payment/payflowpro/verify_peer</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="useccv" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>Require CVV Entry</label>
-                            <config_path>payment/payflowpro/useccv</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="paypal_payflow_avs_check" translate="label" showInDefault="1" showInWebsite="1" sortOrder="80">
-                            <label>CVV and AVS Settings</label>
-                            <field id="heading_avs_settings" translate="label" sortOrder="0" showInDefault="1" showInWebsite="1">
-                                <label>Reject Transaction if:</label>
-                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="avs_street" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1">
-                                <label>AVS Street Does Not Match</label>
-                                <config_path>payment/payflowpro/avs_street</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="avs_zip" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1">
-                                <label>AVS Zip Does Not Match</label>
-                                <config_path>payment/payflowpro/avs_zip</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="avs_international" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1">
-                                <label>Card Issuer Is Outside The United States</label>
-                                <config_path>payment/payflowpro/avs_international</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="avs_security_code" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1">
-                                <label>Card Security Code Does Not Match</label>
-                                <config_path>payment/payflowpro/avs_security_code</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">0</attribute>
-                            </field>
-                        </group>
-                        <group id="paypal_payflow_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="90">
-                            <label>Settlement Report Settings</label>
-                            <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
-                            <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login"/>
-                            <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password"/>
-                            <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox"/>
-                            <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip"/>
-                            <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path"/>
-                            <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule"/>
-                            <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active"/>
-                            <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule"/>
-                            <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time"/>
-                        </group>
-                    </group>
-                </group>
-            </group>
-            <group id="payflow_link" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                <label>Payflow Link</label>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <fieldset_css>paypal-other-section</fieldset_css>
-                <comment><![CDATA[Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
-                <attribute type="activity_path">payment/payflow_link/active</attribute>
-                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html</comment>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                </group>
-                <group id="payflow_link_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                    <label>Required PayPal Settings</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <group id="payflow_link_payflow_link" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Payflow Link and Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account" translate="label" sortOrder="5">
-                            <frontend_class>not-required</frontend_class>
-                            <label>Email Associated with PayPal Merchant Account (Optional)</label>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="partner" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1">
-                            <label>Partner</label>
-                            <config_path>payment/payflow_link/partner</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="vendor" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Vendor</label>
-                            <config_path>payment/payflow_link/vendor</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="user" translate="label comment" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>User</label>
-                            <comment>If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.</comment>
-                            <config_path>payment/payflow_link/user</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="pwd" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>Password</label>
-                            <config_path>payment/payflow_link/pwd</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sandbox_flag" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>Test Mode</label>
-                            <config_path>payment/payflow_link/sandbox_flag</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="use_proxy" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                            <label>Use Proxy</label>
-                            <config_path>payment/payflow_link/use_proxy</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_host" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Host</label>
-                            <config_path>payment/payflow_link/proxy_host</config_path>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_port" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Port</label>
-                            <config_path>payment/payflow_link/proxy_port</config_path>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="payflowlink_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info</frontend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                    </group>
-
-
-
-                    <field id="enable_payflow_link" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                        <label>Enable Payflow Link</label>
-                        <config_path>payment/payflow_link/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        <requires>
-                            <group id="payflow_link_payflow_link"/>
-                        </requires>
-                    </field>
-                    <field id="enable_express_checkout_basic" translate="label" type="select" sortOrder="40">
-                        <label>Enable Express Checkout</label>
-                        <config_path>payment/payflow_express/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Express</frontend_model>
-                    </field>
-                    <field id="enable_express_checkout" extends="payment_all_paypal/payflow_link/payflow_link_required/enable_express_checkout_basic" showInDefault="1" showInWebsite="1">
-                        <requires>
-                            <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" 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>]]>
-                        </comment>
-                        <config_path>payment/payflow_express_bml/active</config_path>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
-                        <requires>
-                            <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" 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>
-                            <field id="enable_express_checkout_bml">1</field>
-                        </depends>
-                    </field>
-
-
-
-                    <group id="payflow_link_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="60">
-                        <label>Advertise PayPal Credit</label>
-                        <comment>
-                            <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                        <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                        from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                        Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                        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>.]]>
-                        </comment>
-                        <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
-                        <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
-                        <group id="payflow_link_settings_bml_homepage"  translate="label" showInWebsite="1" sortOrder="20" showInDefault="1" showInStore="1">
-                            <label>Home Page</label>
-                            <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
-                            <field id="payflow_link_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
-                            <field id="payflow_link_bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_homepage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="payflow_link_bml_homepage_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_homepage/payflow_link_bml_homepage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                <depends>
-                                    <field id="payflow_link_bml_homepage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="payflow_link_settings_bml_categorypage"  translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Catalog Category Page</label>
-                            <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
-                            <field id="payflow_link_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position" />
-                            <field id="payflow_link_bml_categorypage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_categorypage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="payflow_link_bml_categorypage_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_categorypage/payflow_link_bml_categorypage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                <depends>
-                                    <field id="payflow_link_bml_categorypage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="payflow_link_settings_bml_productpage"  translate="label" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="50">
-                            <label>Catalog Product Page</label>
-                            <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
-                            <field id="payflow_link_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
-                            <field id="payflow_link_bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_productpage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="payflow_link_bml_productpage_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_productpage/payflow_link_bml_productpage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                <depends>
-                                    <field id="payflow_link_bml_productpage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="payflow_link_settings_bml_checkout"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
-                            <label>Checkout Cart Page</label>
-                            <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display" />
-                            <field id="payflow_link_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position" />
-                            <field id="payflow_link_bml_checkout_size1" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_checkout_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="payflow_link_bml_checkout_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_checkout/payflow_link_bml_checkout_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_checkout_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                    </group>
-                </group>
-                <group id="settings_payflow_link" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                    <label>Basic Settings - PayPal Payflow Link</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Title</label>
-                        <comment>It is recommended to set this value to "Debit or Credit Card" per store views.</comment>
-                        <config_path>payment/payflow_link/title</config_path>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Sort Order</label>
-                        <config_path>payment/payflow_link/sort_order</config_path>
-                        <frontend_class>validate-number</frontend_class>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                        <label>Payment Action</label>
-                        <config_path>payment/payflow_link/payment_action</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <group id="settings_payflow_link_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                        <label>Advanced Settings</label>
-                        <fieldset_css>config-advanced</fieldset_css>
-                        <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                            <label>Payment Applicable From</label>
-                            <config_path>payment/payflow_link/allowspecific</config_path>
-                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Countries Payment Applicable From</label>
-                            <config_path>payment/payflow_link/specificcountry</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                            <depends>
-                                <field id="allowspecific">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Debug Mode</label>
-                            <config_path>payment/payflow_link/debug</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                            <label>Enable SSL verification</label>
-                            <config_path>payment/payflow_link/verify_peer</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="csc_editable" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>CVV Entry is Editable</label>
-                            <config_path>payment/payflow_link/csc_editable</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="csc_required" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>Require CVV Entry</label>
-                            <config_path>payment/payflow_link/csc_required</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <depends>
-                                <field id="csc_editable">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="email_confirmation" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                            <label>Send Email Confirmation</label>
-                            <config_path>payment/payflow_link/email_confirmation</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="url_method" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                            <label>URL method for Cancel URL and Return URL</label>
-                            <config_path>payment/payflow_link/url_method</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\UrlMethod</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="payflow_link_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="80">
-                            <label>Settlement Report Settings</label>
-                            <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
-                            <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login"/>
-                            <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password"/>
-                            <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox"/>
-                            <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip"/>
-                            <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path"/>
-                            <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule"/>
-                            <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active"/>
-                            <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule"/>
-                            <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time"/>
-                        </group>
-                        <group id="payflow_link_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
-                            <label>Frontend Experience Settings</label>
-                            <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo"/>
-                            <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages"/>
-                            <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style"/>
-                            <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg"/>
-                            <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor"/>
-                            <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor"/>
-                            <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor"/>
-                        </group>
-                    </group>
-                </group>
-                <group id="settings_payflow_link_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                    <label>Basic Settings - PayPal Express Checkout</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/title" />
-                    <field id="sort_order" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/sort_order" />
-                    <field id="payment_action" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/payment_action" />
-                    <field id="visible_on_product" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/visible_on_product" />
-                    <group id="settings_payflow_link_express_checkout_advanced" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/paypal_payflow_express_checkout_advanced"/>
-                </group>
-            </group>
-            <group id="express_checkout" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
-                <label>Express Checkout</label>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <fieldset_css>paypal-other-section</fieldset_css>
-                <comment>Add PayPal as an additional payment method to your checkout page.</comment>
-                <attribute type="activity_path">payment/paypal_express/active</attribute>
-                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html</comment>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                </group>
-                <group id="express_checkout_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                    <label>Required PayPal Settings</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <group id="express_checkout_required_express_checkout" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
-                            <label>Email Associated with PayPal Merchant Account (Optional)</label>
-                            <frontend_class>not-required</frontend_class>
-                            <comment>
-                                <![CDATA[<a href="http://www.magentocommerce.com/paypal">Start accepting payments via PayPal!</a>]]>
-                            </comment>
-                            <tooltip>Don't have a PayPal account? Simply enter your email address.</tooltip>
-                            <config_path>paypal/general/business_account</config_path>
-                            <validate>validate-email</validate>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="api_authentication" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>API Authentication Methods</label>
-                            <config_path>paypal/wpp/api_authentication</config_path>
-                            <source_model>Magento\Paypal\Model\Config::getApiAuthenticationMethods</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="api_username" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>API Username</label>
-                            <config_path>paypal/wpp/api_username</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="api_password" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>API Password</label>
-                            <config_path>paypal/wpp/api_password</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="api_signature" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>API Signature</label>
-                            <config_path>paypal/wpp/api_signature</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="api_authentication">0</field>
-                            </depends>
-                        </field>
-                        <field id="api_cert" translate="label" type="file" sortOrder="60" showInDefault="1" showInWebsite="1">
-                            <label>API Certificate</label>
-                            <config_path>paypal/wpp/api_cert</config_path>
-                            <backend_model>Magento\Paypal\Model\System\Config\Backend\Cert</backend_model>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="api_authentication">1</field>
-                            </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]]>
-                            </attribute>
-
-                            <attribute type="sandbox_button_label">Sandbox Credentials</attribute>
-                            <attribute type="sandbox_button_url">
-                                <![CDATA[https://www.sandbox.paypal.com/webapps/merchantboarding/webflow/externalpartnerflow]]>
-                            </attribute>
-
-                            <!-- partnerId -->
-                            <attribute type="partner_id">NB9WWHYEMVUMS</attribute>
-                            <!-- partnerLogoUrl -->
-                            <attribute type="partner_logo_url">Magento_Backend/web/images/logo-magento.png</attribute>
-                            <!-- receiveCredentials -->
-                            <attribute type="receive_credentials">FALSE</attribute>
-                            <!-- showPermissions -->
-                            <attribute type="show_permissions">FALSE</attribute>
-                            <!-- displayMode -->
-                            <attribute type="display_mode">embedded</attribute>
-                            <!-- productIntentID -->
-                            <attribute type="product_intent_id">pp_express</attribute>
-
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\ApiWizard</frontend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sandbox_flag" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
-                            <label>Sandbox Mode</label>
-                            <config_path>paypal/wpp/sandbox_flag</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="use_proxy" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
-                            <label>API Uses Proxy</label>
-                            <config_path>paypal/wpp/use_proxy</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_host" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Host</label>
-                            <config_path>paypal/wpp/proxy_host</config_path>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                        </field>
-                        <field id="proxy_port" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Port</label>
-                            <config_path>paypal/wpp/proxy_port</config_path>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                        </field>
-                    </group>
-                    <field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                        <label>Enable this Solution</label>
-                        <config_path>payment/paypal_express/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        <requires>
-                            <group id="express_checkout_required_express_checkout"/>
-                        </requires>
-                    </field>
-                    <field id="enable_in_context_checkout" translate="label comment" type="select" sortOrder="21" showInDefault="1" showInWebsite="1">
-                        <label>Enable In-Context Checkout Experience</label>
-                        <comment>
-                            <![CDATA[See PayPal Feature Support details and list of supported regions
-                    <a href="https://developer.paypal.com/docs/classic/express-checkout/in-context/" target="_blank">here</a>.]]>
-                        </comment>
-                        <config_path>payment/paypal_express/in_context</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\InContextApi</frontend_model>
-                        <requires>
-                            <field id="enable_express_checkout"/>
-                        </requires>
-                    </field>
-                    <field id="merchant_id" translate="label" type="text" sortOrder="22" showInDefault="1" showInWebsite="1">
-                        <label>Merchant Account ID</label>
-                        <tooltip>You can look up your merchant ID by logging into https://www.paypal.com/. Click the profile icon on the top right side of the page and then select Profile and settings in the Business Profile menu. (If you do not see the profile icon at the top of the page, click Profile, which appears in the top menu when the My Account tab is selected.) Click My business info on the left, and the Merchant account ID is displayed in the list of profile items on the right.</tooltip>
-                        <config_path>payment/paypal_express/merchant_id</config_path>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\MerchantId</frontend_model>
-                        <depends>
-                            <field id="enable_in_context_checkout">1</field>
-                        </depends>
-                        <validate>required-entry</validate>
-                    </field>
-                    <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>
-                        <attribute type="shared">1</attribute>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlApiSortOrder</frontend_model>
-                        <depends>
-                            <field id="enable_express_checkout_bml">1</field>
-                        </depends>
-                    </field>
-                    <group id="advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="30">
-                        <label>Advertise PayPal Credit</label>
-                        <comment>
-                            <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                        <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                        from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                        Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                        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>.]]>
-                        </comment>
-                        <field id="bml_publisher_id" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="10">
-                            <label>Publisher ID</label>
-                            <comment><![CDATA[Required to display a banner]]></comment>
-                            <config_path>payment/paypal_express_bml/publisher_id</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="bml_wizard" translate="button_label" sortOrder="15" showInDefault="1" showInWebsite="1">
-                            <button_label>Get Publisher ID from PayPal</button_label>
-                            <button_url><![CDATA[https://financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard</frontend_model>
-                        </field>
-                        <group id="settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                            <label>Home Page</label>
-                            <field id="bml_homepage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
-                                <label>Display</label>
-                                <config_path>payment/paypal_express_bml/homepage_display</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_homepage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
-                                <label>Position</label>
-                                <config_path>payment/paypal_express_bml/homepage_position</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsHP</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="bml_homepage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="bml_homepage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                <depends>
-                                    <field id="bml_homepage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="settings_bml_categorypage" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Catalog Category Page</label>
-                            <field id="bml_categorypage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
-                                <label>Display</label>
-                                <config_path>payment/paypal_express_bml/categorypage_display</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_categorypage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
-                                <label>Position</label>
-                                <config_path>payment/paypal_express_bml/categorypage_position</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCCP</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_categorypage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends><field id="bml_categorypage_position">0</field></depends>
-                            </field>
-                            <field id="bml_categorypage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                <depends><field id="bml_categorypage_position">1</field></depends>
-                            </field>
-                        </group>
-                        <group id="settings_bml_productpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                            <label>Catalog Product Page</label>
-                            <field id="bml_productpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
-                                <label>Display</label>
-                                <config_path>payment/paypal_express_bml/productpage_display</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_productpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
-                                <label>Position</label>
-                                <config_path>payment/paypal_express_bml/productpage_position</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCPP</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends><field id="bml_productpage_position">0</field></depends>
-                            </field>
-                            <field id="bml_productpage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                <depends><field id="bml_productpage_position">1</field></depends>
-                            </field>
-                        </group>
-                        <group id="settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-                            <label>Checkout Cart Page</label>
-                            <field id="bml_checkout_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
-                                <label>Display</label>
-                                <config_path>payment/paypal_express_bml/checkout_display</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_checkout_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
-                                <label>Position</label>
-                                <config_path>payment/paypal_express_bml/checkout_position</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCheckout</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends><field id="bml_checkout_position">0</field></depends>
-                            </field>
-                            <field id="bml_checkout_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends><field id="bml_checkout_position">1</field></depends>
-                            </field>
-                        </group>
-                    </group>
-                </group>
-                <group id="settings_ec" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                    <label>Basic Settings - PayPal Express Checkout</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Title</label>
-                        <comment>It is recommended to set this value to "PayPal" per store views.</comment>
-                        <config_path>payment/paypal_express/title</config_path>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Sort Order</label>
-                        <config_path>payment/paypal_express/sort_order</config_path>
-                        <frontend_class>validate-number</frontend_class>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                        <label>Payment Action</label>
-                        <config_path>payment/paypal_express/payment_action</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions\Express</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="visible_on_product" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Display on Product Details Page</label>
-                        <config_path>payment/paypal_express/visible_on_product</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="authorization_honor_period" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
-                        <label>Authorization Honor Period (days)</label>
-                        <comment>Specifies what the Authorization Honor Period is on the merchant&#8217;s PayPal account. It must mirror the setting in PayPal.</comment>
-                        <config_path>payment/paypal_express/authorization_honor_period</config_path>
-                        <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="payment_action">Order</field>
-                        </depends>
-                    </field>
-                    <field id="order_valid_period" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
-                        <label>Order Valid Period (days)</label>
-                        <comment>Specifies what the Order Valid Period is on the merchant&#x2019;s PayPal account. It must mirror the setting in PayPal.</comment>
-                        <config_path>payment/paypal_express/order_valid_period</config_path>
-                        <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="payment_action">Order</field>
-                        </depends>
-                    </field>
-                    <field id="child_authorization_number" translate="label comment" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
-                        <label>Number of Child Authorizations</label>
-                        <comment>The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.</comment>
-                        <config_path>payment/paypal_express/child_authorization_number</config_path>
-                        <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="payment_action">Order</field>
-                        </depends>
-                    </field>
-                    <group id="settings_ec_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
-                        <label>Advanced Settings</label>
-                        <fieldset_css>config-advanced</fieldset_css>
-                        <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Display on Shopping Cart</label>
-                            <config_path>payment/paypal_express/visible_on_cart</config_path>
-                            <comment>Also affects mini-shopping cart.</comment>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\Yesnoshortcut</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                            <label>Payment Applicable From</label>
-                            <config_path>payment/paypal_express/allowspecific</config_path>
-                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Countries Payment Applicable From</label>
-                            <config_path>payment/paypal_express/specificcountry</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="allowspecific">1</field>
-                            </depends>
-                        </field>
-                        <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Debug Mode</label>
-                            <config_path>payment/paypal_express/debug</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                            <label>Enable SSL verification</label>
-                            <config_path>payment/paypal_express/verify_peer</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>Transfer Cart Line Items</label>
-                            <config_path>payment/paypal_express/line_items_enabled</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="transfer_shipping_options" translate="label tooltip comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>Transfer Shipping Options</label>
-                            <config_path>payment/paypal_express/transfer_shipping_options</config_path>
-                            <tooltip>If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.</tooltip>
-                            <comment>Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.</comment>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="line_items_enabled">1</field>
-                            </depends>
-                        </field>
-                        <field id="button_flavor" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Shortcut Buttons Flavor</label>
-                            <config_path>paypal/wpp/button_flavor</config_path>
-                            <source_model>Magento\Paypal\Model\Config::getExpressCheckoutButtonFlavors</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="solution_type" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                            <label>Enable PayPal Guest Checkout</label>
-                            <comment>Ability for buyer to purchase without PayPal account.</comment>
-                            <config_path>payment/paypal_express/solution_type</config_path>
-                            <source_model>Magento\Paypal\Model\Config::getExpressCheckoutSolutionTypes</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="require_billing_address" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
-                            <label>Require Customer's Billing Address</label>
-                            <comment>This feature needs be enabled first for the merchant account through PayPal technical support.</comment>
-                            <config_path>payment/paypal_express/require_billing_address</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\RequireBillingAddress</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="allow_ba_signup" translate="label comment tooltip" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
-                            <label>Billing Agreement Signup</label>
-                            <comment>Whether to create a billing agreement, if there are no active billing agreements available.</comment>
-                            <tooltip>
-                                <![CDATA[Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.]]>
-                            </tooltip>
-                            <config_path>payment/paypal_express/allow_ba_signup</config_path>
-                            <source_model>Magento\Paypal\Model\Config::getExpressCheckoutBASignupOptions</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="skip_order_review_step" translate="label" type="select" sortOrder="95" showInDefault="1" showInWebsite="1">
-                            <label>Skip Order Review Step</label>
-                            <config_path>payment/paypal_express/skip_order_review_step</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="express_checkout_billing_agreement" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-                            <label>PayPal Billing Agreement Settings</label>
-                            <field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                                <label>Enabled</label>
-                                <comment>
-                                    <![CDATA[Will appear as a payment option only for customers who have at least one active billing agreement.]]>
-                                </comment>
-                                <config_path>payment/paypal_billing_agreement/active</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Title</label>
-                                <config_path>payment/paypal_billing_agreement/title</config_path>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Sort Order</label>
-                                <config_path>payment/paypal_billing_agreement/sort_order</config_path>
-                                <frontend_class>validate-number</frontend_class>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="payment_action" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>Payment Action</label>
-                                <config_path>payment/paypal_billing_agreement/payment_action</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="allowspecific" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                                <label>Payment Applicable From</label>
-                                <config_path>payment/paypal_billing_agreement/allowspecific</config_path>
-                                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="specificcountry" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1">
-                                <label>Countries Payment Applicable From</label>
-                                <config_path>payment/paypal_billing_agreement/specificcountry</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="allowspecific">1</field>
-                                </depends>
-                            </field>
-                            <field id="debug" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                                <label>Debug Mode</label>
-                                <config_path>payment/paypal_billing_agreement/debug</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="verify_peer" translate="label" type="select" sortOrder="75" showInDefault="1" showInWebsite="1">
-                                <label>Enable SSL verification</label>
-                                <config_path>payment/paypal_billing_agreement/verify_peer</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="line_items_enabled" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
-                                <label>Transfer Cart Line Items</label>
-                                <config_path>payment/paypal_billing_agreement/line_items_enabled</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="allow_billing_agreement_wizard" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
-                                <label>Allow in Billing Agreement Wizard</label>
-                                <config_path>payment/paypal_billing_agreement/allow_billing_agreement_wizard</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                        </group>
-                        <group id="express_checkout_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="110">
-                            <label>Settlement Report Settings</label>
-                            <field id="heading_sftp" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1">
-                                <label>SFTP Credentials</label>
-                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_ftp_login" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1">
-                                <label>Login</label>
-                                <config_path>paypal/fetch_reports/ftp_login</config_path>
-                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_ftp_password" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Password</label>
-                                <config_path>paypal/fetch_reports/ftp_password</config_path>
-                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_ftp_sandbox" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>Sandbox Mode</label>
-                                <config_path>paypal/fetch_reports/ftp_sandbox</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_ftp_ip" translate="label comment tooltip" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
-                                <label>Custom Endpoint Hostname or IP-Address</label>
-                                <comment>By default it is "reports.paypal.com".</comment>
-                                <tooltip>Use colon to specify port. For example: "test.example.com:5224".</tooltip>
-                                <config_path>paypal/fetch_reports/ftp_ip</config_path>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="settlement_reports_ftp_sandbox">0</field>
-                                </depends>
-                            </field>
-                            <field id="settlement_reports_ftp_path" translate="label comeent" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
-                                <label>Custom Path</label>
-                                <comment>By default it is "/ppreports/outgoing".</comment>
-                                <config_path>paypal/fetch_reports/ftp_path</config_path>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="settlement_reports_ftp_sandbox">0</field>
-                                </depends>
-                            </field>
-                            <field id="heading_schedule" translate="label" sortOrder="70" showInDefault="1" showInWebsite="1">
-                                <label>Scheduled Fetching</label>
-                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_active" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
-                                <label>Enable Automatic Fetching</label>
-                                <config_path>paypal/fetch_reports/active</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_schedule" translate="label comment" type="select" sortOrder="90" showInDefault="1">
-                                <label>Schedule</label>
-                                <comment>PayPal retains reports for 45 days.</comment>
-                                <config_path>paypal/fetch_reports/schedule</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\FetchingSchedule</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_time" translate="label" type="time" sortOrder="100" showInDefault="1">
-                                <label>Time of Day</label>
-                                <config_path>paypal/fetch_reports/time</config_path>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                        </group>
-                        <group id="express_checkout_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
-                            <label>Frontend Experience Settings</label>
-                            <field id="logo" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>PayPal Product Logo</label>
-                                <comment>Displays on catalog pages and homepage.</comment>
-                                <config_path>paypal/style/logo</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\Logo</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_pages" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>PayPal Merchant Pages Style</label>
-                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="page_style" translate="label tooltip" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Page Style</label>
-                                <config_path>paypal/style/page_style</config_path>
-                                <tooltip>
-                                    <![CDATA[Allowable values: "paypal", "primary" (default), your_custom_value (a custom payment page style from your merchant account profile).]]>
-                                </tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_hdrimg" translate="label tooltip" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Header Image URL</label>
-                                <config_path>paypal/style/paypal_hdrimg</config_path>
-                                <tooltip>
-                                    <![CDATA[The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style="color:red">https</strong> is highly encouraged.]]>
-                                </tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_hdrbackcolor" translate="label tooltip" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Header Background Color</label>
-                                <config_path>paypal/style/paypal_hdrbackcolor</config_path>
-                                <tooltip>
-                                    <![CDATA[The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.]]>
-                                </tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_hdrbordercolor" translate="label tooltip" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Header Border Color</label>
-                                <config_path>paypal/style/paypal_hdrbordercolor</config_path>
-                                <tooltip>2-pixel perimeter around the header space.</tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_payflowcolor" translate="label tooltip" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Page Background Color</label>
-                                <config_path>paypal/style/paypal_payflowcolor</config_path>
-                                <tooltip>
-                                    <![CDATA[The background color for the checkout page around the header and payment form.]]>
-                                </tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <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>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>
-                                    <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 comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                                    <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>
-                                    </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>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>
-                                    </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>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>
-                                    </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>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>
-                                    </depends>
-                                    <attribute type="shared">1</attribute>
-                                </field>
-                                <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>
-                                    <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>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>
-                                    <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>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>
-                                    </depends>
-                                    <attribute type="shared">1</attribute>
-                                </field>
-                            </group>
-                            <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">
-                                    <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>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">
-                                    <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>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">
-                                    <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 PayPal Credit is
-                                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>
-                    </group>
-                </group>
-            </group>
-            <group id="payments_pro_hosted_solution" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                <label>Website Payments Pro Hosted Solution</label>
-                <fieldset_css>paypal-other-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <attribute type="activity_path">payment/hosted_pro/active</attribute>
-                <comment><![CDATA[Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
-                <attribute type="paypal_ec_separate">1</attribute>
-                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                </group>
-                <group id="pphs_required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                    <label>Required PayPal Settings</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <group id="pphs_required_settings_pphs" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Payments Pro Hosted Solution</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account"/>
-                        <field id="api_authentication" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_authentication"/>
-                        <field id="api_username" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_username" />
-                        <field id="api_password" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_password" />
-                        <field id="api_signature" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_signature" />
-                        <field id="api_cert" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_cert" />
-                        <field id="api_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_wizard" />
-                        <field id="sandbox_flag" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/sandbox_flag" />
-                        <field id="use_proxy" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/use_proxy" />
-                        <field id="proxy_host" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_host" />
-                        <field id="proxy_port" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_port" />
-                    </group>
-                    <field id="pphs_enable" type="select" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1">
-                        <label>Enable this Solution</label>
-                        <config_path>payment/hosted_pro/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        <requires>
-                            <group id="pphs_required_settings_pphs"/>
-                        </requires>
-                        <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" 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>]]>
-                        </comment>
-                        <requires>
-                            <field id="pphs_enable"/>
-                        </requires>
-                    </field>
-                    <group id="pphs_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="22">
-                        <label>Advertise PayPal Credit</label>
-                        <comment>
-                            <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                            <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                            from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                            Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                            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>.]]>
-                        </comment>
-                        <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
-                        <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
-                        <group id="pphs_settings_bml_homepage"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                            <label>Home Page</label>
-                            <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
-                            <field id="pphs_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
-                            <field id="pphs_bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_homepage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="pphs_bml_homepage_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_homepage/pphs_bml_homepage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                <depends>
-                                    <field id="pphs_bml_homepage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="pphs_settings_bml_categorypage"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                            <label>Catalog Category Page</label>
-                            <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
-                            <field id="pphs_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position" />
-                            <field id="pphs_bml_categorypage_size1" translate="label" showInDefault="1" showInWebsite="1" sortOrder="30" type="select">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_categorypage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="pphs_bml_categorypage_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_categorypage/pphs_bml_categorypage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                <depends>
-                                    <field id="pphs_bml_categorypage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="pphs_settings_bml_productpage"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                            <label>Catalog Product Page</label>
-                            <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
-                            <field id="pphs_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
-                            <field id="pphs_bml_productpage_size1" translate="label" type="select" showInWebsite="1" showInDefault="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_productpage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="pphs_bml_productpage_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_productpage/pphs_bml_productpage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                <depends>
-                                    <field id="pphs_bml_productpage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="pphs_settings_bml_checkout"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-                            <label>Checkout Cart Page</label>
-                            <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display" />
-                            <field id="pphs_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position" />
-                            <field id="pphs_bml_checkout_size1" translate="label" type="select" showInWebsite="1" showInDefault="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_checkout_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="pphs_bml_checkout_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_checkout/pphs_bml_checkout_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_checkout_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                    </group>
-                </group>
-                <group id="pphs_settings" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                    <label>Basic Settings - PayPal Payments Pro Hosted Solution</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" type="text" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10" translate="label comment">
-                        <label>Title</label>
-                        <comment>It is recommended to set this value to "PayPal" per store views.</comment>
-                        <config_path>payment/hosted_pro/title</config_path>
-                    </field>
-                    <field id="sort_order" type="text" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20" translate="label">
-                        <label>Sort Order</label>
-                        <config_path>payment/hosted_pro/sort_order</config_path>
-                        <frontend_class>validate-number</frontend_class>
-                    </field>
-                    <field id="payment_action" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
-                        <label>Payment Action</label>
-                        <config_path>payment/hosted_pro/payment_action</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                    </field>
-                    <field id="display_ec" type="select" showInDefault="1" showInWebsite="1" sortOrder="40" translate="label">
-                        <label>Display Express Checkout in the Payment Information step</label>
-                        <config_path>payment/hosted_pro/display_ec</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    </field>
-                    <group id="pphs_settings_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-                        <label>Advanced Settings</label>
-                        <fieldset_css>config-advanced</fieldset_css>
-                        <field id="allowspecific" type="select" showInDefault="1" showInWebsite="1" sortOrder="10" translate="label">
-                            <label>Payment Applicable From</label>
-                            <config_path>payment/hosted_pro/allowspecific</config_path>
-                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                        </field>
-                        <field id="specificcountry" type="multiselect" showInDefault="1" showInWebsite="1" sortOrder="20" translate="label">
-                            <label>Countries Payment Applicable From</label>
-                            <config_path>payment/hosted_pro/specificcountry</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                            <depends>
-                                <field id="allowspecific">1</field>
-                            </depends>
-                        </field>
-                        <field id="debug" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
-                            <label>Debug Mode</label>
-                            <config_path>payment/hosted_pro/debug</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        </field>
-                        <field id="verify_peer" type="select" showInDefault="1" showInWebsite="1" sortOrder="35" translate="label">
-                            <label>Enable SSL verification</label>
-                            <config_path>payment/hosted_pro/verify_peer</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        </field>
-                        <group id="pphs_settlement_report" showInDefault="1" showInWebsite="1" sortOrder="50" translate="label">
-                            <label>Settlement Report Settings</label>
-                            <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
-                            <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login" />
-                            <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password" />
-                            <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox" />
-                            <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip" />
-                            <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path" />
-                            <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule" />
-                            <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active" />
-                            <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule" />
-                            <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time" />
-                        </group>
-                    </group>
-                </group>
-            </group>
-            <group id="payments_pro_hosted_solution_without_bml" extends="payments_pro_hosted_solution">
-                <group id="pphs_required_settings">
-                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                    <group id="pphs_advertise_bml" showInDefault="0" showInWebsite="0"/>
-                </group>
-            </group>
-        </section>
-        <section id="payment_us" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <comment>Choose a secure bundled payment solution for your business.</comment>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-                <group id="payflow_advanced" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                    <label>Payments Advanced</label>
-                    <fieldset_css>paypal-other-section</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment><![CDATA[Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
-                    <attribute type="activity_path">payment/payflow_advanced/active</attribute>
-                    <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html</comment>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                    </group>
-                    <group id="required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Required PayPal Settings</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <group id="payments_advanced" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                            <label>Payments Advanced and Express Checkout</label>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                            <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account">
-                                <label>Email Associated with PayPal Merchant Account (Optional)</label>
-                            </field>
-                            <field id="partner" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
-                                <label>Partner</label>
-                                <config_path>payment/payflow_advanced/partner</config_path>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="vendor" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Vendor</label>
-                                <config_path>payment/payflow_advanced/vendor</config_path>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="user" translate="label comment tooltip" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>User</label>
-                                <comment>PayPal recommends that you set up an additional User on your account at manager.paypal.com</comment>
-                                <tooltip>PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.</tooltip>
-                                <config_path>payment/payflow_advanced/user</config_path>
-                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="pwd" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
-                                <label>Password</label>
-                                <config_path>payment/payflow_advanced/pwd</config_path>
-                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="sandbox_flag" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                                <label>Test Mode</label>
-                                <config_path>payment/payflow_advanced/sandbox_flag</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                                <label>Use Proxy</label>
-                                <config_path>payment/payflow_advanced/use_proxy</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="proxy_host" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
-                                <label>Proxy Host</label>
-                                <config_path>payment/payflow_advanced/proxy_host</config_path>
-                                <depends>
-                                    <field id="use_proxy">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
-                                <label>Proxy Port</label>
-                                <config_path>payment/payflow_advanced/proxy_port</config_path>
-                                <depends>
-                                    <field id="use_proxy">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="payflow_advanced_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-                                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                        </group>
-                        <field id="enable_payflow_advanced" translate="label comment" type="select" sortOrder="41" showInDefault="1" showInWebsite="1">
-                            <label>Enable this Solution</label>
-                            <config_path>payment/payflow_advanced/active</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                            <requires>
-                                <group id="payments_advanced"/>
-                            </requires>
-                        </field>
-                        <field id="enable_express_checkout" extends="payment_all_paypal/payflow_link/payflow_link_required/enable_express_checkout_basic" showInDefault="1" showInWebsite="1">
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden</frontend_model>
-                            <requires>
-                                <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" 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>]]>
-                            </comment>
-                            <config_path>payment/payflow_express_bml/active</config_path>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
-                            <requires>
-                                <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" 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>
-                                <field id="enable_express_checkout_bml">1</field>
-                            </depends>
-                        </field>
-                        <group id="advanced_advertise_bml" showInDefault="1" showInWebsite="1" sortOrder="60" translate="label comment">
-                            <label>Advertise PayPal Credit</label>
-                            <comment>
-                                <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                                            <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                                            from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                                            Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                                            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>.]]>
-                            </comment>
-                            <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
-                            <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
-                            <group id="advanced_settings_bml_homepage" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20" translate="label">
-                                <label>Home Page</label>
-                                <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
-                                <field id="advanced_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
-                                <field id="advanced_bml_homepage_size1" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                    <depends>
-                                        <field id="advanced_bml_homepage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="advanced_bml_homepage_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_homepage/advanced_bml_homepage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                    <depends>
-                                        <field id="advanced_bml_homepage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="advanced_settings_bml_categorypage" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30" translate="label">
-                                <label>Catalog Category Page</label>
-                                <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
-                                <field id="advanced_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position"/>
-                                <field id="advanced_bml_categorypage_size1" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="advanced_bml_categorypage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="advanced_bml_categorypage_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_categorypage/advanced_bml_categorypage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                    <depends>
-                                        <field id="advanced_bml_categorypage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="advanced_settings_bml_productpage" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40" translate="label">
-                                <label>Catalog Product Page</label>
-                                <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
-                                <field id="advanced_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
-                                <field id="advanced_bml_productpage_size1" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" translate="label">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="advanced_bml_productpage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="advanced_bml_productpage_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_productpage/advanced_bml_productpage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                    <depends>
-                                        <field id="advanced_bml_productpage_position">1</field>
-                                    </depends>
-                                </field>
-
-                            </group>
-                            <group id="advanced_settings_bml_checkout" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50" translate="label">
-                                <label>Checkout Cart Page</label>
-                                <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display"/>
-                                <field id="advanced_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position"/>
-                                <field id="advanced_bml_checkout_size1" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="advanced_bml_checkout_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="advanced_bml_checkout_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_checkout/advanced_bml_checkout_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="advanced_bml_checkout_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                        </group>
-                    </group>
-                    <group id="settings_payments_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                        <label>Basic Settings - PayPal Payments Advanced</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Title</label>
-                            <comment>It is recommended to set this value to "Debit or Credit Card" per store views.</comment>
-                            <config_path>payment/payflow_advanced/title</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Sort Order</label>
-                            <config_path>payment/payflow_advanced/sort_order</config_path>
-                            <frontend_class>validate-number</frontend_class>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Payment Action</label>
-                            <config_path>payment/payflow_advanced/payment_action</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="settings_payments_advanced_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                            <label>Advanced Settings</label>
-                            <fieldset_css>config-advanced</fieldset_css>
-                            <field id="allowspecific" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                                <label>Payment Applicable From</label>
-                                <config_path>payment/payflow_advanced/allowspecific</config_path>
-                                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="specificcountry" translate="label" type="multiselect" sortOrder="25" showInDefault="1" showInWebsite="1">
-                                <label>Countries Payment Applicable From</label>
-                                <config_path>payment/payflow_advanced/specificcountry</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                                <depends>
-                                    <field id="allowspecific">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Debug Mode</label>
-                                <config_path>payment/payflow_advanced/debug</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                                <label>Enable SSL verification</label>
-                                <config_path>payment/payflow_advanced/verify_peer</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="csc_editable" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>CVV Entry is Editable</label>
-                                <config_path>payment/payflow_advanced/csc_editable</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="csc_required" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                                <label>Require CVV Entry</label>
-                                <config_path>payment/payflow_advanced/csc_required</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <depends>
-                                    <field id="csc_editable">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="email_confirmation" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                                <label>Send Email Confirmation</label>
-                                <config_path>payment/payflow_advanced/email_confirmation</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="url_method" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                                <label>URL method for Cancel URL and Return URL</label>
-                                <config_path>payment/payflow_advanced/url_method</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\UrlMethod</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <group id="settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="80">
-                                <label>Settlement Report Settings</label>
-                                <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
-                                <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login"/>
-                                <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password"/>
-                                <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox"/>
-                                <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip"/>
-                                <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path"/>
-                                <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule"/>
-                                <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active"/>
-                                <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule"/>
-                                <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time"/>
-                            </group>
-                            <group id="frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
-                                <label>Frontend Experience Settings</label>
-                                <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo"/>
-                                <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages"/>
-                                <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style"/>
-                                <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg"/>
-                                <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor"/>
-                                <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor"/>
-                                <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor"/>
-                            </group>
-                        </group>
-                    </group>
-                    <group id="settings_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                        <label>Basic Settings - PayPal Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="title" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/title" />
-                        <field id="sort_order" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/sort_order" />
-                        <field id="payment_action" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/payment_action" />
-                        <field id="visible_on_product" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/visible_on_product" />
-                        <group id="settings_express_checkout_advanced" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/paypal_payflow_express_checkout_advanced"/>
-                    </group>
-                </group>
-                <group id="wpp_usuk" translate="label" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
-                    <label>Payments Pro</label>
-                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-                    </group>
-                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <field id="enable_paypal_payflow">
-                            <attribute type="shared">0</attribute>
-                            <config_path>payment/paypal_payment_pro/active</config_path>
-                        </field>
-                        <group id="paypal_payflow_api_settings" translate="label">
-                            <label>Payments Pro and Express Checkout</label>
-                        </group>
-                    </group>
-                    <group id="settings_paypal_payflow" translate="label">
-                        <label>Basic Settings - PayPal Payments Pro</label>
-                    </group>
-                </group>
-                <group id="wps_express" extends="payment_all_paypal/express_checkout">
-                    <label>Payments Standard</label>
-                    <comment>Accept credit card and PayPal payments securely.</comment>
-                    <attribute type="activity_path">payment/wps_express/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-                    </group>
-                    <group id="express_checkout_required">
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-                        <group id="express_checkout_required_express_checkout">
-                            <label>Payments Standard</label>
-                        </group>
-                        <field id="enable_express_checkout">
-                            <config_path>payment/wps_express/active</config_path>
-                        </field>
-                        <field id="enable_express_checkout_bml">
-                            <config_path>payment/wps_express_bml/active</config_path>
-                        </field>
-                    </group>
-                    <group id="settings_ec">
-                        <label>Basic Settings - PayPal Website Payments Standard</label>
-                    </group>
-                </group>
-            </group>
-            <group id="paypal_payment_gateways" translate="label" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-                <group id="paypal_payflowpro_with_express_checkout" translate="label comment" extends="payment_all_paypal/paypal_payflowpro">
-                    <label>Payflow Pro</label>
-                    <attribute type="paypal_ec_separate">0</attribute>
-                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Required PayPal Settings</label>
-                        <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">
-                                <frontend_class>not-required</frontend_class>
-                                <label>Email Associated with PayPal Merchant Account (Optional)</label>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                        </group>
-                        <field id="enable_express_checkout" extends="payment_all_paypal/payflow_link/payflow_link_required/enable_express_checkout_basic" showInDefault="1" showInWebsite="1">
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden</frontend_model>
-                            <requires>
-                                <field id="enable_paypal_payflow"/>
-                            </requires>
-                        </field>
-                        <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.
-                            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/payflow_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\Bml</frontend_model>
-                            <requires>
-                                <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" 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>
-                                <field id="enable_express_checkout_bml_payflow">1</field>
-                            </depends>
-                        </field>
-                        <group id="paypal_payflow_advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="40">
-                            <label>Advertise PayPal Credit</label>
-                            <comment>
-                                <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                                <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                                from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                                Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                                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>.]]>
-                            </comment>
-                            <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
-                            <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
-                            <group id="paypal_payflow_settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                                <label>Home Page</label>
-                                <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
-                                <field id="paypal_payflow_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
-                                <field id="paypal_payflow_bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_homepage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="paypal_payflow_bml_homepage_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_homepage/paypal_payflow_bml_homepage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_homepage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="paypal_payflow_settings_bml_categorypage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                                <label>Catalog Category Page</label>
-                                <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
-                                <field id="paypal_payflow_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position" />
-                                <field id="paypal_payflow_bml_categorypage_size1" translate="label" sortOrder="30" showInWebsite="1" showInDefault="1" type="select">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_categorypage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="paypal_payflow_bml_categorypage_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_categorypage/paypal_payflow_bml_categorypage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_categorypage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="paypal_payflow_settings_bml_productpage" translate="label" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40">
-                                <label>Catalog Product Page</label>
-                                <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
-                                <field id="paypal_payflow_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
-                                <field id="paypal_payflow_bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_productpage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="paypal_payflow_bml_productpage_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_productpage/paypal_payflow_bml_productpage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_productpage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="paypal_payflow_settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-                                <label>Checkout Cart Page</label>
-                                <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display" />
-                                <field id="paypal_payflow_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position" />
-                                <field id="paypal_payflow_bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_checkout_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="paypal_payflow_bml_checkout_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_checkout/paypal_payflow_bml_checkout_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_checkout_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                        </group>
-                    </group>
-                    <group id="settings_paypal_payflow" translate="label">
-                        <group id="settings_paypal_payflow_advanced" translate="label">
-                            <group id="paypal_payflow_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-                                <label>Frontend Experience Settings</label>
-                                <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo"/>
-                                <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages"/>
-                                <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style"/>
-                                <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg"/>
-                                <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor"/>
-                                <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor"/>
-                                <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor"/>
-                            </group>
-                        </group>
-                    </group>
-                    <group id="paypal_payflow_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                        <label>Basic Settings - PayPal Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="title" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Title</label>
-                            <config_path>payment/payflow_express/title</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Sort Order</label>
-                            <config_path>payment/payflow_express/sort_order</config_path>
-                            <frontend_class>validate-number</frontend_class>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Payment Action</label>
-                            <config_path>payment/payflow_express/payment_action</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="visible_on_product" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Display on Product Details Page</label>
-                            <config_path>payment/payflow_express/visible_on_product</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="paypal_payflow_express_checkout_advanced" translate="label" showInDefault="1" showInWebsite="1" sortOrder="60">
-                            <label>Advanced Settings</label>
-                            <fieldset_css>config-advanced</fieldset_css>
-                            <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Display on Shopping Cart</label>
-                                <comment>Also affects mini-shopping cart.</comment>
-                                <config_path>payment/payflow_express/visible_on_cart</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\Yesnoshortcut</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                                <label>Payment Applicable From</label>
-                                <config_path>payment/payflow_express/allowspecific</config_path>
-                                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
-                                <label>Countries Payment Applicable From</label>
-                                <config_path>payment/payflow_express/specificcountry</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                                <depends>
-                                    <field id="allowspecific">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Debug Mode</label>
-                                <config_path>payment/payflow_express/debug</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                                <label>Enable SSL verification</label>
-                                <config_path>payment/payflow_express/verify_peer</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>Transfer Cart Line Items</label>
-                                <config_path>payment/payflow_express/line_items_enabled</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="skip_order_review_step" sortOrder="50" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/skip_order_review_step"/>
-                        </group>
-                    </group>
-                </group>
-                <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
-            </group>
-            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
-                <group id="express_checkout_us" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>PayPal Express Checkout</label>
-                    <fieldset_css>complex paypal-express-section</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                    <attribute type="shared">0</attribute>
-                    <attribute type="activity_path">payment/paypal_express/active</attribute>
-                    <attribute type="activity_path">payment/payflow_express/active</attribute>
-                    <attribute type="displayIn">recommended_solutions</attribute>
-                </group>
-            </group>
-        </section>
-        <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <comment>Choose a secure bundled payment solution for your business.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-                <group id="wpp_usuk" translate="comment" sortOrder="20">
-                    <fieldset_css>pp-general-uk</fieldset_css>
-                    <demo_link>http://www.youtube.com/watch?v=LBe-TW87eGI&amp;list=PLF18B1094ABCD7CE8&amp;index=1&amp;feature=plpp_video</demo_link>
-                    <comment>Accept payments with a completely customizable checkout page.</comment>
-                    <group id="wpp_required_settings">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="wpp_advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
-                <group id="payments_pro_hosted_solution_with_express_checkout" translate="label comment" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30">
-                    <label>Website Payments Pro Hosted Solution</label>
-                    <attribute type="paypal_ec_separate">0</attribute>
-                    <group id="pphs_required_settings">
-                        <group id="pphs_required_settings_pphs" translate="label">
-                            <label>Website Payments Pro Hosted Solution and Express Checkout</label>
-                        </group>
-                        <field id="pphs_enable">
-                            <requires>
-                                <group id="pphs_required_settings_pphs"/>
-                            </requires>
-                            <frontend_class>paypal-enabler</frontend_class>
-                        </field>
-                    </group>
-                    <group id="pphs_settings" translate="label">
-                        <label>Basic Settings - PayPal Website Payments Pro Hosted Solution</label>
-                        <group id="pphs_settings_advanced">
-                            <group id="pphs_billing_agreement" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                                <label>PayPal Billing Agreement Settings</label>
-                                <field id="active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/active" />
-                                <field id="title" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/title" />
-                                <field id="sort_order" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/sort_order" />
-                                <field id="payment_action" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/payment_action" />
-                                <field id="allowspecific" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/allowspecific" />
-                                <field id="specificcountry" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/specificcountry" />
-                                <field id="debug" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/debug" />
-                                <field id="verify_peer" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/verify_peer" />
-                                <field id="line_items_enabled" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/line_items_enabled" />
-                                <field id="allow_billing_agreement_wizard" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/allow_billing_agreement_wizard" />
-                            </group>
-                            <group id="pphs_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
-                                <label>Frontend Experience Settings</label>
-                                <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo" />
-                                <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages" />
-                                <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style" />
-                                <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg" />
-                                <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor" />
-                                <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor" />
-                                <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor" />
-                            </group>
-                        </group>
-                    </group>
-                    <group id="pphs_settings_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                        <label>Basic Settings - PayPal Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="title" extends="payment_all_paypal/express_checkout/settings_ec/title" />
-                        <field id="sort_order" extends="payment_all_paypal/express_checkout/settings_ec/sort_order" />
-                        <field id="payment_action" extends="payment_all_paypal/express_checkout/settings_ec/payment_action" />
-                        <field id="visible_on_product" extends="payment_all_paypal/express_checkout/settings_ec/visible_on_product" />
-                        <field id="authorization_honor_period" extends="payment_all_paypal/express_checkout/settings_ec/authorization_honor_period" />
-                        <field id="order_valid_period" extends="payment_all_paypal/express_checkout/settings_ec/order_valid_period" />
-                        <field id="child_authorization_number" extends="payment_all_paypal/express_checkout/settings_ec/child_authorization_number" />
-                        <group id="pphs_settings_express_checkout_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
-                            <label>Advanced Settings</label>
-                            <fieldset_css>config-advanced</fieldset_css>
-                            <field id="visible_on_cart" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/visible_on_cart" />
-                            <field id="allowspecific" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/allowspecific" />
-                            <field id="specificcountry" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/specificcountry" />
-                            <field id="debug" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/debug" />
-                            <field id="verify_peer" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/verify_peer" />
-                            <field id="line_items_enabled" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/line_items_enabled" />
-                            <field id="transfer_shipping_options" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/transfer_shipping_options" />
-                            <field id="button_flavor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/button_flavor" />
-                            <field id="solution_type" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/solution_type" />
-                            <field id="require_billing_address" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/require_billing_address" />
-                            <field id="allow_ba_signup" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/allow_ba_signup" />
-                            <field id="skip_order_review_step" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/skip_order_review_step" />
-                        </group>
-                    </group>
-                </group>
-                <group id="wps_express" extends="payment_all_paypal/express_checkout" sortOrder="50">
-                    <label>Website Payments Standard</label>
-                    <comment>Accept credit card and PayPal payments securely.</comment>
-                    <attribute type="activity_path">payment/wps_express/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-                    </group>
-                    <group id="express_checkout_required">
-                        <group id="express_checkout_required_express_checkout">
-                            <label>Website Payments Standard</label>
-                        </group>
-                        <field id="enable_express_checkout">
-                            <config_path>payment/wps_express/active</config_path>
-                        </field>
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                    <group id="settings_ec">
-                        <label>Basic Settings - PayPal Website Payments Standard</label>
-                    </group>
-                </group>
-            </group>
-            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
-                <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>PayPal Express Checkout</label>
-                    <fieldset_css>complex paypal-express-section</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                    <attribute type="displayIn">recommended_solutions</attribute>
-                    <group id="express_checkout_required">
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
-            </group>
-        </section>
-        <section id="payment_de" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payment_solutions" showInDefault="0" showInWebsite="0" showInStore="0" sortOrder="5">
-                <group id="express_checkout_de" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>PayPal Express Checkout</label>
-                    <fieldset_css>complex paypal-express-section</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                    <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                    <attribute type="displayIn">recommended_solutions</attribute>
-                    <group id="express_checkout_required">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                    <group id="settings_ec">
-                        <group id="settings_ec_advanced">
-                            <field id="solution_type" showInDefault="0" showInWebsite="0"/>
-                        </group>
-                    </group>
-                </group>
-            </group>
-        </section>
-        <section id="payment_other" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="express_checkout_other" translate="label comment" sortOrder="5" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Express Checkout</label>
-                <fieldset_css>complex paypal-express-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <attribute type="displayIn">recommended_solutions</attribute>
-                <group id="express_checkout_required">
-                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                    <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                </group>
-            </group>
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <comment>Choose a secure bundled payment solution for your business.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Website Payments Standard</label>
-                    <fieldset_css>complex</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment>Accept credit card and PayPal payments securely.</comment>
-                    <attribute type="activity_path">payment/wps_express/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-                    </group>
-                    <group id="express_checkout_required">
-                        <group id="express_checkout_required_express_checkout">
-                            <label>Website Payments Standard</label>
-                        </group>
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_express_checkout">
-                            <config_path>payment/wps_express/active</config_path>
-                        </field>
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                    <group id="settings_ec">
-                        <label>Basic Settings - PayPal Website Payments Standard</label>
-                    </group>
-                </group>
-            </group>
-            <group id="paypal_payment_gateways" translate="label comment" sortOrder="8" showInDefault="0" showInWebsite="0" showInStore="0">
-                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <comment>Process payments using your own internet merchant account.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-            </group>
-        </section>
-        <section id="payment_ca" extends="payment_other">
-            <group id="express_checkout_other">
-                <attribute type="activity_path">payment/paypal_express/active</attribute>
-                <attribute type="activity_path">payment/payflow_express/active</attribute>
-            </group>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="20"/>
-            </group>
-            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-                <group id="wpp_ca" translate="label" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30">
-                    <label>Website Payments Pro</label>
-                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-                    </group>
-                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <group id="paypal_payflow_api_settings">
-                            <label>Payments Pro</label>
-                        </group>
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_paypal_payflow">
-                            <frontend_class>paypal-enabler paypal-ec-pe</frontend_class>
-                            <attribute type="shared">0</attribute>
-                            <config_path>payment/paypal_payment_pro/active</config_path>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        </field>
-                    </group>
-                    <group id="settings_paypal_payflow">
-                        <label>Basic Settings - PayPal Payments Pro</label>
-                    </group>
-                </group>
-                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="40"/>
-                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="50">
-                    <group id="payflow_link_required">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="payflow_link_advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
-            </group>
-        </section>
-        <section id="payment_au" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
-            </group>
-            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-                <group id="paypal_payflowpro_au" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20"/>
-            </group>
-        </section>
-        <section id="payment_jp" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_jp" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-                    <label>Website Payments Plus</label>
-                </group>
-            </group>
-        </section>
-        <section id="payment_fr" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_fr" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-                    <label>Integral Evolution</label>
-                </group>
-            </group>
-        </section>
-        <section id="payment_it" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_it" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-                    <label>Pro</label>
-                </group>
-            </group>
-        </section>
-        <section id="payment_es" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_es" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-                    <label>Pasarela integral</label>
-                </group>
-            </group>
-        </section>
-        <section id="payment_hk" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_hk" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
-            </group>
-        </section>
-        <section id="payment_nz" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other"/>
-            </group>
-            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro"/>
-            </group>
-        </section>
-    </system>
-</config>

From 3808c33ae9ad49ef022de97cd436589174651dd0 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 19 Mar 2019 07:55:13 -0500
Subject: [PATCH 0682/1055] MC-13613: Product mass update

---
 .../Adminhtml/Product/Action/Attribute/Save.php    | 14 +++++++++++---
 .../Catalog/Model/Attribute/Backend/Consumer.php   |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 63182dd5624e6..342bbc388f872 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -42,6 +42,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      */
     private $userContext;
 
+    /**
+     * @var int
+     */
+    private $bulkSize;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
@@ -50,6 +55,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * @param \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService
      * @param \Magento\Framework\Serialize\SerializerInterface $serializer
      * @param \Magento\Authorization\Model\UserContextInterface $userContext
+     * @param int $bulkSize
      */
     public function __construct(
         Action\Context $context,
@@ -58,7 +64,8 @@ public function __construct(
         \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory $operartionFactory,
         \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService,
         \Magento\Framework\Serialize\SerializerInterface $serializer,
-        \Magento\Authorization\Model\UserContextInterface $userContext
+        \Magento\Authorization\Model\UserContextInterface $userContext,
+        int $bulkSize = 100
     ) {
         parent::__construct($context, $attributeHelper);
         $this->bulkManagement = $bulkManagement;
@@ -66,6 +73,7 @@ public function __construct(
         $this->identityService = $identityService;
         $this->serializer = $serializer;
         $this->userContext = $userContext;
+        $this->bulkSize = $bulkSize;
     }
 
     /**
@@ -171,9 +179,9 @@ private function publish(
         $websiteId,
         $productIds
     ):void {
-        $productIdsChunks = array_chunk($productIds, 100);
+        $productIdsChunks = array_chunk($productIds, $this->bulkSize);
         $bulkUuid = $this->identityService->generateId();
-        $bulkDescription = __('Update attributes to ' . count($productIds) . ' selected products');
+        $bulkDescription = __('Update attributes for ' . count($productIds) . ' selected products');
         $operations = [];
         foreach ($productIdsChunks as $productIdsChunk) {
             if ($websiteRemoveData || $websiteAddData) {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
index becd6c160155c..dc24a3090481e 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Consumer.php
@@ -110,7 +110,7 @@ public function process(\Magento\AsynchronousOperations\Api\Data\OperationInterf
             ) {
                 $status = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
                 $errorCode = $e->getCode();
-                $message = __($e->getMessage());
+                $message = $e->getMessage();
             } else {
                 $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
                 $errorCode = $e->getCode();

From 2a6cddd8f5dc0cf7ff9f768e7a1c3704f4a1fcfb Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 19 Mar 2019 08:19:12 -0500
Subject: [PATCH 0683/1055] MC-13613: Product mass update

---
 .../Api/Data/PoisonPillInterface.php          | 23 ------------------
 .../Api/PoisonPillCompareInterface.php        |  6 ++---
 .../Api/PoisonPillReadInterface.php           |  8 +++----
 .../MessageQueue/Model/CallbackInvoker.php    |  9 ++++---
 .../Magento/MessageQueue/Model/PoisonPill.php | 24 -------------------
 .../MessageQueue/Model/PoisonPillCompare.php  |  5 ++--
 .../Model/ResourceModel/PoisonPill.php        | 18 +++-----------
 app/code/Magento/MessageQueue/etc/di.xml      |  1 -
 8 files changed, 14 insertions(+), 80 deletions(-)
 delete mode 100644 app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
 delete mode 100644 app/code/Magento/MessageQueue/Model/PoisonPill.php

diff --git a/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php b/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
deleted file mode 100644
index 37031b4fba4bb..0000000000000
--- a/app/code/Magento/MessageQueue/Api/Data/PoisonPillInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MessageQueue\Api\Data;
-
-/**
- * PoisonPill data interface.
- *
- * @api
- */
-interface PoisonPillInterface
-{
-    /**
-     * Returns version of poison pill.
-     *
-     * @return integer
-     */
-    public function getVersion(): ?int;
-}
diff --git a/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php b/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
index e2df3d69ca0aa..3d5b895575597 100644
--- a/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
+++ b/app/code/Magento/MessageQueue/Api/PoisonPillCompareInterface.php
@@ -7,8 +7,6 @@
 
 namespace Magento\MessageQueue\Api;
 
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
-
 /**
  * Interface describes how to describes how to compare poison pill with latest in DB.
  *
@@ -19,8 +17,8 @@ interface PoisonPillCompareInterface
     /**
      * Check if version of current poison pill is latest.
      *
-     * @param PoisonPillInterface $poisonPill
+     * @param int $poisonPillVersion
      * @return bool
      */
-    public function isLatest(PoisonPillInterface $poisonPill): bool;
+    public function isLatestVersion(int $poisonPillVersion): bool;
 }
diff --git a/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php b/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php
index 325cfd597956a..db97990ebbad5 100644
--- a/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php
+++ b/app/code/Magento/MessageQueue/Api/PoisonPillReadInterface.php
@@ -7,8 +7,6 @@
 
 namespace Magento\MessageQueue\Api;
 
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
-
 /**
  * Describes how to get latest version of poison pill.
  *
@@ -17,9 +15,9 @@
 interface PoisonPillReadInterface
 {
     /**
-     * Returns latest poison pill.
+     * Returns get latest version of poison pill.
      *
-     * @return PoisonPillInterface
+     * @return int
      */
-    public function getLatest(): PoisonPillInterface;
+    public function getLatestVersion(): int;
 }
diff --git a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
index 1234228dad72d..f37f2157c3575 100644
--- a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
+++ b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
@@ -9,7 +9,6 @@
 
 use Magento\Framework\MessageQueue\CallbackInvokerInterface;
 use Magento\Framework\MessageQueue\QueueInterface;
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
 use Magento\MessageQueue\Api\PoisonPillCompareInterface;
 use Magento\MessageQueue\Api\PoisonPillReadInterface;
 
@@ -24,9 +23,9 @@ class CallbackInvoker implements CallbackInvokerInterface
     private $poisonPillRead;
 
     /**
-     * @var PoisonPillInterface $poisonPill
+     * @var int $poisonPillVersion
      */
-    private $poisonPill;
+    private $poisonPillVersion;
 
     /**
      * @var PoisonPillCompareInterface
@@ -51,12 +50,12 @@ public function __construct(
      */
     public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
     {
-        $this->poisonPill = $this->poisonPillRead->getLatest();
+        $this->poisonPillVersion = $this->poisonPillRead->getLatestVersion();
         for ($i = $maxNumberOfMessages; $i > 0; $i--) {
             do {
                 $message = $queue->dequeue();
             } while ($message === null && (sleep(1) === 0));
-            if (false === $this->poisonPillCompare->isLatest($this->poisonPill)) {
+            if (false === $this->poisonPillCompare->isLatestVersion($this->poisonPillVersion)) {
                 $queue->reject($message);
                 exit(0);
             }
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPill.php b/app/code/Magento/MessageQueue/Model/PoisonPill.php
deleted file mode 100644
index ac53a14f19b0c..0000000000000
--- a/app/code/Magento/MessageQueue/Model/PoisonPill.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\MessageQueue\Model;
-
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
-
-/**
- * PoisonPill data class
- */
-class PoisonPill extends \Magento\Framework\Model\AbstractModel implements PoisonPillInterface
-{
-    /**
-     * @inheritdoc
-     */
-    public function getVersion(): ?int
-    {
-        return $this->_getData('version');
-    }
-}
diff --git a/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
index 6155526287555..a8e40ea495002 100644
--- a/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
+++ b/app/code/Magento/MessageQueue/Model/PoisonPillCompare.php
@@ -7,7 +7,6 @@
 
 namespace Magento\MessageQueue\Model;
 
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
 use Magento\MessageQueue\Api\PoisonPillCompareInterface;
 use Magento\MessageQueue\Api\PoisonPillReadInterface;
 
@@ -34,8 +33,8 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function isLatest(PoisonPillInterface $poisonPill): bool
+    public function isLatestVersion(int $poisonPillVersion): bool
     {
-        return $poisonPill->getVersion() === $this->poisonPillRead->getLatest()->getVersion();
+        return $poisonPillVersion === $this->poisonPillRead->getLatestVersion();
     }
 }
diff --git a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
index ee3d09ec3eaed..283fff8ace7c7 100644
--- a/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
+++ b/app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php
@@ -7,8 +7,6 @@
 
 namespace Magento\MessageQueue\Model\ResourceModel;
 
-use Magento\MessageQueue\Api\Data\PoisonPillInterface;
-use Magento\MessageQueue\Api\Data\PoisonPillInterfaceFactory;
 use Magento\MessageQueue\Api\PoisonPillReadInterface;
 use Magento\MessageQueue\Api\PoisonPillPutInterface;
 use Magento\Framework\Model\ResourceModel\Db\Context;
@@ -24,24 +22,16 @@ class PoisonPill extends AbstractDb implements PoisonPillPutInterface, PoisonPil
      */
     const QUEUE_POISON_PILL_TABLE = 'queue_poison_pill';
 
-    /**
-     * @var PoisonPillInterfaceFactory
-     */
-    private $poisonPillFactory;
-
     /**
      * PoisonPill constructor.
      *
      * @param Context $context
-     * @param PoisonPillInterfaceFactory $poisonPillFactory
      * @param string|null $connectionName
      */
     public function __construct(
         Context $context,
-        PoisonPillInterfaceFactory $poisonPillFactory,
         string $connectionName = null
     ) {
-        $this->poisonPillFactory = $poisonPillFactory;
         parent::__construct($context, $connectionName);
     }
 
@@ -67,7 +57,7 @@ public function put(): int
     /**
      * @inheritdoc
      */
-    public function getLatest() : PoisonPillInterface
+    public function getLatestVersion() : int
     {
         $select = $this->getConnection()->select()->from(
             $this->getTable(self::QUEUE_POISON_PILL_TABLE),
@@ -78,10 +68,8 @@ public function getLatest() : PoisonPillInterface
             1
         );
 
-        $version = $this->getConnection()->fetchOne($select);
-
-        $poisonPill = $this->poisonPillFactory->create(['data' => ['version' => (int) $version]]);
+        $version = (int)$this->getConnection()->fetchOne($select);
 
-        return $poisonPill;
+        return $version;
     }
 }
diff --git a/app/code/Magento/MessageQueue/etc/di.xml b/app/code/Magento/MessageQueue/etc/di.xml
index 3b2cb8718e041..22cfea976a722 100644
--- a/app/code/Magento/MessageQueue/etc/di.xml
+++ b/app/code/Magento/MessageQueue/etc/di.xml
@@ -13,7 +13,6 @@
     <preference for="Magento\Framework\MessageQueue\EnvelopeInterface" type="Magento\Framework\MessageQueue\Envelope"/>
     <preference for="Magento\Framework\MessageQueue\ConsumerInterface" type="Magento\Framework\MessageQueue\Consumer"/>
     <preference for="Magento\Framework\MessageQueue\MergedMessageInterface" type="Magento\Framework\MessageQueue\MergedMessage"/>
-    <preference for="Magento\MessageQueue\Api\Data\PoisonPillInterface" type="Magento\MessageQueue\Model\PoisonPill"/>
     <preference for="Magento\MessageQueue\Api\PoisonPillCompareInterface" type="Magento\MessageQueue\Model\PoisonPillCompare"/>
     <preference for="Magento\MessageQueue\Api\PoisonPillPutInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>
     <preference for="Magento\MessageQueue\Api\PoisonPillReadInterface" type="Magento\MessageQueue\Model\ResourceModel\PoisonPill"/>

From e09429f7cca09d91245c0999cb043e7845d4fa74 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 19 Mar 2019 15:31:16 +0200
Subject: [PATCH 0684/1055] Fix static tests.

---
 .../Sales/Model/Order/Address/Validator.php     | 14 ++++++++++++--
 .../Magento/Framework/Locale/Format.php         |  6 +++++-
 .../Magento/Framework/Locale/Resolver.php       | 17 ++++++++++-------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Address/Validator.php b/app/code/Magento/Sales/Model/Order/Address/Validator.php
index 1b54dd2c127db..5d3186781e7d7 100644
--- a/app/code/Magento/Sales/Model/Order/Address/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Address/Validator.php
@@ -49,8 +49,8 @@ class Validator
 
     /**
      * @param DirectoryHelper $directoryHelper
-     * @param CountryFactory  $countryFactory
-     * @param EavConfig       $eavConfig
+     * @param CountryFactory $countryFactory
+     * @param EavConfig $eavConfig
      */
     public function __construct(
         DirectoryHelper $directoryHelper,
@@ -64,6 +64,7 @@ public function __construct(
     }
 
     /**
+     * Validate address.
      *
      * @param \Magento\Sales\Model\Order\Address $address
      * @return array
@@ -196,7 +197,10 @@ protected function isStateRequired($countryId)
     }
 
     /**
+     * Check whether telephone is required for address.
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isTelephoneRequired()
     {
@@ -204,7 +208,10 @@ protected function isTelephoneRequired()
     }
 
     /**
+     * Check whether company is required for address.
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isCompanyRequired()
     {
@@ -212,7 +219,10 @@ protected function isCompanyRequired()
     }
 
     /**
+     * Check whether telephone is required for address.
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isFaxRequired()
     {
diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
index 0cdd80208fbcf..adcffe01b910e 100644
--- a/lib/internal/Magento/Framework/Locale/Format.php
+++ b/lib/internal/Magento/Framework/Locale/Format.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Locale;
 
+/**
+ * Price locale format.
+ */
 class Format implements \Magento\Framework\Locale\FormatInterface
 {
     /**
@@ -38,7 +41,8 @@ public function __construct(
     }
 
     /**
-     * Returns the first found number from a string
+     * Returns the first found number from a string.
+     *
      * Parsing depends on given locale (grouping and decimal)
      *
      * Examples for input:
diff --git a/lib/internal/Magento/Framework/Locale/Resolver.php b/lib/internal/Magento/Framework/Locale/Resolver.php
index 83637dac9c475..d058bfd41ab1a 100644
--- a/lib/internal/Magento/Framework/Locale/Resolver.php
+++ b/lib/internal/Magento/Framework/Locale/Resolver.php
@@ -9,6 +9,9 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 
+/**
+ * Manages locale config information.
+ */
 class Resolver implements ResolverInterface
 {
     /**
@@ -81,7 +84,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultLocalePath()
     {
@@ -89,7 +92,7 @@ public function getDefaultLocalePath()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDefaultLocale($locale)
     {
@@ -98,7 +101,7 @@ public function setDefaultLocale($locale)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultLocale()
     {
@@ -116,7 +119,7 @@ public function getDefaultLocale()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLocale($locale = null)
     {
@@ -129,7 +132,7 @@ public function setLocale($locale = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLocale()
     {
@@ -140,7 +143,7 @@ public function getLocale()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function emulate($scopeId)
     {
@@ -160,7 +163,7 @@ public function emulate($scopeId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function revert()
     {

From 166c0d426c08cc4f341adbfe1605581a7cb313dd Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 19 Mar 2019 09:04:25 -0500
Subject: [PATCH 0685/1055] MC-13613: Product mass update

---
 .../Plugin/MassUpdateProductAttribute.php             | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
index 95fe5ae24d23e..334d2b22edbfa 100644
--- a/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
+++ b/app/code/Magento/CatalogInventory/Plugin/MassUpdateProductAttribute.php
@@ -44,10 +44,6 @@ class MassUpdateProductAttribute
      */
     private $attributeHelper;
 
-    /**
-     * @var \Magento\Backend\Model\View\Result\Redirect
-     */
-    private $redirectFactory;
     /**
      * @var \Magento\Framework\Message\ManagerInterface
      */
@@ -60,7 +56,6 @@ class MassUpdateProductAttribute
      * @param \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
-     * @param \Magento\Backend\Model\View\Result\RedirectFactory $redirectFactory
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -71,7 +66,6 @@ public function __construct(
         \Magento\CatalogInventory\Api\StockItemRepositoryInterface $stockItemRepository,
         \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
         \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
-        \Magento\Backend\Model\View\Result\RedirectFactory $redirectFactory,
         \Magento\Framework\Message\ManagerInterface $messageManager
     ) {
         $this->stockIndexerProcessor = $stockIndexerProcessor;
@@ -80,7 +74,6 @@ public function __construct(
         $this->stockItemRepository = $stockItemRepository;
         $this->stockConfiguration = $stockConfiguration;
         $this->attributeHelper = $attributeHelper;
-        $this->redirectFactory = $redirectFactory;
         $this->messageManager = $messageManager;
     }
 
@@ -111,14 +104,14 @@ public function aroundExecute(Save $subject, callable $proceed)
             return $proceed();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
+            return $proceed();
         } catch (\Exception $e) {
             $this->messageManager->addExceptionMessage(
                 $e,
                 __('Something went wrong while updating the product(s) attributes.')
             );
+            return $proceed();
         }
-
-        return $this->redirectFactory->create()->setPath('catalog/product/', ['_current' => true]);
     }
 
     /**

From c8e9365023a3bcdea77b474561a535a49879e90d Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Tue, 19 Mar 2019 10:07:50 -0500
Subject: [PATCH 0686/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

- fixed unit tests
---
 .../Magento/Framework/Cache/LockGuardedCacheLoader.php        | 2 +-
 lib/internal/Magento/Framework/View/Element/AbstractBlock.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
index 8575f208e6c1f..8b500fe7fd3cb 100644
--- a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
+++ b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
@@ -58,7 +58,7 @@ public function __construct(
      * @param callable $dataLoader
      * @param callable $dataCollector
      * @param callable $dataSaver
-     * @return array
+     * @return mixed
      */
     public function lockedLoadData(
         string $lockName,
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 187bb0ea1446f..6c4746d8218ea 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -1084,7 +1084,7 @@ protected function getCacheLifetime()
     /**
      * Load block html from cache storage
      *
-     * @return string|false
+     * @return string
      */
     protected function _loadCache()
     {
@@ -1126,7 +1126,7 @@ protected function _loadCache()
             }
         };
 
-        return $this->lockQuery->lockedLoadData(
+        return (string)$this->lockQuery->lockedLoadData(
             $this->getCacheKey(),
             $loadAction,
             $collectAction,

From 251ce3cfd20ac01617d64e6754ad0ca17f711c60 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Tue, 19 Mar 2019 10:28:34 -0500
Subject: [PATCH 0687/1055] MAGETWO-98151: Add support ZooKeeper locks

---
 .../Framework/Lock/Backend/ZookeeperTest.php  |  1 -
 .../Framework/Lock/Backend/Zookeeper.php      | 22 +++++++++++--------
 lib/internal/Magento/Framework/Lock/Proxy.php |  9 +++++---
 .../Setup/Model/ConfigOptionsList/Lock.php    |  7 +++---
 .../Unit/Model/ConfigOptionsList/LockTest.php | 19 +++++++++++-----
 5 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
index ae218561377f2..8d0caad5d55e4 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
@@ -88,4 +88,3 @@ public function testUnlockWithoutExistingLock()
         $this->assertFalse($this->model->unlock($name));
     }
 }
-
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index 3b69c8734d9a9..1e7ca069df79b 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -101,7 +101,8 @@ public function __construct(string $host, string $path = self::DEFAULT_PATH)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * You can see the lock algorithm by the link
      * @link https://zookeeper.apache.org/doc/r3.1.2/recipes.html#sc_recipes_Locks
      *
@@ -124,7 +125,7 @@ public function lock(string $name, int $timeout = -1): bool
             throw new RuntimeException(new Phrase('Failed creating lock %1', [$lockPath]));
         }
 
-        while($this->isAnyLock($lockKey, $this->getIndex($lockKey))) {
+        while ($this->isAnyLock($lockKey, $this->getIndex($lockKey))) {
             if (!$skipDeadline && $deadline <= microtime(true)) {
                 $this->getProvider()->delete($lockKey);
                 return false;
@@ -139,7 +140,8 @@ public function lock(string $name, int $timeout = -1): bool
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @throws RuntimeException
      */
     public function unlock(string $name): bool
@@ -152,7 +154,8 @@ public function unlock(string $name): bool
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @throws RuntimeException
      */
     public function isLocked(string $name): bool
@@ -184,7 +187,7 @@ private function getProvider(): \Zookeeper
         }
 
         $deadline = microtime(true) + $this->connectionTimeout;
-        while($this->zookeeper->getState() != \Zookeeper::CONNECTED_STATE) {
+        while ($this->zookeeper->getState() != \Zookeeper::CONNECTED_STATE) {
             if ($deadline <= microtime(true)) {
                 throw new RuntimeException(new Phrase('Zookeeper connection timed out!'));
             }
@@ -227,16 +230,17 @@ private function checkAndCreateParentNode(string $path): bool
      */
     private function getIndex(string $key)
     {
-        if (!preg_match('/' . $this->lockName . '([0-9]+)$/', $key, $matches))
+        if (!preg_match('/' . $this->lockName . '([0-9]+)$/', $key, $matches)) {
             return null;
+        }
 
         return intval($matches[1]);
     }
 
     /**
      * Checks if there is any sequence node under parent of $fullKey.
-     * At first checks that the $fullKey node is present, if not - returns false.
      *
+     * At first checks that the $fullKey node is present, if not - returns false.
      * If $indexKey is non-null and there is a smaller index than $indexKey then returns true,
      * otherwise returns false.
      *
@@ -255,14 +259,14 @@ private function isAnyLock(string $fullKey, int $indexKey = null): bool
 
         $children = $this->getProvider()->getChildren($parent);
 
-        if (is_null($indexKey) && !empty($children)) {
+        if (null === $indexKey && !empty($children)) {
             return true;
         }
 
         foreach ($children as $childKey) {
             $childIndex = $this->getIndex($childKey);
 
-            if (is_null($childIndex)) {
+            if (null === $childIndex) {
                 continue;
             }
 
diff --git a/lib/internal/Magento/Framework/Lock/Proxy.php b/lib/internal/Magento/Framework/Lock/Proxy.php
index b5f8eee0f2c4f..2718bf6cb3456 100644
--- a/lib/internal/Magento/Framework/Lock/Proxy.php
+++ b/lib/internal/Magento/Framework/Lock/Proxy.php
@@ -37,7 +37,8 @@ public function __construct(LockBackendFactory $factory)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @throws RuntimeException
      */
     public function isLocked(string $name): bool
@@ -46,7 +47,8 @@ public function isLocked(string $name): bool
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @throws RuntimeException
      */
     public function lock(string $name, int $timeout = -1): bool
@@ -55,7 +57,8 @@ public function lock(string $name, int $timeout = -1): bool
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @throws RuntimeException
      */
     public function unlock(string $name): bool
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
index 37b5cc38dcbd8..799409d1560ac 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
@@ -212,9 +212,9 @@ private function validateZookeeperConfig(array $options, DeploymentConfig $deplo
 
         $host = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_HOST]
             ?? $deploymentConfig->get(
-                   self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
-                   $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_HOST)
-               );
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_HOST)
+            );
         $path = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_PATH]
             ?? $deploymentConfig->get(
                 self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
@@ -251,7 +251,6 @@ private function getLockProvider(array $options, DeploymentConfig $deploymentCon
         return (string) $options[self::INPUT_KEY_LOCK_PROVIDER];
     }
 
-
     /**
      * Sets default configuration for locks
      *
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
index f7ca6e0a09b5a..5a150ad3dcd86 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
@@ -163,7 +163,10 @@ public function testValidate(array $options, array $expectedResult)
         $this->deploymentConfigMock->expects($this->any())
             ->method('get')
             ->willReturnArgument(1);
-        $this->assertSame($expectedResult, $this->lockConfigOptionsList->validate($options, $this->deploymentConfigMock));
+        $this->assertSame(
+            $expectedResult,
+            $this->lockConfigOptionsList->validate($options, $this->deploymentConfigMock)
+        );
     }
 
     /**
@@ -186,10 +189,16 @@ public function validateDataProvider(): array
                     LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST => '',
                     LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH => '',
                 ],
-                'expectedResult' => [
-                    'Zookeeper path needs to be a non-empty string.',
-                    'Zookeeper host is should be set.',
-                ],
+                'expectedResult' => extension_loaded('zookeeper')
+                    ? [
+                        'Zookeeper path needs to be a non-empty string.',
+                        'Zookeeper host is should be set.',
+                    ]
+                    : [
+                        'php extension Zookeeper is not installed.',
+                        'Zookeeper path needs to be a non-empty string.',
+                        'Zookeeper host is should be set.',
+                    ],
             ],
         ];
     }

From 7590f5463e2c9d1554ccaa600bac66ce08b8aaa8 Mon Sep 17 00:00:00 2001
From: Vladimir Fishchenko <hws47a@gmail.com>
Date: Tue, 19 Mar 2019 15:57:28 +0000
Subject: [PATCH 0688/1055] magento/magento-functional-tests-migration#417:
 Convert CreateCustomOrderStatusEntityTest to MFTF - removed unnecessary
 default values

---
 .../AdminOrderStatusFormFillAndSaveActionGroup.xml            | 4 ++--
 .../ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
index cb27439a9d886..8108577145421 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml
@@ -11,8 +11,8 @@
     <!-- Fill Order status form and click save -->
     <actionGroup name="AdminOrderStatusFormFillAndSave">
         <arguments>
-            <argument name="status" type="string" defaultValue=""/>
-            <argument name="label" type="string" defaultValue=""/>
+            <argument name="status" type="string" />
+            <argument name="label" type="string" />
         </arguments>
 
         <fillField stepKey="fillStatusCode" selector="{{AdminOrderStatusFormSection.statusCodeField}}" userInput="{{status}}"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
index bbb6aa71b8938..5f69f52987688 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml
@@ -11,8 +11,8 @@
     <!-- Search order status grid for item with a specific code and validate data -->
     <actionGroup name="AssertOrderStatusExistsInGrid">
         <arguments>
-            <argument name="status" type="string" defaultValue=""/>
-            <argument name="label" type="string" defaultValue=""/>
+            <argument name="status" type="string" />
+            <argument name="label" type="string" />
         </arguments>
 
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>

From cf3452d277ef6e1886729a1e06bf13cc422e1364 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Tue, 19 Mar 2019 11:25:19 -0500
Subject: [PATCH 0689/1055] MC-4865: Convert UpdateStoreEntityTest to MFTF

- Undo change to exisiting selector that would have broke MSI
---
 .../Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml | 2 +-
 .../Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml  | 2 +-
 .../Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml  | 2 +-
 ...minUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml | 2 +-
 .../Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml
index b96d7d222770c..fb36cbd0d1812 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreGroupInGridActionGroup.xml
@@ -18,6 +18,6 @@
         <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
-        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
+        <see selector="{{AdminStoresGridSection.firstRow}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
index b4f290227cd4e..fad8eec9990cc 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
@@ -18,6 +18,6 @@
         <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
-        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewInGridMessage"/>
+        <see selector="{{AdminStoresGridSection.firstRow}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewInGridMessage"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index e222558548c17..d7006fd01b2ff 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -20,7 +20,7 @@
         <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
-        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[{{rownum}}]" parameterized="true"/>
+        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
         <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
         <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
         <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
index 0ced17ab835ab..9c84388d86f99 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
@@ -51,7 +51,7 @@
         <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="openCreatedStoreGroupInGrid">
             <argument name="storeGroupName" value="{{staticStoreGroup.name}}"/>
         </actionGroup>
-        <click selector="{{AdminStoresGridSection.firstRow('1')}}" stepKey="clickFirstRow"/>
+        <click selector="{{AdminStoresGridSection.firstRow}}" stepKey="clickFirstRow"/>
         <waitForPageLoad stepKey="AdminSystemStoreGroupPageToOpen"/>
         <!--Update created Store group as per requirement and accept alert message-->
         <actionGroup ref="EditCustomStoreGroupAcceptWarningMessageActionGroup" stepKey="updateCustomStoreGroup">
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
index 8bc926b321eb1..3d85a34901434 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAndVerifyStoreViewFormTest.xml
@@ -41,7 +41,7 @@
         <actionGroup ref="AssertStoreGroupInGridActionGroup" stepKey="openCreatedStoreGroupInGrid">
             <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
         </actionGroup>
-        <click selector="{{AdminStoresGridSection.firstRow('1')}}" stepKey="clickFirstRow"/>
+        <click selector="{{AdminStoresGridSection.firstRow}}" stepKey="clickFirstRow"/>
         <waitForPageLoad stepKey="AdminSystemStoreGroupPageToOpen"/>
         <!--Update created Store group as per requirement-->
         <actionGroup ref="CreateCustomStore" stepKey="createNewCustomStoreGroup">

From 2cbfb1f08f06b13f5192f043ed7cf377e42a6f4e Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Tue, 19 Mar 2019 19:40:04 +0100
Subject: [PATCH 0690/1055] GraphQL-423: Replaced  as integer parameter

---
 .../Customer/SetShippingMethodsOnCartTest.php | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index d2a8be7f12daf..8d58ff7e77bce 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -77,7 +77,6 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testShippingMethodWithVirtualProduct()
@@ -105,7 +104,7 @@ public function testShippingMethodWithVirtualProduct()
             $maskedQuoteId,
             'flatrate',
             'flatrate_flatrate',
-            $shippingAddress->getId()
+            (int)$shippingAddress->getId()
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -113,7 +112,6 @@ public function testShippingMethodWithVirtualProduct()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testShippingMethodWithSimpleProduct()
@@ -146,7 +144,7 @@ public function testShippingMethodWithSimpleProduct()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $shippingAddress->getId()
+            (int)$shippingAddress->getId()
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -155,7 +153,6 @@ public function testShippingMethodWithSimpleProduct()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testShippingMethodWithSimpleProductWithoutAddress()
@@ -183,7 +180,7 @@ public function testShippingMethodWithSimpleProductWithoutAddress()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $shippingAddress->getId()
+            (int)$shippingAddress->getId()
         );
 
         self::expectExceptionMessage(
@@ -204,7 +201,7 @@ public function testSetShippingMethodWithMissedRequiredParameters()
             $maskedQuoteId,
             '',
             '',
-            '1'
+            1
         );
 
         self::expectExceptionMessage(
@@ -215,7 +212,6 @@ public function testSetShippingMethodWithMissedRequiredParameters()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetNonExistentShippingMethod()
@@ -248,7 +244,7 @@ public function testSetNonExistentShippingMethod()
             $maskedQuoteId,
             'non-existed-method-code',
             'non-existed-carrier-code',
-            $shippingAddress->getId()
+            (int)$shippingAddress->getId()
         );
 
         self::expectExceptionMessage(
@@ -261,7 +257,6 @@ public function testSetNonExistentShippingMethod()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetShippingMethodIfAddressIsNotBelongToCart()
@@ -294,7 +289,7 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            '2'
+            2
         );
 
         self::expectExceptionMessage(
@@ -317,7 +312,7 @@ public function testSetShippingMethodToNonExistentCart()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            '80900'
+            80900
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -340,7 +335,7 @@ public function testSetShippingMethodToGuestCart()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $quote->getShippingAddress()->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         $this->graphQlQuery($mutation);
@@ -363,7 +358,7 @@ public function testSetShippingMethodToAnotherCustomerCart()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $quote->getShippingAddress()->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         self::expectExceptionMessage(
@@ -384,7 +379,7 @@ public function testSetShippingMethodToNonExistentCartAddress()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            '16800'
+            16800
         );
         self::expectExceptionMessage(
             'Could not find a cart address with ID "16800"'
@@ -395,7 +390,6 @@ public function testSetShippingMethodToNonExistentCartAddress()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetShippingMethodToGuestCartAddress()
@@ -410,7 +404,7 @@ public function testSetShippingMethodToGuestCartAddress()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $quote->getShippingAddress()->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         $this->graphQlQuery($mutation);
@@ -419,7 +413,6 @@ public function testSetShippingMethodToGuestCartAddress()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetShippingMethodToAnotherCustomerCartAddress()
@@ -434,7 +427,7 @@ public function testSetShippingMethodToAnotherCustomerCartAddress()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $quote->getShippingAddress()->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         self::expectExceptionMessage(
@@ -445,7 +438,6 @@ public function testSetShippingMethodToAnotherCustomerCartAddress()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetMultipleShippingMethods()
@@ -456,7 +448,7 @@ public function testSetMultipleShippingMethods()
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
 
-        $shippingAddressId = $quote->getShippingAddress()->getId();
+        $shippingAddressId = (int)$quote->getShippingAddress()->getId();
 
         $mutation = <<<MUTATION
 mutation {
@@ -503,7 +495,7 @@ public function testSetMultipleShippingMethods()
      * @param string $maskedQuoteId
      * @param string $shippingMethodCode
      * @param string $shippingCarrierCode
-     * @param string $shippingAddressId
+     * @param int $shippingAddressId
      * @return string
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
@@ -511,7 +503,7 @@ private function prepareMutationQuery(
         string $maskedQuoteId,
         string $shippingMethodCode,
         string $shippingCarrierCode,
-        string $shippingAddressId
+        int $shippingAddressId
     ) : string {
         return <<<QUERY
 mutation {

From 28d82a2146d1b22a2abd6cbdb883ad12ce583086 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 19 Mar 2019 14:00:18 -0500
Subject: [PATCH 0691/1055] MAGETWO-98800: TunnelAction fails when Google Chart
 API is not available

---
 .../Magento/Backend/Controller/Adminhtml/DashboardTest.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
index 07af21505f180..89f1e5e5d53d6 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
@@ -21,6 +21,8 @@ public function testAjaxBlockAction()
 
     public function testTunnelAction()
     {
+        $this->markTestSkipped('MAGETWO-98800: TunnelAction fails when Google Chart API is not available');
+
         $testUrl = \Magento\Backend\Block\Dashboard\Graph::API_URL . '?cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World';
         $handle = curl_init();
         curl_setopt($handle, CURLOPT_URL, $testUrl);

From ef8c8df0e000f73c3a2b6ec09685d3098c750e78 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Tue, 19 Mar 2019 13:18:00 -0500
Subject: [PATCH 0692/1055] Update test case ids and add minor fixes

---
 .../Test/Mftf/Section/AdminCustomerGroupMainSection.xml     | 2 +-
 .../Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml | 6 +++---
 .../Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml | 3 ++-
 .../TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
index 182adeade69fe..4cb7f5e3f628e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGroupMainSection.xml
@@ -15,6 +15,6 @@
         <element name="selectFirstRow" type="button" selector="//button[@class='action-select']"/>
         <element name="deleteBtn" type="button" selector="//*[text()='Delete']"/>
         <element name="clearAllBtn" type="button" selector="//button[text()='Clear all']"/>
-        <element name="editButtonByCustomerGroupCode" type="button" selector="//tr[.//td[count(//th[./*[.='Group']]/preceding-sibling::th) + 1][./*[.='{{code}}']]]//a[contains(@href, '/edit/')]" parametrized="true" />
+        <element name="editButtonByCustomerGroupCode" type="button" selector="//tr[.//td[count(//th[./*[.='Group']]/preceding-sibling::th) + 1][./*[.='{{code}}']]]//a[contains(@href, '/edit/')]" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
index bb17b1b3269b5..648c30b1ca0bb 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml
@@ -13,7 +13,7 @@
             <stories value="Check that field is disabled in system Customer Group"/>
             <title value="Check that field is disabled in system Customer Group"/>
             <description value="Checks that customer_group_code field is disabled in NOT LOGGED IN Customer Group"/>
-            <testCaseId value="MAGETWO-52481"/>
+            <testCaseId value="MC-14206"/>
             <severity value="CRITICAL"/>
             <group value="customers"/>
             <group value="mtf_migrated"/>
@@ -32,7 +32,7 @@
         <click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(NotLoggedInCustomerGroup.code)}}" stepKey="clickOnEditCustomerGroup" />
 
         <!-- 4. Perform all assertions -->
-        <seeInField selector="{{AdminNewCustomerGroupSection.groupName}}" userInput="NOT LOGGED IN" stepKey="seeNotLoggedInTextInGroupName" />
+        <seeInField selector="{{AdminNewCustomerGroupSection.groupName}}" userInput="{{NotLoggedInCustomerGroup.code}}" stepKey="seeNotLoggedInTextInGroupName" />
         <assertElementContainsAttribute selector="{{AdminNewCustomerGroupSection.groupName}}" attribute="disabled" expectedValue="true" stepKey="checkIfGroupNameIsDisabled" />
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
index 4a74a62c947fd..bd6f7ba362bf4 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml
@@ -11,10 +11,11 @@
     <test name="FlushStaticFilesCacheButtonVisibilityTest">
         <annotations>
             <features value="PageCache"/>
+            <stories value="Page Cache"/>
             <title value="Check visibility of flush static files cache button"/>
             <description value="Flush Static Files Cache button visibility"/>
             <severity value="MAJOR"/>
-            <stories value="Check flush static files cache button"/>
+            <testCaseId value="MC-15454"/>
             <group value="production_mode_only"/>
             <group value="pagecache"/>
             <group value="mtf_migrated"/>
diff --git a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
index cbdce59057195..bc529729f1217 100644
--- a/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.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\PageCache\Test\TestCase\FlushStaticFilesCacheButtonVisibilityTest" summary="Flush Static Files Cache button visibility" ticketId="MAGETWO-39934">
         <variation name="FlushStaticFilesCacheButtonVisibilityTest">
-            <data name="tag" xsi:type="string">severity:S3</data>
+            <data name="tag" xsi:type="string">severity:S3, mftf_migrated:yes</data>
             <constraint name="Magento\PageCache\Test\Constraint\AssertFlushStaticFilesCacheButtonVisibility" />
         </variation>
     </testCase>

From 6ddeaafb1b1f116cfff2151f6086dab67cc25f0d Mon Sep 17 00:00:00 2001
From: nasanabri <45367318+nasanabri@users.noreply.github.com>
Date: Tue, 19 Mar 2019 18:41:44 -0500
Subject: [PATCH 0693/1055] Fix typo

---
 lib/internal/Magento/Framework/Oauth/Oauth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Oauth/Oauth.php b/lib/internal/Magento/Framework/Oauth/Oauth.php
index 5e48fb5ed30f9..e560fd664493b 100644
--- a/lib/internal/Magento/Framework/Oauth/Oauth.php
+++ b/lib/internal/Magento/Framework/Oauth/Oauth.php
@@ -199,7 +199,7 @@ protected function _validateSignature($params, $consumerSecret, $httpMethod, $re
         );
 
         if (!Security::compareStrings($calculatedSign, $params['oauth_signature'])) {
-            throw new Exception(new Phrase('The signatire is invalid. Verify and try again.'));
+            throw new Exception(new Phrase('The signature is invalid. Verify and try again.'));
         }
     }
 

From 940163e8b25414ea34010d131815123a26bbe781 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Tue, 19 Mar 2019 20:09:55 -0500
Subject: [PATCH 0694/1055] magento-engcom/magento2ce#2688: Skipped unstable
 test

---
 .../Magento/Backend/Controller/Adminhtml/DashboardTest.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
index 07af21505f180..89f1e5e5d53d6 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
@@ -21,6 +21,8 @@ public function testAjaxBlockAction()
 
     public function testTunnelAction()
     {
+        $this->markTestSkipped('MAGETWO-98800: TunnelAction fails when Google Chart API is not available');
+
         $testUrl = \Magento\Backend\Block\Dashboard\Graph::API_URL . '?cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World';
         $handle = curl_init();
         curl_setopt($handle, CURLOPT_URL, $testUrl);

From 4e10da635640e890a42840a78eae5eee22dd53a2 Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Tue, 19 Mar 2019 16:48:51 +0200
Subject: [PATCH 0695/1055] graphQl-470: Creating/getting Cart queries should
 support Store context

---
 .../Model/Cart/GetCartForUser.php             | 20 ++++++-
 .../Quote/Customer/CreateEmptyCartTest.php    | 53 +++++++++++++++++++
 .../GraphQl/Quote/Customer/GetCartTest.php    | 52 ++++++++++++++++++
 .../Quote/Guest/CreateEmptyCartTest.php       | 24 +++++++++
 .../GraphQl/Quote/Guest/GetCartTest.php       | 48 +++++++++++++++++
 .../_files/active_quote_not_default_store.php | 23 ++++++++
 ...ctive_quote_not_default_store_rollback.php |  8 +++
 7 files changed, 227 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index 145e9c01980a5..ea86dca06271a 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -13,6 +13,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
 use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Get cart
@@ -29,16 +30,24 @@ class GetCartForUser
      */
     private $cartRepository;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      * @param CartRepositoryInterface $cartRepository
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
-        CartRepositoryInterface $cartRepository
+        CartRepositoryInterface $cartRepository,
+        StoreManagerInterface $storeManager
     ) {
         $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
         $this->cartRepository = $cartRepository;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -75,6 +84,15 @@ public function execute(string $cartHash, ?int $customerId): Quote
             );
         }
 
+        if ((int)$cart->getStoreId() !== (int)$this->storeManager->getStore()->getId()) {
+            throw new GraphQlAuthorizationException(
+                __(
+                    'Wrong store code specified for cart "%masked_cart_id"',
+                    ['masked_cart_id' => $cartHash]
+                )
+            );
+        }
+
         $cartCustomerId = (int)$cart->getCustomerId();
 
         /* Guest cart, allow operations */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
index 0cb8a38b0cb5e..7539945456530 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -27,11 +28,17 @@ class CreateEmptyCartTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->resourceConnection = $objectManager->get(ResourceConnection::class);
     }
 
     /**
@@ -57,5 +64,51 @@ public function testCreateEmptyCart()
 
         self::assertNotNull($guestCart->getId());
         self::assertEquals(1, $guestCart->getCustomer()->getId());
+        self::assertSame('default', $guestCart->getStore()->getCode());
+
+        $this->deleteCreatedQuote($guestCart->getId());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testCreateEmptyCartWithNotDefaultStore()
+    {
+        $query = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+
+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken, 'Store' => 'fixture_second_store'];
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('createEmptyCart', $response);
+
+        $maskedCartId = $response['createEmptyCart'];
+        /* guestCartRepository is used for registered customer to get the cart hash */
+        $guestCart = $this->guestCartRepository->get($maskedCartId);
+
+        self::assertNotNull($guestCart->getId());
+        self::assertEquals(1, $guestCart->getCustomer()->getId());
+        self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
+
+        $this->deleteCreatedQuote($guestCart->getId());
+    }
+
+    /**
+     * Delete active quote for customer by customer id.
+     * This is needed to have ability to create new quote for another store and not return the active one.
+     * @see QuoteManagement::createCustomerCart
+     *
+     * @param $quoteId
+     */
+    private function deleteCreatedQuote($quoteId)
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $connection->query('DELETE FROM quote WHERE entity_id = ' . $quoteId);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index 4b1509eef354e..6581fae63e9e3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -134,6 +134,58 @@ public function testGetInactiveCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     */
+    public function testGetCartWithNotDefaultStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = $this->getHeaderMap();
+        $headerMap['Store'] = 'fixture_second_store';
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('items', $response['cart']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Wrong store code specified for cart
+     */
+    public function testGetCartWithWrongStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = $this->getHeaderMap();
+        $headerMap['Store'] = 'fixture_second_store';
+
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Store code not_existing_store does not exist
+     */
+    public function testGetCartWithNotExistingStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = $this->getHeaderMap();
+        $headerMap['Store'] = 'not_existing_store';
+
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
index 4fd398439913e..b283e7ef721a8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
@@ -44,4 +44,28 @@ public function testCreateEmptyCart()
         self::assertNotNull($guestCart->getId());
         self::assertNull($guestCart->getCustomer()->getId());
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     */
+    public function testCreateEmptyCartWithNotDefaultStore()
+    {
+        $query = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+        $headerMap = ['Store' => 'fixture_second_store'];
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('createEmptyCart', $response);
+
+        $maskedCartId = $response['createEmptyCart'];
+        $guestCart = $this->guestCartRepository->get($maskedCartId);
+
+        self::assertNotNull($guestCart->getId());
+        self::assertNull($guestCart->getCustomer()->getId());
+        self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 916d5951b0ff2..46c33faa088e8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -115,6 +115,54 @@ public function testGetInactiveCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     */
+    public function testGetCartWithNotDefaultStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = ['Store' => 'fixture_second_store'];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('items', $response['cart']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Wrong store code specified for cart
+     */
+    public function testGetCartWithWrongStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = ['Store' => 'fixture_second_store'];
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Store code not_existing_store does not exist
+     */
+    public function testGetCartWithNotExistingStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+
+        $headerMap['Store'] = 'not_existing_store';
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php
new file mode 100644
index 0000000000000..6448a570424e2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+include 'testsuite/Magento/Store/_files/second_store.php';
+include 'testsuite/Magento/Customer/_files/customer.php';
+
+$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+$quote->setStoreId($store->getId())
+    ->setIsActive(true)
+    ->setIsMultiShipping(false)
+    ->setReservedOrderId('test_order_1_not_default_store')
+    ->setCustomerId($customer->getId())
+    ->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();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php
new file mode 100644
index 0000000000000..e3e1513cb6144
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_order_1_not_default_store', 'reserved_order_id')->delete();

From f8b9147302c6a5c81ee180f13ebc2bc544c5fea3 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 20 Mar 2019 10:57:41 +0200
Subject: [PATCH 0696/1055] Reverting the PR#20861 changes because of violating
 accessibility standards

---
 lib/web/css/source/lib/_resets.less | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/web/css/source/lib/_resets.less b/lib/web/css/source/lib/_resets.less
index 4499c314ce6ca..08d16842b849c 100644
--- a/lib/web/css/source/lib/_resets.less
+++ b/lib/web/css/source/lib/_resets.less
@@ -105,13 +105,6 @@
             .lib-css(box-shadow, @focus__box-shadow);
         }
     }
-
-    input[type="radio"],
-    input[type="checkbox"] {
-        &:focus { 
-            box-shadow: none;
-        }
-    }
 }
 
 //

From 325929860f5bf99e7731d48eb5574862ef9eb09c Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 20 Mar 2019 11:10:14 +0200
Subject: [PATCH 0697/1055] magento/graphql-ce#480: [Test Coverage]
 'GetBillingAddress' functionality 1. Added missed quoteIdMask rollback

---
 .../_files/guest_quote_with_addresses.php     | 43 +++++++++----------
 .../guest_quote_with_addresses_rollback.php   | 13 +++++-
 2 files changed, 32 insertions(+), 24 deletions(-)

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
index c97d20b2f8b48..d1baee478e03d 100644
--- 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
@@ -12,29 +12,26 @@
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
-try {
-    /** @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();
-} catch (\Magento\Framework\Exception\AlreadyExistsException $exception) {
-    //Product already exists
-}
+/** @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')
+    ->setUrlKey('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();
 $product = $productRepository->get('simple-product-guest-quote');
 
 $addressData = reset($addresses);
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
index 02c42153b72c3..40314b84154c4 100644
--- 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
@@ -13,9 +13,15 @@
 
 /** @var $quote \Magento\Quote\Model\Quote */
 $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
+
 $quote->load('guest_quote', 'reserved_order_id');
-if ($quote->getId()) {
+
+$quoteId = $quote->getId();
+if ($quoteId > 0) {
     $quote->delete();
+    $quoteIdMask->delete($quoteId);
 }
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
@@ -28,5 +34,10 @@
     //Product already removed
 }
 
+/** @var \Magento\CatalogInventory\Model\StockRegistryStorage $stockRegistryStorage */
+$stockRegistryStorage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\CatalogInventory\Model\StockRegistryStorage::class);
+$stockRegistryStorage->clean();
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);

From adf2d647b71c869b93f725b4af5f2e390270400c Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 20 Mar 2019 11:11:01 +0200
Subject: [PATCH 0698/1055] Static tests fix.

---
 lib/internal/Magento/Framework/Oauth/Oauth.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Oauth/Oauth.php b/lib/internal/Magento/Framework/Oauth/Oauth.php
index e560fd664493b..919b0e4c86ba0 100644
--- a/lib/internal/Magento/Framework/Oauth/Oauth.php
+++ b/lib/internal/Magento/Framework/Oauth/Oauth.php
@@ -9,6 +9,9 @@
 use Magento\Framework\Encryption\Helper\Security;
 use Magento\Framework\Phrase;
 
+/**
+ * Authorization service.
+ */
 class Oauth implements OauthInterface
 {
     /**
@@ -61,7 +64,7 @@ public static function getSupportedSignatureMethods()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRequestToken($params, $requestUrl, $httpMethod = 'POST')
     {
@@ -74,7 +77,7 @@ public function getRequestToken($params, $requestUrl, $httpMethod = 'POST')
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAccessToken($params, $requestUrl, $httpMethod = 'POST')
     {
@@ -102,7 +105,7 @@ public function getAccessToken($params, $requestUrl, $httpMethod = 'POST')
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validateAccessTokenRequest($params, $requestUrl, $httpMethod = 'POST')
     {
@@ -125,7 +128,7 @@ public function validateAccessTokenRequest($params, $requestUrl, $httpMethod = '
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validateAccessToken($accessToken)
     {
@@ -133,7 +136,7 @@ public function validateAccessToken($accessToken)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function buildAuthorizationHeader(
         $params,

From d85fd44346a024cd3f4f61f28dbd50a9ba8074a1 Mon Sep 17 00:00:00 2001
From: vbmagento <vaibhavbhalerao.15@gmail.com>
Date: Wed, 20 Mar 2019 09:57:01 +0000
Subject: [PATCH 0699/1055] Add comment in xml file

---
 .../view/adminhtml/layout/adminhtml_url_rewrite_index.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
index 10f73829ada2c..e32397921a032 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
@@ -14,6 +14,7 @@
                         <argument name="id" xsi:type="string">urlrewriteGrid</argument>
                         <argument name="dataSource" xsi:type="object">Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection</argument>
                         <argument name="default_sort" xsi:type="string">url_rewrite_id</argument>
+						<!-- Add below argument to save session parameter in URL rewrite grid -->
 						<argument name="save_parameters_in_session" xsi:type="string">1</argument>
                     </arguments>
                     <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.url_rewrite.grid.columnSet">

From 776344f1970324f3d5fd4af87eb75c1ec4967ccf Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Tue, 19 Mar 2019 16:11:57 +0300
Subject: [PATCH 0700/1055] MAGETWO-91523: [2.3] Allowed countries restriction
 for a default website is applied to backend customer grid

- Updated automated test script.
---
 .../Test/AllowedCountriesRestrictionApplyOnBackendTest.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
index 5939d5cdaada7..d48320123f82d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -26,16 +26,16 @@
 
             <!--Create new website,store and store view-->
             <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="goToAdminSystemStorePage"/>
-            <actionGroup ref="AdminCreateWebsite" stepKey="AdminCreateNewWebsite">
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateNewWebsite">
                 <argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
                 <argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateNewStore" stepKey="AdminCreateNewStore">
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateNewStore">
                 <argument name="website" value="{{NewWebSiteData.name}}"/>
                 <argument name="storeGroupName" value="{{NewStoreData.name}}"/>
                 <argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateStoreView" stepKey="AdminCreateNewStoreView">
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateNewStoreView">
                 <argument name="StoreGroup" value="NewStoreData"/>
             </actionGroup>
             <!--Set account sharing option - Default value is 'Per Website'-->

From 933d35d903dfc135d9f753073fd87802f2d57a12 Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Wed, 20 Mar 2019 12:15:51 +0200
Subject: [PATCH 0701/1055] #20825 Missing required argument
 $productAvailabilityChecks of
 Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker.

---
 .../Magento/ConfigurableProductSales/etc/di.xml  | 16 ++++++++++++++++
 app/code/Magento/Sales/etc/di.xml                |  4 +---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/ConfigurableProductSales/etc/di.xml

diff --git a/app/code/Magento/ConfigurableProductSales/etc/di.xml b/app/code/Magento/ConfigurableProductSales/etc/di.xml
new file mode 100644
index 0000000000000..b53faf74ffa1d
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductSales/etc/di.xml
@@ -0,0 +1,16 @@
+<?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\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker">
+        <arguments>
+            <argument name="productAvailabilityChecks" xsi:type="array">
+                <item name="configurable" xsi:type="object">Magento\ConfigurableProductSales\Model\Order\Reorder\OrderedProductAvailabilityChecker</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index 6ed230861e4d0..68fcd17122bd2 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -1017,9 +1017,7 @@
             type="Magento\Sales\Model\Order\OrderCustomerDelegate" />
     <type name="Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker">
         <arguments>
-            <argument name="productAvailabilityChecks" xsi:type="array">
-                <item name="configurable" xsi:type="object">Magento\ConfigurableProductSales\Model\Order\Reorder\OrderedProductAvailabilityChecker</item>
-            </argument>
+            <argument name="productAvailabilityChecks" xsi:type="array" />
         </arguments>
     </type>
 </config>

From 52d71a5a39222a00a8f14d7c59f717420dfd8f16 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 20 Mar 2019 12:09:56 +0100
Subject: [PATCH 0702/1055] Refactoring

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  2 +-
 .../Section/CheckoutCartProductSection.xml    |  3 -
 ...UpdateShoppingCartSimpleProductQtyTest.xml | 58 ++++++++++++++++++
 ...SimpleWithCustomOptionsProductQtyTest.xml} | 61 ++-----------------
 .../Test/TestCase/UpdateShoppingCartTest.xml  |  2 +
 5 files changed, 66 insertions(+), 60 deletions(-)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
 rename app/code/Magento/Checkout/Test/Mftf/Test/{StorefrontUpdateShoppingCartTest.xml => StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml} (50%)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 44635e9b93f9a..6a712fde28025 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -386,7 +386,7 @@
         <var key="sku" entityType="product" entityKey="sku" />
         <requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
     </entity>
-    <entity name="productWithOptions3" type="product">
+    <entity name="ProductWithTextFieldAndAreaOptions" type="product">
         <var key="sku" entityType="product" entityKey="sku" />
         <requiredEntity type="product_option">ProductOptionField</requiredEntity>
         <requiredEntity type="product_option">ProductOptionArea</requiredEntity>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index a63dc5be2de30..dcfb12fd4e965 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -15,9 +15,6 @@
         <element name="ProductPriceByName" type="text"
                  selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'price')]//span[@class='price']"
                  parameterized="true"/>
-        <element name="ProductSubtotalByName" type="text"
-                 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="ProductImageByName" type="text"
                  selector="//main//table[@id='shopping-cart-table']//tbody//tr//img[contains(@class, 'product-image-photo') and @alt='{{var1}}']"
                  parameterized="true"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
new file mode 100644
index 0000000000000..36eb10826e63c
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
@@ -0,0 +1,58 @@
+<?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="StorefrontUpdateShoppingCartSimpleProductQtyTest">
+        <annotations>
+            <features value="Checkout"/>
+            <title value="Check updating shopping cart while updating items qty"/>
+            <description value="Check updating shopping cart while updating items qty"/>
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Add the newly created product to the shopping cart -->
+            <actionGroup ref="AddSimpleProductToCart" stepKey="addToCartFromStorefrontProductPage">
+                <argument name="product" value="$$createProduct$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Go to the shopping cart -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad1"/>
+
+        <!-- Change the product QTY -->
+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="3" stepKey="changeCartQty"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="openShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad2"/>
+
+        <!-- The price and QTY values should be updated for the product -->
+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
+        <see userInput="$369" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
+        <assertEquals expected="3" actual="$grabProductQtyInCart" stepKey="assertProductQtyInCart"/>
+
+        <!-- Subtotal should be updated -->
+        <see userInput="$369" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertCartSubtotal"/>
+
+        <!-- Minicart product price and subtotal should be updated -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
+        <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
+        <assertEquals expected="3" actual="$grabProductQtyInMinicart" stepKey="assertProductQtyInMinicart"/>
+        <see userInput="$369" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
similarity index 50%
rename from app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartTest.xml
rename to app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
index 94abf4b26c347..654a8b231c63c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
@@ -7,58 +7,8 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="UpdateShoppingCartTestVariation1">
-        <annotations>
-            <features value="Checkout"/>
-            <title value="Check updating shopping cart while updating items qty"/>
-            <description value="Check updating shopping cart while updating items qty"/>
-            <group value="shoppingCart"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="SimpleProduct" stepKey="createProduct">
-                <requiredEntity createDataKey="createCategory"/>
-                <field key="price">100</field>
-            </createData>
-
-            <!-- Add the newly created product to the shopping cart -->
-            <amOnPage url="$$createProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
-            <waitForPageLoad stepKey="waitForCatalogPageLoad1"/>
-            <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage1">
-                <argument name="productName" value="$$createProduct.name$$"/>
-            </actionGroup>
-        </before>
-        <after>
-            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-        </after>
-
-        <!-- Go to the shopping cart -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
-        <waitForPageLoad stepKey="waitForCheckoutPageLoad1"/>
-
-        <!-- Change the product QTY -->
-        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="3" stepKey="changeCartQty"/>
-        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="openShoppingCart"/>
-        <waitForPageLoad stepKey="waitForCheckoutPageLoad2"/>
-
-        <!-- The price and QTY values should be updated for the product -->
-        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
-        <see userInput="$300" selector="{{CheckoutCartProductSection.ProductSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
-        <assertEquals expected="3" actual="$grabProductQtyInCart" stepKey="assertProductQtyInCart"/>
-
-        <!-- Subtotal should be updated -->
-        <see userInput="$300" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertCartSubtotal"/>
-
-        <!-- Minicart product price and subtotal should be updated -->
-        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
-        <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
-        <assertEquals expected="3" actual="$grabProductQtyInMinicart" stepKey="assertProductQtyInMinicart"/>
-        <see userInput="$300" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
-    </test>
-    <test name="UpdateShoppingCartTestVariation2">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest">
         <annotations>
             <features value="Checkout"/>
             <title value="Check updating shopping cart while updating qty of items with custom options"/>
@@ -68,13 +18,12 @@
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="SimpleProduct" stepKey="createProduct">
+            <createData entity="ApiSimpleProductWithCustomPrice" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
-                <field key="price">100</field>
             </createData>
 
             <!-- Add two custom options to the product: field and textarea -->
-            <updateData createDataKey="createProduct" entity="productWithOptions3" stepKey="updateProductWithOption"/>
+            <updateData createDataKey="createProduct" entity="ProductWithTextFieldAndAreaOptions" stepKey="updateProductWithOption"/>
 
             <!-- Go to the product page, fill the custom options values and add the product to the shopping cart -->
             <amOnPage url="{{StorefrontHomePage.url}}$createProduct.custom_attributes[url_key]$.html" stepKey="amOnProductPage"/>
@@ -101,7 +50,7 @@
 
         <!-- The price and QTY values should be updated for the product -->
         <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
-        <see userInput="$1,320.00" selector="{{CheckoutCartProductSection.ProductSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
+        <see userInput="$1,320.00" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
         <assertEquals expected="11" actual="$grabProductQtyInCart" stepKey="assertProductQtyInCart"/>
         <see userInput="$1,320.00" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
 
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
index e0ea721a51f1b..43acf9cd740d1 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.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\Checkout\Test\TestCase\UpdateShoppingCartTest" summary="Update Shopping Cart" ticketId="MAGETWO-25081">
         <variation name="UpdateShoppingCartTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="tag" xsi:type="string">severity:S0</data>
             <data name="product/dataset" xsi:type="string">default</data>
             <data name="product/data/price/value" xsi:type="string">100</data>
@@ -20,6 +21,7 @@
             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" />
         </variation>
         <variation name="UpdateShoppingCartTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="tag" xsi:type="string">severity:S0</data>
             <data name="product/dataset" xsi:type="string">with_two_custom_option</data>
             <data name="product/data/price/value" xsi:type="string">50</data>

From 24f4d9ad2e0448fc532346bdab55ace29692848c Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 20 Mar 2019 14:11:18 +0200
Subject: [PATCH 0703/1055] Fix static and unit tests.

---
 .../Adminhtml/Order/Shipment/AddTrack.php     |  14 +-
 .../Adminhtml/Order/Shipment/AddTrackTest.php | 145 +++++++++++-------
 2 files changed, 99 insertions(+), 60 deletions(-)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
index 8abc74b50a00e..4ec7117783aab 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
@@ -8,18 +8,20 @@
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Sales\Api\Data\ShipmentTrackInterfaceFactory;
 use Magento\Sales\Api\ShipmentRepositoryInterface;
-use Magento\Sales\Model\Order\Shipment\TrackFactory;
 use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
 
-class AddTrack extends \Magento\Backend\App\Action
+/**
+ * Add new tracking number to shipment controller.
+ */
+class AddTrack extends Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -39,7 +41,7 @@ class AddTrack extends \Magento\Backend\App\Action
     private $shipmentRepository;
 
     /**
-     * @var TrackFactory
+     * @var ShipmentTrackInterfaceFactory
      */
     private $trackFactory;
 
@@ -52,14 +54,14 @@ class AddTrack extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param ShipmentLoader $shipmentLoader
      * @param ShipmentRepositoryInterface|null $shipmentRepository
-     * @param TrackFactory|null $trackFactory
+     * @param ShipmentTrackInterfaceFactory|null $trackFactory
      * @param SerializerInterface|null $serializer
      */
     public function __construct(
         Action\Context $context,
         ShipmentLoader $shipmentLoader,
         ShipmentRepositoryInterface $shipmentRepository = null,
-        TrackFactory $trackFactory = null,
+        ShipmentTrackInterfaceFactory $trackFactory = null,
         SerializerInterface $serializer = null
     ) {
         parent::__construct($context);
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
index cf3bf68e10416..1c9cdb1fa7d5b 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
@@ -6,127 +6,162 @@
 
 namespace Magento\Shipping\Test\Unit\Controller\Adminhtml\Order\Shipment;
 
-use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\App\ViewInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Framework\View\Page\Config;
+use Magento\Framework\View\Page\Title;
+use Magento\Framework\View\Result\Page;
+use Magento\Sales\Api\Data\ShipmentTrackInterfaceFactory;
+use Magento\Sales\Model\Order\Shipment;
+use Magento\Sales\Model\Order\Shipment\Track;
+use Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack;
+use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
 
 /**
- * Class AddTrackTest
+ * Class AddTrackTest covers AddTrack controller.
  *
- * @package Magento\Shipping\Controller\Adminhtml\Order\Shipment
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddTrackTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader|\PHPUnit_Framework_MockObject_MockObject
+     * @var ShipmentLoader|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $shipmentLoader;
+    private $shipmentLoader;
 
     /**
-     * @var \Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack
+     * @var AddTrack
      */
-    protected $controller;
+    private $controller;
 
     /**
-     * @var Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $context;
+    private $context;
 
     /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     * @var Http|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $request;
+    private $request;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $response;
+    private $response;
 
     /**
-     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var  ViewInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $objectManager;
+    private $view;
 
     /**
-     * @var  \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Page|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $view;
+    private $resultPageMock;
 
     /**
-     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $resultPageMock;
+    private $pageConfigMock;
 
     /**
-     * @var \Magento\Framework\View\Page\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Title|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $pageConfigMock;
+    private $pageTitleMock;
 
     /**
-     * @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
+     * @var ShipmentTrackInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $pageTitleMock;
+    private $trackFactory;
 
+    /**
+     * @var ResultInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $rawResult;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->shipmentLoader = $this->getMockBuilder(
-            \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader::class
+            ShipmentLoader::class
         )
             ->disableOriginalConstructor()
             ->setMethods(['setShipmentId', 'setOrderId', 'setShipment', 'setTracking', 'load'])
             ->getMock();
         $this->context = $this->createPartialMock(
-            \Magento\Backend\App\Action\Context::class,
+            Context::class,
             [
                 'getRequest',
                 'getResponse',
                 'getRedirect',
                 'getObjectManager',
                 'getTitle',
-                'getView'
+                'getView',
+                'getResultFactory'
             ]
         );
         $this->response = $this->createPartialMock(
-            \Magento\Framework\App\ResponseInterface::class,
+            ResponseInterface::class,
             ['setRedirect', 'sendResponse', 'setBody']
         );
-        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+        $this->request = $this->getMockBuilder(Http::class)
             ->disableOriginalConstructor()->getMock();
-        $this->objectManager = $this->createPartialMock(
-            \Magento\Framework\ObjectManager\ObjectManager::class,
-            ['create', 'get']
-        );
-        $this->view = $this->createMock(\Magento\Framework\App\ViewInterface::class);
-        $this->resultPageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
+        $this->view = $this->createMock(ViewInterface::class);
+        $this->resultPageMock = $this->getMockBuilder(Page::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->pageConfigMock = $this->getMockBuilder(\Magento\Framework\View\Page\Config::class)
+        $this->pageConfigMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->pageTitleMock = $this->getMockBuilder(\Magento\Framework\View\Page\Title::class)
+        $this->pageTitleMock = $this->getMockBuilder(Title::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->trackFactory = $this->getMockBuilder(ShipmentTrackInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
+        $this->rawResult = $this->getMockBuilder(ResultInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setContents'])
+            ->getMockForAbstractClass();
+        $resultFactory = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMockForAbstractClass();
         $this->context->expects($this->once())
             ->method('getRequest')
             ->will($this->returnValue($this->request));
         $this->context->expects($this->once())
             ->method('getResponse')
             ->will($this->returnValue($this->response));
-        $this->context->expects($this->once())
-            ->method('getObjectManager')
-            ->will($this->returnValue($this->objectManager));
         $this->context->expects($this->once())
             ->method('getView')
             ->will($this->returnValue($this->view));
+        $resultFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($this->rawResult);
+        $this->context->expects($this->once())
+            ->method('getResultFactory')
+            ->willReturn($resultFactory);
         $this->controller = $objectManagerHelper->getObject(
-            \Magento\Shipping\Controller\Adminhtml\Order\Shipment\AddTrack::class,
+            AddTrack::class,
             [
                 'context' => $this->context,
                 'shipmentLoader' => $this->shipmentLoader,
                 'request' => $this->request,
                 'response' => $this->response,
-                'view' => $this->view
+                'view' => $this->view,
+                'trackFactory' => $this->trackFactory,
             ]
         );
     }
@@ -144,7 +179,7 @@ public function testExecute()
         $tracking = [];
         $shipmentData = ['items' => [], 'send_email' => ''];
         $shipment = $this->createPartialMock(
-            \Magento\Sales\Model\Order\Shipment::class,
+            Shipment::class,
             ['addTrack', '__wakeup', 'save']
         );
         $this->request->expects($this->any())
@@ -152,8 +187,10 @@ public function testExecute()
             ->will(
                 $this->returnValueMap(
                     [
-                        ['order_id', null, $orderId], ['shipment_id', null, $shipmentId],
-                        ['shipment', null, $shipmentData], ['tracking', null, $tracking],
+                        ['order_id', null, $orderId],
+                        ['shipment_id', null, $shipmentId],
+                        ['shipment', null, $shipmentData],
+                        ['tracking', null, $tracking],
                     ]
                 )
             );
@@ -183,14 +220,13 @@ public function testExecute()
         $this->shipmentLoader->expects($this->once())
             ->method('load')
             ->will($this->returnValue($shipment));
-        $track = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment\Track::class)
+        $track = $this->getMockBuilder(Track::class)
             ->disableOriginalConstructor()
             ->setMethods(['__wakeup', 'setNumber', 'setCarrierCode', 'setTitle'])
             ->getMock();
-        $this->objectManager->expects($this->atLeastOnce())
+        $this->trackFactory->expects($this->once())
             ->method('create')
-            ->with(\Magento\Sales\Model\Order\Shipment\Track::class)
-            ->will($this->returnValue($track));
+            ->willReturn($track);
         $track->expects($this->once())
             ->method('setNumber')
             ->with($number)
@@ -206,8 +242,8 @@ public function testExecute()
         $this->view->expects($this->once())
             ->method('loadLayout')
             ->will($this->returnSelf());
-        $layout = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
-        $menuBlock = $this->createPartialMock(\Magento\Framework\View\Element\BlockInterface::class, ['toHtml']);
+        $layout = $this->createMock(LayoutInterface::class);
+        $menuBlock = $this->createPartialMock(BlockInterface::class, ['toHtml']);
         $html = 'html string';
         $this->view->expects($this->once())
             ->method('getLayout')
@@ -235,9 +271,10 @@ public function testExecute()
         $this->pageConfigMock->expects($this->any())
             ->method('getTitle')
             ->willReturn($this->pageTitleMock);
-        $this->response->expects($this->once())
-            ->method('setBody')
-            ->with($html);
-        $this->assertNull($this->controller->execute());
+        $this->rawResult->expects($this->once())
+            ->method('setContents')
+            ->with($html)
+            ->willReturnSelf();
+        $this->assertInstanceOf(ResultInterface::class, $this->controller->execute());
     }
 }

From a07956c5a2336fb48b86e9585e7e18882691e31c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 20 Mar 2019 14:59:54 +0200
Subject: [PATCH 0704/1055] ENGCOM-4531: Static tests fix.

---
 .../Magento/AsynchronousOperations/Model/MassSchedule.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
index 3ab6dc12054be..89d468159c6e9 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -143,7 +143,9 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
                 $operations[] = $operation;
                 $requestItem->setId($key);
                 $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);
-                $requestItem->setDataHash($this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256));
+                $requestItem->setDataHash(
+                    $this->encryptor->hash($operation->getSerializedData(), Encryptor::HASH_VERSION_SHA256)
+                );
                 $requestItems[] = $requestItem;
             } catch (\Exception $exception) {
                 $this->logger->error($exception);

From f75b3e9eba8192fef0116d63832aa375b22a1848 Mon Sep 17 00:00:00 2001
From: Vaibhav Bhalerao <vaibhavbhalerao.15@gmail.com>
Date: Wed, 20 Mar 2019 18:40:37 +0530
Subject: [PATCH 0705/1055] Update adminhtml_url_rewrite_index.xml

Used spaces instead of tabs
---
 .../view/adminhtml/layout/adminhtml_url_rewrite_index.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
index e32397921a032..bae22d0a10385 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
@@ -14,8 +14,8 @@
                         <argument name="id" xsi:type="string">urlrewriteGrid</argument>
                         <argument name="dataSource" xsi:type="object">Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection</argument>
                         <argument name="default_sort" xsi:type="string">url_rewrite_id</argument>
-						<!-- Add below argument to save session parameter in URL rewrite grid -->
-						<argument name="save_parameters_in_session" xsi:type="string">1</argument>
+			<!-- Add below argument to save session parameter in URL rewrite grid -->
+			<argument name="save_parameters_in_session" xsi:type="string">1</argument>
                     </arguments>
                     <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.url_rewrite.grid.columnSet">
                         <arguments>

From 2efa3088925324ecd3c3e24951d2dfb8aa8a46d5 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Wed, 20 Mar 2019 15:18:47 +0200
Subject: [PATCH 0706/1055] Resolve random fails on Bamboo with
 \Magento\GraphQl\Quote\CouponTest::testApplyCouponToCartWithNoItems

---
 .../testsuite/Magento/GraphQl/Quote/CouponTest.php        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
index 54fdc3ac0f360..ce409bbcfb0a8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
@@ -92,14 +92,16 @@ public function testApplyCouponTwice()
      */
     public function testApplyCouponToCartWithNoItems()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/191');
         $couponCode = '2?ds5!2d';
 
         $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $cartId = (int)$this->quote->getId();
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute($cartId);
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
 
-        self::expectExceptionMessageRegExp('/Cart doesn\'t contain products/');
+        self::expectExceptionMessage(
+            str_replace('$cartId', $cartId, 'The "$cartId" Cart doesn\'t contain products.')
+        );
         $this->graphQlQuery($query);
     }
 

From d5a61c01cec3429d9fb93c1a56b78a264b06ba45 Mon Sep 17 00:00:00 2001
From: Vaibhav Bhalerao <vaibhavbhalerao.15@gmail.com>
Date: Wed, 20 Mar 2019 19:15:19 +0530
Subject: [PATCH 0707/1055] Update adminhtml_url_rewrite_index.xml

---
 .../view/adminhtml/layout/adminhtml_url_rewrite_index.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
index bae22d0a10385..de8575178d06d 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
@@ -14,8 +14,8 @@
                         <argument name="id" xsi:type="string">urlrewriteGrid</argument>
                         <argument name="dataSource" xsi:type="object">Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection</argument>
                         <argument name="default_sort" xsi:type="string">url_rewrite_id</argument>
-			<!-- Add below argument to save session parameter in URL rewrite grid -->
-			<argument name="save_parameters_in_session" xsi:type="string">1</argument>
+                        <!-- Add below argument to save session parameter in URL rewrite grid -->
+                        <argument name="save_parameters_in_session" xsi:type="string">1</argument>
                     </arguments>
                     <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.url_rewrite.grid.columnSet">
                         <arguments>

From 2f8a6e116348ad7c77107b80b3f189a94a8c6e66 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 20 Mar 2019 15:46:40 +0200
Subject: [PATCH 0708/1055] 480 - [Test Coverage] 'GetBillingAddress'
 functionality 1. Fix for 1)
 Magento\GraphQl\Quote\Customer\GetBillingAddressTest::testGetBillingAddressFromAnotherCustomerCart
 Magento\Framework\Exception\NoSuchEntityException: No such entity with cartId
 = 0

---
 .../Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
index 574e17721db57..208bf97489dfc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
@@ -91,7 +91,7 @@ public function testGetCartWithBillingAddress()
      */
     public function testGetBillingAddressFromAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );

From 50ce1f5db56976fdd5f2818fdcd5d37c7382f38c Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 20 Mar 2019 15:51:27 +0200
Subject: [PATCH 0709/1055] Fix static tests.

---
 app/code/Magento/Customer/Block/Address/Grid.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index 492343acfe306..963efc648d94b 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -1,9 +1,10 @@
 <?php
-declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Block\Address;
 
 use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
@@ -237,7 +238,10 @@ private function getAddressCollection(): \Magento\Customer\Model\ResourceModel\A
             /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
             $collection = $this->addressCollectionFactory->create();
             $collection->setOrder('entity_id', 'desc');
-            $collection->addFieldToFilter('entity_id', array('nin' => array($this->getDefaultBilling(), $this->getDefaultShipping())));
+            $collection->addFieldToFilter(
+                'entity_id',
+                ['nin' => [$this->getDefaultBilling(), $this->getDefaultShipping()]]
+            );
             $collection->setCustomerFilter([$this->getCustomer()->getId()]);
             $this->addressCollection = $collection;
         }

From 37b535229f9d8bc9e09b9909a875131d6642d1b7 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Wed, 20 Mar 2019 09:40:51 -0500
Subject: [PATCH 0710/1055] MC-13613: Product mass update

---
 .../Test/Mftf/Test/AdminExportBundleProductTest.xml          | 3 +++
 .../Test/AdminExportGroupedProductWithSpecialPriceTest.xml   | 3 +++
 ...ortSimpleAndConfigurableProductsWithCustomOptionsTest.xml | 5 ++++-
 ...eProductAndConfigurableProductsWithAssignedImagesTest.xml | 5 ++++-
 ...siteAndConfigurableProductAssignedToCustomWebsiteTest.xml | 3 +++
 .../Test/AdminExportSimpleProductWithCustomAttributeTest.xml | 3 +++
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
index 3a4010f417104..1f5ae6b6905bc 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
@@ -115,6 +115,9 @@
         <!-- Export created below products -->
         <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
 
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
         <!-- Download product -->
         <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
             <argument name="rowIndex" value="0"/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
index 09d9469cb093d..a587d71ba0e68 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
@@ -80,6 +80,9 @@
         <!-- Export created below products -->
         <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
 
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
         <!-- Download product -->
         <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
             <argument name="rowIndex" value="0"/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
index aaeb0cd38cd99..6f64da4693692 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
@@ -107,9 +107,12 @@
             <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
         </actionGroup>
 
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
         <!-- Download product -->
         <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
             <argument name="rowIndex" value="0"/>
         </actionGroup>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
index 597ee2336b21f..993f1c9cd9da2 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
@@ -123,9 +123,12 @@
             <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
         </actionGroup>
 
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
         <!-- Download product -->
         <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
             <argument name="rowIndex" value="0"/>
         </actionGroup>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
index b1e723e5ee1ff..491d20604a08b 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
@@ -105,6 +105,9 @@
         <!-- Export created below products -->
         <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
 
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
         <!-- Download product -->
         <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
             <argument name="rowIndex" value="0"/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
index e3c5cd78397f6..f671b54803e35 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
@@ -57,6 +57,9 @@
         <!-- Export created below products -->
         <actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
 
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+
         <!-- Download product -->
         <actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">
             <argument name="rowIndex" value="0"/>

From 1cdae6055bdb1afdcfa575f426623051b9670bd7 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Wed, 20 Mar 2019 10:05:35 -0500
Subject: [PATCH 0711/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

- fixes after CR
---
 .../Magento/Config/App/Config/Type/System.php |  9 +++++++-
 .../Cache/LockGuardedCacheLoader.php          | 21 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index c913716fedee7..c63ccae871657 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -389,6 +389,13 @@ private function readData(): array
     public function clean()
     {
         $this->data = [];
-        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
+        $cleanAction = function () {
+            $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
+        };
+
+        $this->lockQuery->lockedCleanData(
+            self::$lockName,
+            $cleanAction
+        );
     }
 }
diff --git a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
index 8b500fe7fd3cb..216d8e9a0a01b 100644
--- a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
+++ b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
@@ -92,4 +92,25 @@ public function lockedLoadData(
 
         return $cachedData;
     }
+
+    /**
+     * Clean data.
+     *
+     * @param string $lockName
+     * @param callable $dataCleaner
+     * @return void
+     */
+    public function lockedCleanData(string $lockName, callable $dataCleaner)
+    {
+        while ($this->locker->isLocked($lockName)) {
+            usleep($this->delayTimeout * 1000);
+        }
+        try {
+            if ($this->locker->lock($lockName, $this->lockTimeout / 1000)) {
+                $dataCleaner();
+            }
+        } finally {
+            $this->locker->unlock($lockName);
+        }
+    }
 }

From 6f8d99c750e7aeab547a1d6f34e2d9f7df0be505 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 20 Mar 2019 18:04:53 +0200
Subject: [PATCH 0712/1055] 281 - [Shipping methods] Support of UPS shipping
 method 1. Test coverage for UPS "Ground" method

---
 .../Ups/SetUpsShippingMethodsOnCartTest.php   | 147 ++++++++++++++++++
 .../Ups/_files/enable_ups_shipping_method.php |  20 +++
 .../enable_ups_shipping_method_rollback.php   |  16 ++
 3 files changed, 183 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
new file mode 100644
index 0000000000000..ed2e73946b528
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Ups;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+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 setting offline shipping methods on cart
+ */
+class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
+{
+    /**
+     * Defines carrier code for "UPS" shipping method
+     */
+    const CARRIER_CODE = 'ups';
+
+    /**
+     * Defines method code for the "Ground" UPS shipping
+     */
+    const CARRIER_METHOD_CODE_GROUND = 'GND';
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     */
+    public function testSetUpsShippingMethod()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $shippingAddressId = (int)$quote->getShippingAddress()->getId();
+
+        $query = $this->getAddUpsShippingMethodQuery(
+            $maskedQuoteId,
+            $shippingAddressId,
+            self::CARRIER_CODE,
+            self::CARRIER_METHOD_CODE_GROUND
+        );
+
+        $response = $this->sendRequestWithToken($query);
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        $expectedResult = [
+            'carrier_code' => self::CARRIER_CODE,
+            'method_code'  => self::CARRIER_METHOD_CODE_GROUND,
+            'label'        => 'United Parcel Service - Ground',
+        ];
+        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+    }
+
+    /**
+     * Generates query for setting the specified shipping method on cart
+     *
+     * @param int $shippingAddressId
+     * @param string $maskedQuoteId
+     * @param string $carrierCode
+     * @param string $methodCode
+     * @return string
+     */
+    private function getAddUpsShippingMethodQuery(
+        string $maskedQuoteId,
+        int $shippingAddressId,
+        string $carrierCode,
+        string $methodCode
+    ): string {
+        return <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: {
+    cart_id: "$maskedQuoteId"
+    shipping_methods: [
+      {
+        cart_address_id: $shippingAddressId
+        carrier_code: "$carrierCode"
+        method_code: "$methodCode"
+      }
+    ]
+  }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+        }
+      }
+    } 
+  }
+}        
+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/Ups/_files/enable_ups_shipping_method.php b/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method.php
new file mode 100644
index 0000000000000..5c6c60866fafb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+
+$configWriter->save('carriers/ups/active', 1);
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php b/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php
new file mode 100644
index 0000000000000..6d7894879f97b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer  $configWriter */
+$configWriter = $objectManager->create(WriterInterface::class);
+
+$configWriter->delete('carriers/ups/active');

From 30a2a80802afe5df8c81e948f2c1db4e2ce969b9 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 20 Mar 2019 18:58:51 +0200
Subject: [PATCH 0713/1055] magento/graphql-ce#281: [Shipping methods] Support
 of UPS shipping method

---
 .../Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index ed2e73946b528..af85b616be696 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -15,7 +15,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Test for setting offline shipping methods on cart
+ * Test for setting "UPS" shipping method on cart
  */
 class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
 {

From 989f2373707ed714ad1bb9518f4b6a0471890e38 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Wed, 20 Mar 2019 13:57:09 -0500
Subject: [PATCH 0714/1055] Update test case ids and add minor fixes

---
 .../Checkout/Test/Mftf/Data/QuoteData.xml     | 13 +++++++++
 ...UpdateShoppingCartSimpleProductQtyTest.xml | 19 ++++++++-----
 ...tSimpleWithCustomOptionsProductQtyTest.xml | 27 ++++++++++++-------
 .../Test/TestCase/UpdateShoppingCartTest.xml  |  6 ++---
 4 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
index a14ed147aae22..e7a5992ad8943 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
@@ -24,4 +24,17 @@
         <data key="shippingMethod">Flat Rate - Fixed</data>
         <data key="currency">$</data>
     </entity>
+    <entity name="quoteQty3Price123" type="Quote">
+        <data key="price">123.00</data>
+        <data key="qty">3</data>
+        <data key="subtotal">369.00</data>
+        <data key="currency">$</data>
+    </entity>
+    <entity name="quoteQty11Subtotal1320" type="Quote">
+        <data key="price">100.00</data>
+        <data key="customOptionsPrice">20</data>
+        <data key="qty">11</data>
+        <data key="subtotal">1,320.00</data>
+        <data key="currency">$</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
index 36eb10826e63c..423f4049f6722 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleProductQtyTest.xml
@@ -13,6 +13,7 @@
             <features value="Checkout"/>
             <title value="Check updating shopping cart while updating items qty"/>
             <description value="Check updating shopping cart while updating items qty"/>
+            <testCaseId value="MC-14731" />
             <group value="shoppingCart"/>
             <group value="mtf_migrated"/>
         </annotations>
@@ -37,22 +38,28 @@
         <waitForPageLoad stepKey="waitForCheckoutPageLoad1"/>
 
         <!-- Change the product QTY -->
-        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="3" stepKey="changeCartQty"/>
+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="{{quoteQty3Price123.qty}}" stepKey="changeCartQty"/>
         <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="openShoppingCart"/>
         <waitForPageLoad stepKey="waitForCheckoutPageLoad2"/>
 
         <!-- The price and QTY values should be updated for the product -->
         <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
-        <see userInput="$369" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
-        <assertEquals expected="3" actual="$grabProductQtyInCart" stepKey="assertProductQtyInCart"/>
+        <see userInput="{{quoteQty3Price123.currency}}{{quoteQty3Price123.subtotal}}" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
+        <assertEquals stepKey="assertProductQtyInCart">
+            <actualResult type="variable">grabProductQtyInCart</actualResult>
+            <expectedResult type="string">{{quoteQty3Price123.qty}}</expectedResult>
+        </assertEquals>
 
         <!-- Subtotal should be updated -->
-        <see userInput="$369" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertCartSubtotal"/>
+        <see userInput="{{quoteQty3Price123.currency}}{{quoteQty3Price123.subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertCartSubtotal"/>
 
         <!-- Minicart product price and subtotal should be updated -->
         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
         <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
-        <assertEquals expected="3" actual="$grabProductQtyInMinicart" stepKey="assertProductQtyInMinicart"/>
-        <see userInput="$369" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
+        <assertEquals stepKey="assertProductQtyInMinicart">
+            <actualResult type="variable">grabProductQtyInMinicart</actualResult>
+            <expectedResult type="string">{{quoteQty3Price123.qty}}</expectedResult>
+        </assertEquals>
+        <see userInput="{{quoteQty3Price123.currency}}{{quoteQty3Price123.subtotal}}" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
index 654a8b231c63c..84080b04c80ee 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateShoppingCartSimpleWithCustomOptionsProductQtyTest.xml
@@ -13,6 +13,7 @@
             <features value="Checkout"/>
             <title value="Check updating shopping cart while updating qty of items with custom options"/>
             <description value="Check updating shopping cart while updating qty of items with custom options"/>
+            <testCaseId value="MC-14732" />
             <group value="shoppingCart"/>
             <group value="mtf_migrated"/>
         </annotations>
@@ -26,7 +27,7 @@
             <updateData createDataKey="createProduct" entity="ProductWithTextFieldAndAreaOptions" stepKey="updateProductWithOption"/>
 
             <!-- Go to the product page, fill the custom options values and add the product to the shopping cart -->
-            <amOnPage url="{{StorefrontHomePage.url}}$createProduct.custom_attributes[url_key]$.html" stepKey="amOnProductPage"/>
+            <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProductPage"/>
             <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
             <fillField userInput="OptionField" selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" stepKey="fillProductOptionInputField"/>
             <fillField userInput="OptionArea" selector="{{StorefrontProductInfoMainSection.productOptionAreaInput(ProductOptionArea.title)}}" stepKey="fillProductOptionInputArea"/>
@@ -41,23 +42,29 @@
 
         <!-- Go to the shopping cart -->
         <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
-        <waitForPageLoad stepKey="waitForCheckoutPageLoad1"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
 
         <!-- Change the product QTY -->
-        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="11" stepKey="changeCartQty"/>
-        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="openShoppingCart"/>
-        <waitForPageLoad stepKey="waitForCheckoutPageLoad2"/>
+        <fillField selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}"  userInput="{{quoteQty11Subtotal1320.qty}}" stepKey="changeCartQty"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="updateShoppingCart"/>
+        <waitForPageLoad stepKey="waitShoppingCartUpdated"/>
 
         <!-- The price and QTY values should be updated for the product -->
         <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabProductQtyInCart"/>
-        <see userInput="$1,320.00" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
-        <assertEquals expected="11" actual="$grabProductQtyInCart" stepKey="assertProductQtyInCart"/>
-        <see userInput="$1,320.00" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
+        <see userInput="{{quoteQty11Subtotal1320.currency}}{{quoteQty11Subtotal1320.subtotal}}" selector="{{CheckoutCartProductSection.productSubtotalByName($$createProduct.name$$)}}" stepKey="assertProductPrice"/>
+        <assertEquals stepKey="assertProductQtyInCart">
+            <expectedResult type="string">{{quoteQty11Subtotal1320.qty}}</expectedResult>
+            <actualResult type="variable">grabProductQtyInCart</actualResult>
+        </assertEquals>
+        <see userInput="{{quoteQty11Subtotal1320.currency}}{{quoteQty11Subtotal1320.subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
 
         <!-- Minicart product price and subtotal should be updated -->
         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openMinicart"/>
         <grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="grabProductQtyInMinicart"/>
-        <assertEquals expected="11" actual="$grabProductQtyInMinicart" stepKey="assertProductQtyInMinicart"/>
-        <see userInput="1,320.00" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
+        <assertEquals stepKey="assertProductQtyInMinicart">
+            <expectedResult type="string">{{quoteQty11Subtotal1320.qty}}</expectedResult>
+            <actualResult type="variable">grabProductQtyInMinicart</actualResult>
+        </assertEquals>
+        <see userInput="{{quoteQty11Subtotal1320.currency}}{{quoteQty11Subtotal1320.subtotal}}" selector="{{StorefrontMinicartSection.subtotal}}" stepKey="assertMinicartSubtotal"/>
     </test>
 </tests>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
index 43acf9cd740d1..5caa3ba9b924e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateShoppingCartTest.xml
@@ -8,8 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Checkout\Test\TestCase\UpdateShoppingCartTest" summary="Update Shopping Cart" ticketId="MAGETWO-25081">
         <variation name="UpdateShoppingCartTestVariation1">
-            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-            <data name="tag" xsi:type="string">severity:S0</data>
+            <data name="tag" xsi:type="string">severity:S0,mftf_migrated:yes</data>
             <data name="product/dataset" xsi:type="string">default</data>
             <data name="product/data/price/value" xsi:type="string">100</data>
             <data name="product/data/checkout_data/qty" xsi:type="string">3</data>
@@ -21,8 +20,7 @@
             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInShoppingCart" />
         </variation>
         <variation name="UpdateShoppingCartTestVariation2">
-            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-            <data name="tag" xsi:type="string">severity:S0</data>
+            <data name="tag" xsi:type="string">severity:S0,mftf_migrated:yes</data>
             <data name="product/dataset" xsi:type="string">with_two_custom_option</data>
             <data name="product/data/price/value" xsi:type="string">50</data>
             <data name="product/data/checkout_data/qty" xsi:type="string">11</data>

From 0e2a92868c8eebce6a139442285e0cac2a6cff36 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@magento.com>
Date: Wed, 20 Mar 2019 14:58:13 -0500
Subject: [PATCH 0715/1055] MC-6273: Mysql url_rewrite select make on product
 view page 170+ times per request

- fixed static tests
---
 lib/internal/Magento/Framework/Lock/Backend/Cache.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
index 256ad2fdbd3e1..dfe6bbb828352 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Cache.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
@@ -57,11 +57,13 @@ public function isLocked(string $name): bool
     }
 
     /**
-     * @param string $name
+     * Get cache locked identifier based on cache identifier.
+     *
+     * @param string $cacheIdentifier
      * @return string
      */
-    private function getIdentifier(string $name): string
+    private function getIdentifier(string $cacheIdentifier): string
     {
-        return self::LOCK_PREFIX . $name;
+        return self::LOCK_PREFIX . $cacheIdentifier;
     }
 }

From ccb284f9662d1230ba06c10505d524e5dea406a8 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Wed, 20 Mar 2019 14:58:41 -0500
Subject: [PATCH 0716/1055] Fix unstable test

---
 .../Test/Mftf/ActionGroup/AdminExportActionGroup.xml       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
index 63248dd53fc1b..b9eea2b114634 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
@@ -56,9 +56,10 @@
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitFormReload"/>
         <click stepKey="clickSelectBtn" selector="{{AdminExportAttributeSection.selectByIndex(rowIndex)}}"/>
-        <click stepKey="clickOnDownload" selector="{{AdminExportAttributeSection.delete(rowIndex)}}" after="clickSelectBtn"/>
+        <click stepKey="clickOnDelete" selector="{{AdminExportAttributeSection.delete(rowIndex)}}" after="clickSelectBtn"/>
         <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
-        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForExportDataDeleted" />
         <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>

From ef3cc3634fcf4d03030e50e8627a23ccd718b60e Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Thu, 21 Mar 2019 08:12:17 +0200
Subject: [PATCH 0717/1055] Missing key model in Wishlist value data

---
 .../Model/Resolver/WishlistResolver.php       |  5 ++++
 .../Magento/GraphQl/Wishlist/WishlistTest.php | 30 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
index e3a788af2ea7e..792928ab61aaf 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
@@ -13,6 +13,7 @@
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResourceModel;
 use Magento\Wishlist\Model\Wishlist;
 use Magento\Wishlist\Model\WishlistFactory;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 
 /**
  * Fetches the Wishlist data according to the GraphQL schema
@@ -51,6 +52,10 @@ public function resolve(
     ) {
         $customerId = $context->getUserId();
 
+        /* Guest checking */
+        if (!$customerId && 0 === $customerId) {
+            throw new GraphQlAuthorizationException(__('The current user cannot perform operations on wishlist'));
+        }
         /** @var Wishlist $wishlist */
         $wishlist = $this->wishlistFactory->create();
         $this->wishlistResource->load($wishlist, $customerId, 'customer_id');
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
index d570fc09b7714..4aac5d9445934 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/WishlistTest.php
@@ -93,6 +93,36 @@ public function testGetCustomerWishlist(): void
         $this->assertEquals($wishlistItemProduct->getName(), $response['wishlist']['items'][0]['product']['name']);
     }
 
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current user cannot perform operations on wishlist
+     */
+    public function testGetGuestWishlist()
+    {
+        $query =
+            <<<QUERY
+{
+  wishlist {
+    items_count
+    name
+    sharing_code
+    updated_at
+    items {
+      id
+      qty
+      description
+      added_at
+      product {
+        sku
+        name
+      }
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $email
      * @param string $password

From 799f37e98cae41b394a8983b5cf96b7b98cde2d2 Mon Sep 17 00:00:00 2001
From: Vasilii <v.burlacu@atwix.com>
Date: Thu, 21 Mar 2019 09:44:31 +0200
Subject: [PATCH 0718/1055] magento/graphql-ce:#468 -  Fix codestyle issue

# Fixed issue "@throws annotation tags are added only when exception is thrown explicitly in the function"
---
 .../Cart/CreateQuoteAddressByCustomerAddress.php      | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php
index 2e2588ea81068..ba46f5621ee82 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php
@@ -9,12 +9,8 @@
 
 use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
 use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Quote\Model\Quote\Address;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Quote\Model\Quote\Address;
 
 /**
  * Creates a quote address based on given context, customer address ID and customer address
@@ -55,11 +51,8 @@ public function __construct(
      * @param ContextInterface $context
      * @param int|string|null $customerAddressId
      * @param array|null $customerAddress
+     *
      * @return Address
-     * @throws GraphQlAuthenticationException
-     * @throws GraphQlAuthorizationException
-     * @throws GraphQlInputException
-     * @throws GraphQlNoSuchEntityException
      */
     public function execute(
         ContextInterface $context,

From 999f77617c2a0f6e96cee51f46e8444a7c0ec15f Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Thu, 21 Mar 2019 15:02:39 +0400
Subject: [PATCH 0719/1055] MAGETWO-96127: Catalog grid page number resets
 after Save and Close action

- Update automated test script
---
 .../AdminProductGridActionGroup.xml           | 10 +++++-----
 .../Test/Mftf/Data/ProductGridData.xml        |  3 +++
 ...dPageNumberAfterSaveAndCloseActionTest.xml | 19 ++++++++++---------
 .../AdminDataGridPaginationSection.xml        | 10 +++++-----
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index 3d1bac7a86627..fa26e2e9b94f4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -289,12 +289,12 @@
         <waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForProductTitle"/>
     </actionGroup>
 
-    <actionGroup name="emptyProductGridIfTheyExits">
+    <actionGroup name="deleteProductsIfTheyExist">
         <conditionalClick selector="{{AdminProductGridSection.multicheckDropdown}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="openMulticheckDropdown"/>
         <conditionalClick selector="{{AdminProductGridSection.multicheckOption('Select All')}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="selectAllProductInFilteredGrid"/>
-        <conditionalClick selector="{{AdminProductGridSection.bulkActionDropdown}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="clickActionDropdown"/>
-        <conditionalClick selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" dependentSelector="{{AdminProductGridSection.firstProductRow}}" visible="true" stepKey="clickDeleteAction"/>
-        <wait time="2" stepKey="waitForConfirmModal"/>
-        <conditionalClick selector="{{AdminProductGridConfirmActionSection.ok}}" dependentSelector="{{AdminProductGridConfirmActionSection.ok}}" visible="true" stepKey="confirmProductDelete"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
+        <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="waitForModalPopUp"/>
+        <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
index ea0bcafe56c48..71c8af318e9b4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
@@ -12,4 +12,7 @@
         <data key="from">10</data>
         <data key="to">100</data>
     </entity>
+    <entity name="ProductPerPage">
+        <data key="productCount">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
index 3f5910caf7f39..b24ed7f9c9a81 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
@@ -20,14 +20,14 @@
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
-            <!--Clear product page-->
-            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
+            <!--Clear product grid-->
+            <comment userInput="Clear product grid" stepKey="commentClearProductGrid"/>
+            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
             <waitForPageLoad stepKey="waitForProductIndexPage"/>
             <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
                               dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
             <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
-            <actionGroup ref="emptyProductGridIfTheyExits" stepKey="deleteProductIfTheyExits"/>
+            <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteProductIfTheyExist"/>
             <createData stepKey="category1" entity="SimpleSubCategory"/>
             <createData stepKey="product1" entity="SimpleProduct">
                 <requiredEntity createDataKey="category1"/>
@@ -38,11 +38,11 @@
             </createData>
         </before>
         <after>
-            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
+            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
             <waitForPageLoad stepKey="waitForProductIndexPage"/>
             <click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="clickPrevPageOrderGrid"/>
             <actionGroup ref="adminDataGridDeleteCustomPerPage" stepKey="deleteCustomAddedPerPage">
-                <argument name="perPage" value="Const.one"/>
+                <argument name="perPage" value="ProductPerPage.productCount"/>
             </actionGroup>
             <deleteData stepKey="deleteCategory1" createDataKey="category1"/>
             <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
@@ -50,12 +50,13 @@
             <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
         <waitForPageLoad stepKey="waitForProductIndexPage"/>
         <actionGroup ref="adminDataGridSelectCustomPerPage" stepKey="select1OrderPerPage">
-            <argument name="perPage" value="Const.one"/>
+            <argument name="perPage" value="ProductPerPage.productCount"/>
         </actionGroup>
-
+        <!--Go to the next page and edit the product-->
+        <comment userInput="Go to the next page and edit the product" stepKey="commentEdiProduct"/>
         <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
index 8d3641366464e..133836761174d 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
@@ -11,11 +11,11 @@
     <section name="AdminDataGridPaginationSection">
         <element name="perPageDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
         <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{var1}}']" parameterized="true"/>
-        <element name="perPageInput" type="input" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li[@class='_edit']//div[@class='selectmenu-item-edit']//input"/>
-        <element name="perPageApplyInput" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li[@class='_edit']//div[@class='selectmenu-item-edit']//button"/>
-        <element name="perPageDropDownItem" type="button" selector="//*[@class='selectmenu-items _active']//button[@class='selectmenu-item-action' and text()='{{var}}']" timeout="30" parameterized="true"/>
-        <element name="perPageEditCustomValue" type="button" selector="//div[@class='selectmenu-items _active']//div[@class='selectmenu-item']//button[text()='{{var1}}']/following-sibling::button[@class='action-edit']" parameterized="true"/>
-        <element name="perPageDeleteCustomValue" type="button" selector="//div[@class='selectmenu-items _active']//div[@class='selectmenu-item']//button[text()='{{var2}}']/parent::div/preceding-sibling::div/button[@class='action-delete']" parameterized="true"/>
+        <element name="perPageInput" type="input" selector="//div[contains(@class, 'admin__data-grid-pager-wrap')]//div[contains(@class, 'selectmenu-items _active')]//li[contains(@class, '_edit')]//div[contains(@class, 'selectmenu-item-edit')]//input"/>
+        <element name="perPageApplyInput" type="button" selector="//div[contains(@class, 'admin__data-grid-pager-wrap')]//div[contains(@class, 'selectmenu-items _active')]//li[@class='_edit']//div[contains(@class, 'selectmenu-item-edit')]//button"/>
+        <element name="perPageDropDownItem" type="button" selector="//*[contains(@class, 'selectmenu-items _active')]//button[contains(@class, 'selectmenu-item-action') and text()='{{dropDownItem}}']" timeout="30" parameterized="true"/>
+        <element name="perPageEditCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/following-sibling::button[contains(@class, 'action-edit')]" parameterized="true"/>
+        <element name="perPageDeleteCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/parent::div/preceding-sibling::div/button[contains(@class, 'action-delete')]" parameterized="true"/>
         <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>
         <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous" timeout="30"/>
         <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>

From 5f1111b43f68053a3512c32b2695f5e545189d08 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Thu, 21 Mar 2019 14:05:04 +0300
Subject: [PATCH 0720/1055] MAGETWO-96127: [2.3.x] Catalog grid page number
 resets after Save and Close action.

- Fix according to notices from CR.
---
 app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
index 3ea9110f20122..8e6f1496495c7 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
@@ -181,7 +181,7 @@ define([
          * @returns {Paging} Chainable.
          */
         goFirst: function () {
-            if (typeof this.filters !== 'undefined') {
+            if (!_.isUndefined(this.filters)) {
                 this.current = 1;
             }
 
@@ -233,7 +233,7 @@ define([
         updateCursor: function () {
             var cursor  = this.current - 1,
                 size    = this.pageSize,
-                oldSize = typeof this.previousSize === 'undefined' ? this.pageSize : this.previousSize,
+                oldSize = _.isUndefined(this.previousSize) ? this.pageSize : this.previousSize,
                 delta   = cursor * (oldSize  - size) / size;
 
             delta = size > oldSize ?

From f8b955c552c44e4e7478f324d2ecff8f2f0c90e8 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Thu, 21 Mar 2019 09:00:45 -0500
Subject: [PATCH 0721/1055] MAGETWO-98151: Add support ZooKeeper and flock
 locks

---
 .../Framework/Lock/Backend/FileTest.php       |  52 +++++
 .../Magento/Framework/Lock/Backend/File.php   | 194 ++++++++++++++++++
 .../Framework/Lock/Backend/Zookeeper.php      |   2 +-
 .../Framework/Lock/LockBackendFactory.php     |   9 +
 .../Lock/Test/Unit/LockBackendFactoryTest.php |   6 +
 .../Setup/Model/ConfigOptionsList/Lock.php    |  52 +++++
 .../Unit/Model/ConfigOptionsList/LockTest.php |  29 ++-
 7 files changed, 342 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php
 create mode 100644 lib/internal/Magento/Framework/Lock/Backend/File.php

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php
new file mode 100644
index 0000000000000..fd550ac14f22f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+/**
+ * \Magento\Framework\Lock\Backend\Database test case
+ */
+class FileTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Lock\Backend\File
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->create(\Magento\Framework\Lock\Backend\File::class, ['path' => '/tmp']);
+    }
+
+    public function testLockAndUnlock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+
+        $this->assertTrue($this->model->lock($name));
+        $this->assertTrue($this->model->isLocked($name));
+        $this->assertFalse($this->model->lock($name, 2));
+
+        $this->assertTrue($this->model->unlock($name));
+        $this->assertFalse($this->model->isLocked($name));
+    }
+
+    public function testUnlockWithoutExistingLock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+        $this->assertFalse($this->model->unlock($name));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Backend/File.php b/lib/internal/Magento/Framework/Lock/Backend/File.php
new file mode 100644
index 0000000000000..79f41829f1091
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Backend/File.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\Filesystem\Driver\File as FileDriver;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Phrase;
+
+/**
+ * LockManager using the file system for locks
+ */
+class File implements LockManagerInterface
+{
+    /**
+     * The file driver instance
+     *
+     * @var FileDriver
+     */
+    private $fileDriver;
+
+    /**
+     * The path to the locks storage folder
+     *
+     * @var string
+     */
+    private $path;
+
+    /**
+     * How many microseconds to wait before re-try to acquire a lock
+     *
+     * @var int
+     */
+    private $sleepCycle = 100000;
+
+    /**
+     * The mapping list of the path lock with the file resource
+     *
+     * @var array
+     */
+    private $locks = [];
+
+    /**
+     * @param FileDriver $fileDriver The file driver
+     * @param string $path The path to the locks storage folder
+     * @throws RuntimeException Throws RuntimeException if $path is empty
+     *         or cannot create the directory for locks
+     */
+    public function __construct(FileDriver $fileDriver, string $path)
+    {
+        if (!$path) {
+            throw new RuntimeException(new Phrase('The path needs to be a non-empty string.'));
+        }
+
+        $this->fileDriver = $fileDriver;
+        $this->path = preg_replace('#\/*$#', '', $path) ?: '/';
+
+        try {
+            if (!$this->fileDriver->isExists($this->path)) {
+                $this->fileDriver->createDirectory($this->path);
+            }
+        } catch (FileSystemException $exception) {
+            throw new RuntimeException(
+                new Phrase('Cannot create the directory for locks: %1', [$this->path]),
+                $exception
+            );
+        }
+    }
+
+    /**
+     * Acquires a lock by name
+     *
+     * @param string $name The lock name
+     * @param int $timeout Timeout in seconds. A negative timeout value means infinite timeout
+     * @return bool Returns true if the lock is acquired, otherwise returns false
+     * @throws RuntimeException Throws RuntimeException if cannot acquires the lock because FS problems
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        try {
+            $lockFile = $this->getLockPath($name);
+            $fileResource = $this->fileDriver->fileOpen($lockFile, 'w+');
+            $skipDeadline = $timeout < 0;
+            $deadline = microtime(true) + $timeout;
+
+            while (!$this->tryToLock($fileResource)) {
+                if (!$skipDeadline && $deadline <= microtime(true)) {
+                    $this->fileDriver->fileClose($fileResource);
+                    return false;
+                }
+                usleep($this->sleepCycle);
+            }
+        } catch (FileSystemException $exception) {
+            throw new RuntimeException(new Phrase('Cannot acquire a lock.'), $exception);
+        }
+
+        $this->locks[$lockFile] = $fileResource;
+        return true;
+    }
+
+    /**
+     * Checks if a lock exists by name
+     *
+     * @param string $name The lock name
+     * @return bool Returns true if the lock exists, otherwise returns false
+     * @throws RuntimeException Throws RuntimeException if cannot check that the lock exists
+     */
+    public function isLocked(string $name): bool
+    {
+        $lockFile = $this->getLockPath($name);
+        $result = false;
+
+        try {
+            if ($this->fileDriver->isExists($lockFile)) {
+                $fileResource = $this->fileDriver->fileOpen($lockFile, 'w+');
+                if ($this->tryToLock($fileResource)) {
+                    $result = false;
+                } else {
+                    $result = true;
+                }
+                $this->fileDriver->fileClose($fileResource);
+            }
+        } catch (FileSystemException $exception) {
+            throw new RuntimeException(new Phrase('Cannot verify that the lock exists.'), $exception);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove the lock by name
+     *
+     * @param string $name The lock name
+     * @return bool If the lock is removed returns true, otherwise returns false
+     */
+    public function unlock(string $name): bool
+    {
+        $lockFile = $this->getLockPath($name);
+
+        if (isset($this->locks[$lockFile]) && $this->tryToUnlock($this->locks[$lockFile])) {
+            unset($this->locks[$lockFile]);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the full path to the lock file by name
+     *
+     * @param string $name The lock name
+     * @return string The path to the lock file
+     */
+    private function getLockPath(string $name): string
+    {
+        return $this->path . '/' . $name;
+    }
+
+    /**
+     * Tries to lock a file resource
+     *
+     * @param resource $resource The file resource
+     * @return bool If the lock is acquired returns true, otherwise returns false
+     */
+    private function tryToLock($resource): bool
+    {
+        try {
+            return $this->fileDriver->fileLock($resource, LOCK_EX | LOCK_NB);
+        } catch (FileSystemException $exception) {
+            return false;
+        }
+    }
+
+    /**
+     * Tries to unlock a file resource
+     *
+     * @param resource $resource The file resource
+     * @return bool If the lock is removed returns true, otherwise returns false
+     */
+    private function tryToUnlock($resource): bool
+    {
+        try {
+            return $this->fileDriver->fileLock($resource, LOCK_UN | LOCK_NB);
+        } catch (FileSystemException $exception) {
+            return false;
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index 1e7ca069df79b..1dbedaaaa5e1b 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -54,7 +54,7 @@ class Zookeeper implements LockManagerInterface
     /**
      * How many microseconds to wait before recheck connections or nodes
      *
-     * @var float
+     * @var int
      */
     private $sleepCycle = 100000;
 
diff --git a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
index 46cb2998ede70..20e0f69328c88 100644
--- a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Lock\Backend\Database as DatabaseLock;
 use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
 use Magento\Framework\Lock\Backend\Cache as CacheLock;
+use Magento\Framework\Lock\Backend\File as FileLock;
 
 /**
  * The factory to create object that implements LockManagerInterface
@@ -55,6 +56,13 @@ class LockBackendFactory
      */
     const LOCK_CACHE = 'cache';
 
+    /**
+     * File lock provider name
+     *
+     * @const string
+     */
+    const LOCK_FILE = 'file';
+
     /**
      * The list of lock providers with mapping on classes
      *
@@ -64,6 +72,7 @@ class LockBackendFactory
         self::LOCK_DB => DatabaseLock::class,
         self::LOCK_ZOOKEEPER => ZookeeperLock::class,
         self::LOCK_CACHE => CacheLock::class,
+        self::LOCK_FILE => FileLock::class,
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
index 8864ab6f9ead1..030b126284db4 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
@@ -10,6 +10,7 @@
 use Magento\Framework\Lock\Backend\Database as DatabaseLock;
 use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
 use Magento\Framework\Lock\Backend\Cache as CacheLock;
+use Magento\Framework\Lock\Backend\File as FileLock;
 use Magento\Framework\Lock\LockBackendFactory;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Lock\LockManagerInterface;
@@ -95,6 +96,11 @@ public function createDataProvider(): array
                 'lockProviderClass' => CacheLock::class,
                 'config' => [],
             ],
+            'file' => [
+                'lockProvider' => LockBackendFactory::LOCK_FILE,
+                'lockProviderClass' => FileLock::class,
+                'config' => ['path' => '/my/path'],
+            ],
         ];
 
         if (extension_loaded('zookeeper')) {
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
index 799409d1560ac..b4cc14e25ca19 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
@@ -49,6 +49,13 @@ class Lock implements ConfigOptionsListInterface
      */
     const INPUT_KEY_LOCK_ZOOKEEPER_PATH = 'lock-zookeeper-path';
 
+    /**
+     * The name of an option to set File path
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_FILE_PATH = 'lock-file-path';
+
     /**
      * The configuration path to save lock provider
      *
@@ -77,6 +84,13 @@ class Lock implements ConfigOptionsListInterface
      */
     const CONFIG_PATH_LOCK_ZOOKEEPER_PATH = 'lock/config/path';
 
+    /**
+     * The configuration path to save locks directory path
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_FILE_PATH = 'lock/config/path';
+
     /**
      * The list of lock providers
      *
@@ -86,6 +100,7 @@ class Lock implements ConfigOptionsListInterface
         LockBackendFactory::LOCK_DB,
         LockBackendFactory::LOCK_ZOOKEEPER,
         LockBackendFactory::LOCK_CACHE,
+        LockBackendFactory::LOCK_FILE,
     ];
 
     /**
@@ -106,6 +121,10 @@ class Lock implements ConfigOptionsListInterface
         LockBackendFactory::LOCK_CACHE => [
             self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
         ],
+        LockBackendFactory::LOCK_FILE => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+            self::INPUT_KEY_LOCK_FILE_PATH => self::CONFIG_PATH_LOCK_FILE_PATH,
+        ],
     ];
 
     /**
@@ -151,6 +170,12 @@ public function getOptions()
                 self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
                 'The path where Zookeeper will save locks. The default path is: ' . ZookeeperLock::DEFAULT_PATH
             ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_FILE_PATH,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_FILE_PATH,
+                'The path where file locks will be saved.'
+            ),
         ];
     }
 
@@ -184,6 +209,9 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
             case LockBackendFactory::LOCK_ZOOKEEPER:
                 $errors = $this->validateZookeeperConfig($options, $deploymentConfig);
                 break;
+            case LockBackendFactory::LOCK_FILE:
+                $errors = $this->validateFileConfig($options, $deploymentConfig);
+                break;
             case LockBackendFactory::LOCK_CACHE:
             case LockBackendFactory::LOCK_DB:
                 $errors = [];
@@ -195,6 +223,30 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
         return $errors;
     }
 
+    /**
+     * Validates File locks configuration
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return array
+     */
+    private function validateFileConfig(array $options, DeploymentConfig $deploymentConfig): array
+    {
+        $errors = [];
+
+        $path = $options[self::INPUT_KEY_LOCK_FILE_PATH]
+            ?? $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_FILE_PATH,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_PATH)
+            );
+
+        if (!$path) {
+            $errors[] = 'The path needs to be a non-empty string.';
+        }
+
+        return $errors;
+    }
+
     /**
      * Validates Zookeeper configuration
      *
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
index 5a150ad3dcd86..1a46bddf5f21a 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
@@ -44,7 +44,7 @@ protected function setUp()
     public function testGetOptions()
     {
         $options = $this->lockConfigOptionsList->getOptions();
-        $this->assertSame(4, count($options));
+        $this->assertSame(5, count($options));
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -61,6 +61,10 @@ public function testGetOptions()
         $this->assertArrayHasKey(3, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[3]);
         $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH, $options[3]->getName());
+
+        $this->assertArrayHasKey(4, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[4]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH, $options[4]->getName());
     }
 
     /**
@@ -150,6 +154,20 @@ public function createConfigDataProvider(): array
                     ],
                 ],
             ],
+            'Check specific file lock options' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_FILE,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH => '/my/path'
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_FILE,
+                        'config' => [
+                            'path' => '/my/path',
+                        ],
+                    ],
+                ],
+            ],
         ];
     }
 
@@ -200,6 +218,15 @@ public function validateDataProvider(): array
                         'Zookeeper host is should be set.',
                     ],
             ],
+            'Empty path for File lock' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_FILE,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH => '',
+                ],
+                'expectedResult' => [
+                    'The path needs to be a non-empty string.',
+                ],
+            ],
         ];
     }
 }

From a8d9be1c4f617a3ff0312f433f080b67b41ed3b6 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 21 Mar 2019 16:04:29 +0200
Subject: [PATCH 0722/1055] ENGCOM-4357: Static tests fix.

---
 .../Model/Products/AdaptUrlRewritesToVisibilityAttribute.php   | 3 ++-
 .../ProcessUrlRewriteOnChangeVisibilityObserverTest.php        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
index cf1a7ec76f016..f5851cf1e11b1 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Products/AdaptUrlRewritesToVisibilityAttribute.php
@@ -92,7 +92,8 @@ public function execute(array $productIds, int $visibility): void
                 } catch (UrlAlreadyExistsException $e) {
                     throw new UrlAlreadyExistsException(
                         __(
-                            'Can not change the visibility of the product with SKU equals "%1". URL key "%2" for specified store already exists.',
+                            'Can not change the visibility of the product with SKU equals "%1". '
+                            . 'URL key "%2" for specified store already exists.',
                             $product->getSku(),
                             $product->getUrlKey()
                         ),
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php
index af9979309078f..d3f0e9fa2a5ab 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProcessUrlRewriteOnChangeVisibilityObserverTest.php
@@ -160,7 +160,8 @@ public function testErrorOnDuplicatedUrlKey()
             $productIds[] = $this->productRepository->get($sku)->getId();
         }
         $this->expectException(UrlAlreadyExistsException::class);
-        $this->expectExceptionMessage('Can not change the visibility of the product with SKU equals "product2". URL key "product-1" for specified store already exists.');
+        $this->expectExceptionMessage('Can not change the visibility of the product with SKU equals "product2". '
+            . 'URL key "product-1" for specified store already exists.');
 
         $this->eventManager->dispatch(
             'catalog_product_attribute_update_before',

From b5eaa81580e7c9fe262e81e0602732eb1e37b49a Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Thu, 21 Mar 2019 09:08:29 -0500
Subject: [PATCH 0723/1055] MAGETWO-98151: Add support ZooKeeper and flock
 locks

---
 .../testsuite/Magento/Framework/Lock/Backend/FileTest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php
index fd550ac14f22f..feb111e436b1d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php
@@ -8,7 +8,7 @@
 namespace Magento\Framework\Lock\Backend;
 
 /**
- * \Magento\Framework\Lock\Backend\Database test case
+ * \Magento\Framework\Lock\Backend\File test case
  */
 class FileTest extends \PHPUnit\Framework\TestCase
 {

From 337397a030102e3014e5f31182f0fde1a15c6b12 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 21 Mar 2019 16:21:36 +0200
Subject: [PATCH 0724/1055] ENGCOM-4267: Static tests fix.

---
 .../Magento/Setup/Model/ConfigOptionsList/PageCache.php  | 9 +++++----
 .../Test/Unit/Model/ConfigOptionsList/CacheTest.php      | 1 -
 .../Test/Unit/Model/ConfigOptionsList/PageCacheTest.php  | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
index 01c8b5ff10e05..65bfc650c0206 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Setup\Model\ConfigOptionsList;
 
-use Magento\Framework\Setup\ConfigOptionsListInterface;
-use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\ConfigOptionsListInterface;
 use Magento\Framework\Setup\Option\SelectConfigOption;
 use Magento\Framework\Setup\Option\TextConfigOption;
 use Magento\Setup\Validator\RedisConnectionValidator;
@@ -68,7 +68,8 @@ class PageCache implements ConfigOptionsListInterface
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PORT,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD => self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
         self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA,
-        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB => self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB,
+        self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESSION_LIB =>
+            self::CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESSION_LIB,
     ];
 
     /**
@@ -234,7 +235,7 @@ private function validateRedisConfig(array $options, DeploymentConfig $deploymen
                 self::CONFIG_PATH_PAGE_CACHE_BACKEND_DATABASE,
                 $this->getDefaultConfigValue(self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_DATABASE)
             );
-        
+
         $config['password'] = isset($options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD])
             ? $options[self::INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD]
             : $deploymentConfig->get(
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
index b3c88930c948a..783c11e941eed 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
@@ -78,7 +78,6 @@ public function testGetOptions()
         $this->assertArrayHasKey(7, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[7]);
         $this->assertEquals('cache-id-prefix', $options[7]->getName());
-
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
index 2b96be2deee23..673168fe2fffd 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
@@ -78,7 +78,6 @@ public function testGetOptions()
         $this->assertArrayHasKey(7, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[7]);
         $this->assertEquals('page-cache-id-prefix', $options[7]->getName());
-
     }
 
     /**

From a2ad4424d5db9c41f50c4b8090f2e8a981b02014 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Thu, 21 Mar 2019 09:40:01 -0500
Subject: [PATCH 0725/1055] MAGETWO-98151: Add support ZooKeeper and flock
 locks

---
 lib/internal/Magento/Framework/Lock/Backend/File.php      | 4 ++--
 lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/Lock/Backend/File.php b/lib/internal/Magento/Framework/Lock/Backend/File.php
index 79f41829f1091..47aed8a6fe3ec 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/File.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/File.php
@@ -59,7 +59,7 @@ public function __construct(FileDriver $fileDriver, string $path)
         }
 
         $this->fileDriver = $fileDriver;
-        $this->path = preg_replace('#\/*$#', '', $path) ?: '/';
+        $this->path = rtrim($path, '/') . '/';
 
         try {
             if (!$this->fileDriver->isExists($this->path)) {
@@ -159,7 +159,7 @@ public function unlock(string $name): bool
      */
     private function getLockPath(string $name): string
     {
-        return $this->path . '/' . $name;
+        return $this->path . $name;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
index 1dbedaaaa5e1b..cbba981ae1b51 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -97,7 +97,7 @@ public function __construct(string $host, string $path = self::DEFAULT_PATH)
         }
 
         $this->host = $host;
-        $this->path = preg_replace('#\/*$#', '', $path) ?: '/';
+        $this->path = rtrim($path, '/') . '/';
     }
 
     /**
@@ -171,7 +171,7 @@ public function isLocked(string $name): bool
      */
     private function getFullPathToLock(string $name): string
     {
-        return $this->path . '/' . $name . '/' . $this->lockName;
+        return $this->path . $name . '/' . $this->lockName;
     }
 
     /**

From d0748a0356cbdd7ed7e205bb1d1666ed50ebfead Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Thu, 21 Mar 2019 10:37:45 -0500
Subject: [PATCH 0726/1055] MC-4867: Convert
 MoveStoreToOtherGroupSameWebsiteTest to MFTF

Addressing review comments
---
 .../Test/Mftf/Section/AdminConfigSection.xml  |  2 +-
 ...rtStoreConfigurationBackendActionGroup.xml | 26 +++++++++++++++++
 .../AssertStoreFrontendActionGroup.xml        | 27 +++++++++++++++++
 .../AssertStoreViewInGridActionGroup.xml      |  2 +-
 ...inMoveStoreToOtherGroupSameWebsiteTest.xml | 29 ++++++++-----------
 5 files changed, 67 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreConfigurationBackendActionGroup.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreFrontendActionGroup.xml

diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
index 9ab1e4a10d7df..b5bfe9cc2ea05 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
@@ -12,6 +12,6 @@
         <element name="generalTabClosed" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='false' or @aria-expanded='0']//strong[text()='General']"/>
         <element name="generalTabOpened" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='true' or @aria-expanded='1']//strong[text()='General']"/>
         <element name="defaultConfigButton" type="button" selector="#store-change-button" timeout="30"/>
-        <element name="defaultConfigDropdown" type="textarea" selector="//ul[@class='dropdown-menu']"/>
+        <element name="defaultConfigDropdown" type="button" selector="//ul[@class='dropdown-menu']" timeout="30"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreConfigurationBackendActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreConfigurationBackendActionGroup.xml
new file mode 100644
index 0000000000000..38030f59a7a33
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreConfigurationBackendActionGroup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStoreConfigurationBackendActionGroup">
+        <arguments>
+            <argument name="website" type="string"/>
+            <argument name="customStore" type="string"/>
+            <argument name="storeView1" type="string"/>
+            <argument name="storeView2" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminConfigPage.url}}" stepKey="goToConfigStoreConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForSystemStoreConfigurationPageLoad"/>
+        <click selector="{{AdminConfigSection.defaultConfigButton}}" stepKey="clickDefaultConfigButton"/>
+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{website}}" stepKey="seeAssertWebsiteInDefaultConfigDropdown"/>
+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{customStore}}" stepKey="seeAssertSecondStoreInDefaultConfigDropdown"/>
+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeView1}}" stepKey="seeAssertFirstStoreViewInDefaultConfigDropdown"/>
+        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeView2}}" stepKey="seeAssertSecondStoreViewInDefaultConfigDropdown"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreFrontendActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreFrontendActionGroup.xml
new file mode 100644
index 0000000000000..afd64e33e8b36
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreFrontendActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStoreFrontendActionGroup">
+        <arguments>
+            <argument name="customStore" type="string"/>
+            <argument name="storeView1" type="string"/>
+            <argument name="storeView2" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="clickSwitchStoreButton"/>
+        <waitForElementVisible selector="{{StorefrontFooterSection.storeLink(customStore)}}" stepKey="waitForStoreLinkToVosible"/>
+        <click selector="{{StorefrontFooterSection.storeLink(customStore)}}"  stepKey="clickStoreLinkCustomStore"/>
+        <waitForPageLoad stepKey="waitForCustomStoreToLoad"/>
+        <see selector="{{StorefrontHeaderSection.storeViewName}}" userInput="{{storeView1}}" stepKey="seeAssertFirstStoreViewOnStorefront"/>
+        <click selector="{{StorefrontHeaderSection.storeViewName}}" stepKey="clickStoreViewName"/>
+        <see selector="{{StorefrontHeaderSection.storeViewDropdown}}" userInput="{{storeView2}}" stepKey="seeAssertSecondStoreViewOnStorefront"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
index b4f290227cd4e..fad8eec9990cc 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AssertStoreViewInGridActionGroup.xml
@@ -18,6 +18,6 @@
         <fillField userInput="{{storeViewName}}" selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="fillSearchStoreViewField"/>
         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
-        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewInGridMessage"/>
+        <see selector="{{AdminStoresGridSection.firstRow}}" userInput="{{storeViewName}}" stepKey="seeAssertStoreViewInGridMessage"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml
index 61fb58991a81b..b86b99936dbe2 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminMoveStoreToOtherGroupSameWebsiteTest.xml
@@ -62,8 +62,7 @@
             <argument name="storeDropdown" value="{{customStore.name}}"/>
         </actionGroup>
         <!--Save the above store view and verify AssertStoreViewSuccessSaveMessage-->
-        <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage">
-        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewActionSaveGroup" stepKey="verifyAssertStoreViewSuccessSaveMessage"/>
 
         <!--Search moved store view(from above step) in grid and verify AssertStoreInGrid-->
         <actionGroup ref="AssertStoreViewInGridActionGroup" stepKey="searchMovedStoreViewInGrid">
@@ -79,22 +78,18 @@
         </actionGroup>
 
         <!--Go to store configuration page and verify AssertStoreBackend-->
-        <amOnPage url="{{AdminConfigPage.url}}" stepKey="goToConfigStoreConfigurationPage"/>
-        <waitForPageLoad stepKey="waitForSystemStoreConfigurationPageLoad"/>
-        <click selector="{{AdminConfigSection.defaultConfigButton}}" stepKey="clickDefaultConfigButton"/>
-        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{_defaultWebsite.name}}" stepKey="seeAssertWebsiteInDefaultConfigDropdown"/>
-        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{customStore.name}}" stepKey="seeAssertSecondStoreInDefaultConfigDropdown"/>
-        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeViewData1.name}}" stepKey="seeAssertFirstStoreViewInDefaultConfigDropdown"/>
-        <see selector="{{AdminConfigSection.defaultConfigDropdown}}" userInput="{{storeViewData2.name}}" stepKey="seeAssertSecondStoreViewInDefaultConfigDropdown"/>
+        <actionGroup ref="AssertStoreConfigurationBackendActionGroup" stepKey="verifyValuesOnStoreBackend">
+            <argument name="website" value="{{_defaultWebsite.name}}"/>
+            <argument name="customStore" value="{{customStore.name}}"/>
+            <argument name="storeView1" value="{{storeViewData1.name}}"/>
+            <argument name="storeView2" value="{{storeViewData2.name}}"/>
+        </actionGroup>
 
         <!--Go to storefront and verify AssertStoreFrontend-->
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
-        <waitForPageLoad stepKey="waitForStorefrontHomePageLoad"/>
-        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="clickSwitchStoreButton"/>
-        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}"  stepKey="clickStoreLinkCustomStore"/>
-        <waitForPageLoad stepKey="waitForCustomStoreToLoad"/>
-        <see selector="{{StorefrontHeaderSection.storeViewName}}" userInput="{{storeViewData1.name}}" stepKey="seeAssertFirstStoreViewOnStorefront"/>
-        <click selector="{{StorefrontHeaderSection.storeViewName}}" stepKey="clickStoreViewName"/>
-        <see selector="{{StorefrontHeaderSection.storeViewDropdown}}" userInput="{{storeViewData2.name}}" stepKey="seeAssertSecondStoreViewOnStorefront"/>
+        <actionGroup ref="AssertStoreFrontendActionGroup" stepKey="verifyValuesOnStoreFrontend">
+            <argument name="customStore" value="{{customStore.name}}"/>
+            <argument name="storeView1" value="{{storeViewData1.name}}"/>
+            <argument name="storeView2" value="{{storeViewData2.name}}"/>
+        </actionGroup>
     </test>
 </tests>
\ No newline at end of file

From b7e67007bcf62a1cd41a2d8039cb72709eb311ee Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 21 Mar 2019 19:01:36 +0300
Subject: [PATCH 0727/1055] MAGETWO-51459: [FT] CreateCategoryEntityTest fail
 when system message about indexers update is displayed

- Skip flaky MFTF test AdminCreateCustomProductAttributeWithDropdownFieldTest
---
 .../AdminCreateCustomProductAttributeWithDropdownFieldTest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
index 5b6a0b7f2ab3e..288941e487646 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
@@ -16,6 +16,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-10905"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-15474"/>
+            </skip>
         </annotations>
 
         <before>

From e7d98add26f7b9bf7b20d091d5b56be814fe299e Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Thu, 21 Mar 2019 11:25:16 -0500
Subject: [PATCH 0728/1055] MC-4872: Convert CreateStoreGroupEntityTest to MFTF

Addressing review comments
---
 .../Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml | 4 +---
 .../Store/Test/Mftf/Section/AdminStoresGridSection.xml       | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
index d9a36b8413dbc..870b92d17e679 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
@@ -52,7 +52,7 @@
         <fillField userInput="{{storeGroupName}}" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="fillSearchStoreGroupField"/>
         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
-        <see selector="{{AdminStoresGridSection.firstRow('1')}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
+        <see selector="{{AdminStoresGridSection.nthRow('1')}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupInGridMessage"/>
     </actionGroup>
     <actionGroup name="AssertStoreGroupForm">
         <arguments>
@@ -63,8 +63,6 @@
         </arguments>
         <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
         <waitForPageLoad stepKey="waitTillAdminSystemStoreGroupPage"/>
-        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabStoreGroupIdFromCurrentUrl"/>
-        <seeInCurrentUrl url="system_store/editGroup/group_id/{$grabStoreGroupIdFromCurrentUrl}" stepKey="seeStoreGroupId"/>
         <seeInField selector="{{AdminNewStoreGroupSection.storeGrpWebsiteDropdown}}" userInput="{{website}}" stepKey="seeAssertWebsite"/>
         <seeInField selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" userInput="{{storeGroupName}}" stepKey="seeAssertStoreGroupName"/>
         <seeInField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="seeAssertStoreGroupCode"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index ac0f00e64dd4e..7e08fb999308a 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -20,9 +20,10 @@
         <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
         <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
         <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
-        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[{{rownum}}]" parameterized="true"/>
+        <element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
+        <element name="nthRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[{{rownum}}]" parameterized="true"/>
         <element name="successMessage" type="text" selector="//div[@class='message message-success success']/div"/>
         <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
         <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
      </section>
-</sections>
+</sections>
\ No newline at end of file

From dd80c0c53d3b2993a9de918665dc63606cfbc5eb Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen@reachdigital.nl>
Date: Thu, 21 Mar 2019 17:26:51 +0100
Subject: [PATCH 0729/1055] Remove strict return type

---
 .../Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
index 4ec7117783aab..c417a202321b2 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddTrack.php
@@ -80,7 +80,7 @@ public function __construct(
      *
      * @return ResultInterface
      */
-    public function execute(): ResultInterface
+    public function execute()
     {
         try {
             $carrier = $this->getRequest()->getPost('carrier');

From 2d9c915275cbd5b5b5da1f8b968b56175ca64e0c Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Thu, 21 Mar 2019 12:00:33 -0500
Subject: [PATCH 0730/1055] MAGETWO-98151: Add support ZooKeeper and flock
 locks

---
 .../Lock/Backend/{FileTest.php => FileLockTest.php}      | 9 ++++++---
 .../Framework/Lock/Backend/{File.php => FileLock.php}    | 2 +-
 .../Magento/Framework/Lock/LockBackendFactory.php        | 2 +-
 .../Framework/Lock/Test/Unit/LockBackendFactoryTest.php  | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/{FileTest.php => FileLockTest.php} (81%)
 rename lib/internal/Magento/Framework/Lock/Backend/{File.php => FileLock.php} (99%)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php
similarity index 81%
rename from dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php
rename to dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php
index feb111e436b1d..e64b3c505acf1 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php
@@ -10,10 +10,10 @@
 /**
  * \Magento\Framework\Lock\Backend\File test case
  */
-class FileTest extends \PHPUnit\Framework\TestCase
+class FileLockTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\Lock\Backend\File
+     * @var \Magento\Framework\Lock\Backend\FileLock
      */
     private $model;
 
@@ -25,7 +25,10 @@ class FileTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->model = $this->objectManager->create(\Magento\Framework\Lock\Backend\File::class, ['path' => '/tmp']);
+        $this->model = $this->objectManager->create(
+            \Magento\Framework\Lock\Backend\FileLock::class,
+            ['path' => '/tmp']
+        );
     }
 
     public function testLockAndUnlock()
diff --git a/lib/internal/Magento/Framework/Lock/Backend/File.php b/lib/internal/Magento/Framework/Lock/Backend/FileLock.php
similarity index 99%
rename from lib/internal/Magento/Framework/Lock/Backend/File.php
rename to lib/internal/Magento/Framework/Lock/Backend/FileLock.php
index 47aed8a6fe3ec..d168e910a4ab7 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/File.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/FileLock.php
@@ -16,7 +16,7 @@
 /**
  * LockManager using the file system for locks
  */
-class File implements LockManagerInterface
+class FileLock implements LockManagerInterface
 {
     /**
      * The file driver instance
diff --git a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
index 20e0f69328c88..b142085ef6563 100644
--- a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
@@ -14,7 +14,7 @@
 use Magento\Framework\Lock\Backend\Database as DatabaseLock;
 use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
 use Magento\Framework\Lock\Backend\Cache as CacheLock;
-use Magento\Framework\Lock\Backend\File as FileLock;
+use Magento\Framework\Lock\Backend\FileLock;
 
 /**
  * The factory to create object that implements LockManagerInterface
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
index 030b126284db4..ebf2f54f3e093 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Lock\Backend\Database as DatabaseLock;
 use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
 use Magento\Framework\Lock\Backend\Cache as CacheLock;
-use Magento\Framework\Lock\Backend\File as FileLock;
+use Magento\Framework\Lock\Backend\FileLock;
 use Magento\Framework\Lock\LockBackendFactory;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Lock\LockManagerInterface;

From 8ff613ebef8d20bed5a0abab8047e9afb26ff92e Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Thu, 21 Mar 2019 19:17:03 +0200
Subject: [PATCH 0731/1055] MAGETWO-98335: Unable to find product on product
 grid page using store view level attribute

---
 ...lterByNameByStoreViewOnProductGridTest.xml | 45 +++++++++++++
 .../Product/ProductCollection.php             | 63 +++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
new file mode 100644
index 0000000000000..f3ec225540c75
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
@@ -0,0 +1,45 @@
+<?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="AdminFilterByNameByStoreViewOnProductGridTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Filter products"/>
+            <title value="Product grid filtering by store view level attribute"/>
+            <description value="Verify that products grid can be filtered on all store view level by attribute"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-98755"/>
+            <useCaseId value="MAGETWO-98335"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToEditPage"/>
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToDefaultStoreView">
+            <argument name="storeView" value="_defaultStore.name"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckUseDefault"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillNewName"/>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <actionGroup ref="filterProductGridByName" stepKey="filterGridByName">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{SimpleProduct2.name}}" stepKey="seeProductNameInGrid"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
index f4334bc25efd8..37ac5c85c6f67 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Catalog\Ui\DataProvider\Product;
 
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Eav\Model\Entity\Attribute\AttributeInterface;
+
 /**
  * Collection which is used for rendering product list in the backend.
  *
@@ -25,4 +29,63 @@ protected function _productLimitationJoinPrice()
         $this->_productLimitationFilters->setUsePriceIndex(false);
         return $this->_productLimitationPrice(true);
     }
+
+    /**
+     * Add attribute filter to collection
+     *
+     * @param AttributeInterface|integer|string|array $attribute
+     * @param null|string|array $condition
+     * @param string $joinType
+     * @return $this
+     * @throws LocalizedException
+     */
+    public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
+    {
+        $storeId = (int)$this->getStoreId();
+        if ($attribute === 'is_saleable'
+            || is_array($attribute)
+            || $storeId !== $this->getDefaultStoreId()
+        ) {
+            return parent::addAttributeToFilter($attribute, $condition, $joinType);
+        }
+
+        if ($attribute instanceof AttributeInterface) {
+            $attributeModel = $attribute;
+        } else {
+            $attributeModel = $this->getEntity()->getAttribute($attribute);
+            if ($attributeModel === false) {
+                throw new LocalizedException(
+                    __('Invalid attribute identifier for filter (%1)', get_class($attribute))
+                );
+            }
+        }
+
+        if ($attributeModel->isScopeGlobal() || $attributeModel->getBackend()->isStatic()) {
+            return parent::addAttributeToFilter($attribute, $condition, $joinType);
+        }
+
+        $this->addAttributeToFilterAllStores($attributeModel, $condition);
+
+        return $this;
+    }
+
+    /**
+     * Add attribute to filter by all stores
+     *
+     * @param Attribute $attributeModel
+     * @param array $condition
+     * @return void
+     */
+    private function addAttributeToFilterAllStores(Attribute $attributeModel, array $condition): void
+    {
+        $tableName = $this->getTable($attributeModel->getBackendTable());
+        $entity = $this->getEntity();
+        $fKey = 'e.' . $this->getEntityPkName($entity);
+        $pKey = $tableName . '.' . $this->getEntityPkName($entity);
+        $condition = "({$pKey} = {$fKey}) AND ("
+            . $this->_getConditionSql("{$tableName}.value", $condition)
+            . ')';
+        $selectExistsInAllStores = $this->getConnection()->select()->from($tableName);
+        $this->getSelect()->exists($selectExistsInAllStores, $condition);
+    }
 }

From 1cb451a2dd2aa2867a9b4b72ec5cfb8f72aa6852 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <korablov@adobe.com>
Date: Thu, 21 Mar 2019 13:15:55 -0500
Subject: [PATCH 0732/1055] MAGETWO-98151: Add support ZooKeeper and flock
 locks

---
 setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
index b4cc14e25ca19..66f41128c46b1 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
@@ -237,7 +237,7 @@ private function validateFileConfig(array $options, DeploymentConfig $deployment
         $path = $options[self::INPUT_KEY_LOCK_FILE_PATH]
             ?? $deploymentConfig->get(
                 self::CONFIG_PATH_LOCK_FILE_PATH,
-                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_PATH)
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_FILE_PATH)
             );
 
         if (!$path) {

From b96435f8d213f5de0eb8352e2e4fd1d1e117895f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Deg=C3=B3rski?= <kamil.degorski@snow.dog>
Date: Thu, 21 Mar 2019 20:00:07 +0100
Subject: [PATCH 0733/1055] magento/magento2#21001 - fix unit tests, by passing
 currency to number formatter, then it behaves as was expected in test.

---
 .../Framework/Locale/Test/Unit/FormatTest.php    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
index 1141f451c13a5..526702afb87be 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
@@ -68,15 +68,17 @@ protected function setUp()
 
     /**
      * @param string $localeCode
+     * @param string $currencyCode
      * @param array $expectedResult
      * @dataProvider getPriceFormatDataProvider
      */
-    public function testGetPriceFormat($localeCode, array $expectedResult): void
+    public function testGetPriceFormat($localeCode, $currencyCode, array $expectedResult): void
     {
         $this->scope->expects($this->once())
             ->method('getCurrentCurrency')
             ->willReturn($this->currency);
 
+        $this->currency->method('getCode')->willReturn($currencyCode);
         $result = $this->formatModel->getPriceFormat($localeCode);
         $intersection = array_intersect_assoc($result, $expectedResult);
         $this->assertCount(count($expectedResult), $intersection);
@@ -89,17 +91,17 @@ public function testGetPriceFormat($localeCode, array $expectedResult): void
     public function getPriceFormatDataProvider(): array
     {
         return [
-            ['en_US', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
-            ['de_DE', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
-            ['de_CH', ['decimalSymbol' => '.', 'groupSymbol' => '\'']],
-            ['uk_UA', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
+            ['en_US', 'USD', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
+            ['de_DE', 'EUR', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
+            ['de_CH', 'CHF', ['decimalSymbol' => '.', 'groupSymbol' => '’']],
+            ['uk_UA', 'UAH', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
         ];
     }
 
     /**
      *
-     * @param        mixed $value
-     * @param        float $expected
+     * @param mixed $value
+     * @param float $expected
      * @dataProvider provideNumbers
      */
     public function testGetNumber($value, $expected): void

From b9745a357d1acc8349487a6bcae5ce19d3f35c49 Mon Sep 17 00:00:00 2001
From: Yevhen Sentiabov <isentiabov@magento.com>
Date: Fri, 15 Mar 2019 16:00:11 -0500
Subject: [PATCH 0734/1055] MC-15427: Token Abuse in PayPal Payflow module

 - Added Captcha validation for Payflow Pro payment form
---
 .../Transparent/RequestSecureToken.php        |   4 +
 .../Transparent/RequestSecureTokenTest.php    |  93 ++++++------
 .../web/template/payment/payflowpro-form.html |   1 +
 app/code/Magento/PaypalCaptcha/LICENSE.txt    |  48 +++++++
 .../Magento/PaypalCaptcha/LICENSE_AFL.txt     |  48 +++++++
 .../Model/Checkout/ConfigProviderPayPal.php   | 135 ++++++++++++++++++
 .../Observer/CaptchaRequestToken.php          |  76 ++++++++++
 app/code/Magento/PaypalCaptcha/README.md      |   1 +
 app/code/Magento/PaypalCaptcha/composer.json  |  30 ++++
 .../PaypalCaptcha/etc/adminhtml/system.xml    |  18 +++
 app/code/Magento/PaypalCaptcha/etc/config.xml |  30 ++++
 .../Magento/PaypalCaptcha/etc/frontend/di.xml |  16 +++
 .../PaypalCaptcha/etc/frontend/events.xml     |  12 ++
 app/code/Magento/PaypalCaptcha/etc/module.xml |  15 ++
 .../Magento/PaypalCaptcha/registration.php    |   9 ++
 .../frontend/layout/checkout_index_index.xml  |  56 ++++++++
 .../view/frontend/requirejs-config.js         |  14 ++
 .../web/js/view/checkout/paymentCaptcha.js    |  44 ++++++
 .../web/js/view/payment/list-mixin.js         |  34 +++++
 .../web/template/payment/payflowpro-form.html |  90 ++++++++++++
 .../module/checkout/_payment-options.less     |   1 +
 .../module/checkout/_payment-options.less     |   1 +
 composer.json                                 |   1 +
 composer.lock                                 | 129 +++++++++++------
 24 files changed, 824 insertions(+), 82 deletions(-)
 create mode 100644 app/code/Magento/PaypalCaptcha/LICENSE.txt
 create mode 100644 app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
 create mode 100644 app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
 create mode 100644 app/code/Magento/PaypalCaptcha/README.md
 create mode 100644 app/code/Magento/PaypalCaptcha/composer.json
 create mode 100644 app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
 create mode 100644 app/code/Magento/PaypalCaptcha/etc/config.xml
 create mode 100644 app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
 create mode 100644 app/code/Magento/PaypalCaptcha/etc/frontend/events.xml
 create mode 100644 app/code/Magento/PaypalCaptcha/etc/module.xml
 create mode 100644 app/code/Magento/PaypalCaptcha/registration.php
 create mode 100644 app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml
 create mode 100644 app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
 create mode 100644 app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
 create mode 100644 app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
 create mode 100644 app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html

diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
index f4b4c39ca4021..e2701bab1f062 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -90,6 +90,10 @@ public function execute()
             return $this->getErrorResponse();
         }
 
+        if (!$this->transparent->isActive($quote->getStoreId())) {
+            return $this->getErrorResponse();
+        }
+
         $this->sessionTransparent->setQuoteId($quote->getId());
         try {
             $token = $this->secureTokenService->requestToken($quote);
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
index 60451a9827097..6752eab6a7783 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
@@ -3,16 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Test\Unit\Controller\Transparent;
 
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Session\Generic;
 use Magento\Framework\Session\SessionManager;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Paypal\Controller\Transparent\RequestSecureToken;
 use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
 use Magento\Paypal\Model\Payflow\Transparent;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class RequestSecureTokenTest
@@ -22,39 +24,39 @@
 class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var Transparent|\PHPUnit_Framework_MockObject_MockObject
+     * @var Transparent|MockObject
      */
-    protected $transparentMock;
+    private $transparent;
 
     /**
-     * @var RequestSecureToken|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestSecureToken|MockObject
      */
-    protected $controller;
+    private $controller;
 
     /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|MockObject
      */
-    protected $contextMock;
+    private $context;
 
     /**
-     * @var JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var JsonFactory|MockObject
      */
-    protected $resultJsonFactoryMock;
+    private $resultJsonFactory;
 
     /**
-     * @var Generic|\PHPUnit_Framework_MockObject_MockObject
+     * @var Generic|MockObject
      */
-    protected $sessionTransparentMock;
+    private $sessionTransparent;
 
     /**
-     * @var SecureToken|\PHPUnit_Framework_MockObject_MockObject
+     * @var SecureToken|MockObject
      */
-    protected $secureTokenServiceMock;
+    private $secureTokenService;
 
     /**
-     * @var SessionManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var SessionManager|MockObject
      */
-    protected $sessionManagerMock;
+    private $sessionManager;
 
     /**
      * Set up
@@ -64,45 +66,46 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
 
-        $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
+        $this->context = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultJsonFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
+        $this->resultJsonFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->sessionTransparentMock = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
+        $this->sessionTransparent = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
             ->setMethods(['setQuoteId'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->secureTokenServiceMock = $this->getMockBuilder(
+        $this->secureTokenService = $this->getMockBuilder(
             \Magento\Paypal\Model\Payflow\Service\Request\SecureToken::class
         )
             ->setMethods(['requestToken'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->sessionManagerMock = $this->getMockBuilder(\Magento\Framework\Session\SessionManager::class)
+        $this->sessionManager = $this->getMockBuilder(\Magento\Framework\Session\SessionManager::class)
             ->setMethods(['getQuote'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->transparentMock = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Transparent::class)
-            ->setMethods(['getCode'])
+        $this->transparent = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Transparent::class)
+            ->setMethods(['getCode', 'isActive'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->controller = new \Magento\Paypal\Controller\Transparent\RequestSecureToken(
-            $this->contextMock,
-            $this->resultJsonFactoryMock,
-            $this->sessionTransparentMock,
-            $this->secureTokenServiceMock,
-            $this->sessionManagerMock,
-            $this->transparentMock
+            $this->context,
+            $this->resultJsonFactory,
+            $this->sessionTransparent,
+            $this->secureTokenService,
+            $this->sessionManager,
+            $this->transparent
         );
     }
 
     public function testExecuteSuccess()
     {
         $quoteId = 99;
+        $storeId = 2;
         $tokenFields = ['fields-1', 'fields-2', 'fields-3'];
         $secureToken = 'token_hash';
         $resultExpectation = [
@@ -116,6 +119,8 @@ public function testExecuteSuccess()
         $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $quoteMock->method('getStoreId')
+            ->willReturn($storeId);
         $tokenMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -123,21 +128,23 @@ public function testExecuteSuccess()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->sessionManagerMock->expects($this->atLeastOnce())
+        $this->sessionManager->expects($this->atLeastOnce())
             ->method('getQuote')
             ->willReturn($quoteMock);
+        $this->transparent->method('isActive')
+            ->with($storeId)
+            ->willReturn(true);
         $quoteMock->expects($this->once())
             ->method('getId')
             ->willReturn($quoteId);
-        $this->sessionTransparentMock->expects($this->once())
+        $this->sessionTransparent->expects($this->once())
             ->method('setQuoteId')
             ->with($quoteId);
-        $this->secureTokenServiceMock->expects($this->once())
+        $this->secureTokenService->expects($this->once())
             ->method('requestToken')
             ->with($quoteMock)
             ->willReturn($tokenMock);
-        $this->transparentMock->expects($this->once())
-            ->method('getCode')
+        $this->transparent->method('getCode')
             ->willReturn('transparent');
         $tokenMock->expects($this->atLeastOnce())
             ->method('getData')
@@ -147,7 +154,7 @@ public function testExecuteSuccess()
                     ['securetoken', null, $secureToken]
                 ]
             );
-        $this->resultJsonFactoryMock->expects($this->once())
+        $this->resultJsonFactory->expects($this->once())
             ->method('create')
             ->willReturn($jsonMock);
         $jsonMock->expects($this->once())
@@ -161,6 +168,7 @@ public function testExecuteSuccess()
     public function testExecuteTokenRequestException()
     {
         $quoteId = 99;
+        $storeId = 2;
         $resultExpectation = [
             'success' => false,
             'error' => true,
@@ -170,24 +178,29 @@ public function testExecuteTokenRequestException()
         $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $quoteMock->method('getStoreId')
+            ->willReturn($storeId);
         $jsonMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->sessionManagerMock->expects($this->atLeastOnce())
+        $this->sessionManager->expects($this->atLeastOnce())
             ->method('getQuote')
             ->willReturn($quoteMock);
         $quoteMock->expects($this->once())
             ->method('getId')
             ->willReturn($quoteId);
-        $this->sessionTransparentMock->expects($this->once())
+        $this->transparent->method('isActive')
+            ->with($storeId)
+            ->willReturn(true);
+        $this->sessionTransparent->expects($this->once())
             ->method('setQuoteId')
             ->with($quoteId);
-        $this->secureTokenServiceMock->expects($this->once())
+        $this->secureTokenService->expects($this->once())
             ->method('requestToken')
             ->with($quoteMock)
             ->willThrowException(new \Exception());
-        $this->resultJsonFactoryMock->expects($this->once())
+        $this->resultJsonFactory->expects($this->once())
             ->method('create')
             ->willReturn($jsonMock);
         $jsonMock->expects($this->once())
@@ -211,10 +224,10 @@ public function testExecuteEmptyQuoteError()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->sessionManagerMock->expects($this->atLeastOnce())
+        $this->sessionManager->expects($this->atLeastOnce())
             ->method('getQuote')
             ->willReturn($quoteMock);
-        $this->resultJsonFactoryMock->expects($this->once())
+        $this->resultJsonFactory->expects($this->once())
             ->method('create')
             ->willReturn($jsonMock);
         $jsonMock->expects($this->once())
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
index f1b14831bab31..d6fb2f3e6fc75 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
@@ -58,6 +58,7 @@
             </div>
             <!-- /ko -->
         </form>
+
         <div class="checkout-agreements-block">
             <!-- ko foreach: $parent.getRegion('before-place-order') -->
                 <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/PaypalCaptcha/LICENSE.txt b/app/code/Magento/PaypalCaptcha/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly. 
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt b/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly.
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
new file mode 100644
index 0000000000000..289a1631ed1f6
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalCaptcha\Model\Checkout;
+
+use Magento\Captcha\Helper\Data;
+use Magento\Captcha\Model\CaptchaInterface;
+use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Configuration provider for Captcha rendering.
+ */
+class ConfigProviderPayPal implements ConfigProviderInterface
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Data
+     */
+    private $captchaData;
+
+    /**
+     * @var string
+     */
+    private static $formId = 'co-payment-form';
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param Data $captchaData
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        Data $captchaData
+    ) {
+        $this->storeManager = $storeManager;
+        $this->captchaData = $captchaData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getConfig(): array
+    {
+        $config['captchaPayments'][self::$formId] = [
+            'isCaseSensitive' => $this->isCaseSensitive(self::$formId),
+            'imageHeight' => $this->getImageHeight(self::$formId),
+            'imageSrc' => $this->getImageSrc(self::$formId),
+            'refreshUrl' => $this->getRefreshUrl(),
+            'isRequired' => $this->isRequired(self::$formId),
+            'timestamp' => time()
+        ];
+
+        return $config;
+    }
+
+    /**
+     * Returns is captcha case sensitive
+     *
+     * @param string $formId
+     * @return bool
+     */
+    private function isCaseSensitive(string $formId): bool
+    {
+        return (bool)$this->getCaptchaModel($formId)->isCaseSensitive();
+    }
+
+    /**
+     * Returns captcha image height
+     *
+     * @param string $formId
+     * @return int
+     */
+    private function getImageHeight(string $formId): int
+    {
+        return (int)$this->getCaptchaModel($formId)->getHeight();
+    }
+
+    /**
+     * Returns captcha image source path
+     *
+     * @param string $formId
+     * @return string
+     */
+    private function getImageSrc(string $formId): string
+    {
+        if ($this->isRequired($formId)) {
+            $captcha = $this->getCaptchaModel($formId);
+            $captcha->generate();
+            return $captcha->getImgSrc();
+        }
+
+        return '';
+    }
+
+    /**
+     * Returns URL to controller action which returns new captcha image
+     *
+     * @return string
+     */
+    private function getRefreshUrl(): string
+    {
+        $store = $this->storeManager->getStore();
+        return $store->getUrl('captcha/refresh', ['_secure' => $store->isCurrentlySecure()]);
+    }
+
+    /**
+     * Whether captcha is required to be inserted to this form
+     *
+     * @param string $formId
+     * @return bool
+     */
+    private function isRequired(string $formId): bool
+    {
+        return (bool)$this->getCaptchaModel($formId)->isRequired();
+    }
+
+    /**
+     * Return captcha model for specified form
+     *
+     * @param string $formId
+     * @return CaptchaInterface
+     */
+    private function getCaptchaModel(string $formId): CaptchaInterface
+    {
+        return $this->captchaData->getCaptcha($formId);
+    }
+}
diff --git a/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
new file mode 100644
index 0000000000000..e7cb282b1799b
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalCaptcha\Observer;
+
+use Magento\Captcha\Helper\Data;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\App\ActionFlag ;
+
+/**
+ * Validates Captcha for Request Token controller
+ */
+class CaptchaRequestToken implements ObserverInterface
+{
+    /**
+     * @var Data
+     */
+    private $helper;
+
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var ActionFlag
+     */
+    private $actionFlag;
+
+    /**
+     * @param Data $helper
+     * @param Json $jsonSerializer
+     * @param ActionFlag $actionFlag
+     */
+    public function __construct(Data $helper, Json $jsonSerializer, ActionFlag $actionFlag)
+    {
+        $this->helper = $helper;
+        $this->jsonSerializer = $jsonSerializer;
+        $this->actionFlag = $actionFlag;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(Observer $observer)
+    {
+        $formId = 'co-payment-form';
+        $captcha = $this->helper->getCaptcha($formId);
+
+        if (!$captcha->isRequired()) {
+            return;
+        }
+
+        /** @var Action $controller */
+        $controller = $observer->getControllerAction();
+        $word = $controller->getRequest()->getPost('captcha_string');
+        if ($captcha->isCorrect($word)) {
+            return;
+        }
+
+        $data = $this->jsonSerializer->serialize([
+            'success' => false,
+            'error' => true,
+            'error_messages' => __('Incorrect CAPTCHA.')
+        ]);
+        $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
+        $controller->getResponse()->representJson($data);
+    }
+}
diff --git a/app/code/Magento/PaypalCaptcha/README.md b/app/code/Magento/PaypalCaptcha/README.md
new file mode 100644
index 0000000000000..71588599a5ecd
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/README.md
@@ -0,0 +1 @@
+The PayPal Captcha module provides a possibility to enable Captcha validation on Payflow Pro payment form.
\ No newline at end of file
diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
new file mode 100644
index 0000000000000..e71ef8c0ec7de
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "magento/module-paypal-captcha",
+    "description": "Provides CAPTCHA validation for PayPal Payflow Pro",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "*",
+        "magento/module-captcha": "*",
+        "magento/module-checkout": "*",
+        "magento/module-store": "*"
+    },
+    "suggest": {
+        "magento/module-paypal": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\PaypalCaptcha\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..12afd8ceda60e
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
@@ -0,0 +1,18 @@
+<?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_Config:etc/system_file.xsd">
+    <system>
+        <section id="customer">
+            <group id="captcha" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="forms" translate="label comment" type="multiselect" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <comment>CAPTCHA for "Create user", "Forgot password", "Payflow Pro" forms is always enabled if chosen.</comment>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/etc/config.xml b/app/code/Magento/PaypalCaptcha/etc/config.xml
new file mode 100644
index 0000000000000..133a78a42f7b4
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/config.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:module:Magento_Store:etc/config.xsd">
+    <default>
+        <customer>
+            <captcha>
+                <shown_to_logged_in_user>
+                    <co-payment-form>1</co-payment-form>
+                </shown_to_logged_in_user>
+                <always_for>
+                    <co-payment-form>1</co-payment-form>
+                </always_for>
+            </captcha>
+        </customer>
+        <captcha translate="label">
+            <frontend>
+                <areas>
+                    <co-payment-form>
+                        <label>Payflow Pro</label>
+                    </co-payment-form>
+                </areas>
+            </frontend>
+        </captcha>
+    </default>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
new file mode 100644
index 0000000000000..c236d5ea04ca0
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
@@ -0,0 +1,16 @@
+<?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\Checkout\Model\CompositeConfigProvider">
+        <arguments>
+            <argument name="configProviders" xsi:type="array">
+                <item name="paypal_captcha_config_provider" xsi:type="object">Magento\PaypalCaptcha\Model\Checkout\ConfigProviderPayPal</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml
new file mode 100644
index 0000000000000..ae706c4485d61
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/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_paypal_transparent_requestsecuretoken">
+        <observer name="captcha_request_token" instance="Magento\PaypalCaptcha\Observer\CaptchaRequestToken"/>
+    </event>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/etc/module.xml b/app/code/Magento/PaypalCaptcha/etc/module.xml
new file mode 100644
index 0000000000000..425c829a5d391
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/module.xml
@@ -0,0 +1,15 @@
+<?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:Module/etc/module.xsd">
+    <module name="Magento_PaypalCaptcha" >
+        <sequence>
+            <module name="Magento_Captcha"/>
+            <module name="Magento_Paypal"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/registration.php b/app/code/Magento/PaypalCaptcha/registration.php
new file mode 100644
index 0000000000000..4dac0582a6d1b
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_PaypalCaptcha', __DIR__);
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml
new file mode 100644
index 0000000000000..9837068faab73
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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="checkout.root">
+            <arguments>
+                <argument name="jsLayout" xsi:type="array">
+                    <item name="components" xsi:type="array">
+                        <item name="checkout" xsi:type="array">
+                            <item name="children" xsi:type="array">
+                                <item name="steps" xsi:type="array">
+                                    <item name="children" xsi:type="array">
+                                        <item name="billing-step" xsi:type="array">
+                                            <item name="children" xsi:type="array">
+                                                <item name="payment" xsi:type="array">
+                                                    <item name="children" xsi:type="array">
+                                                        <item name="payments-list" xsi:type="array">
+                                                            <item name="children" xsi:type="array">
+                                                                <item name="paypal-captcha" xsi:type="array">
+                                                                    <item name="component" xsi:type="string">uiComponent</item>
+                                                                    <item name="displayArea" xsi:type="string">paypal-captcha</item>
+                                                                    <item name="dataScope" xsi:type="string">paypal-captcha</item>
+                                                                    <item name="provider" xsi:type="string">checkoutProvider</item>
+                                                                    <item name="config" xsi:type="array">
+                                                                        <item name="template" xsi:type="string">Magento_Checkout/payment/before-place-order</item>
+                                                                    </item>
+                                                                    <item name="children" xsi:type="array">
+                                                                        <item name="captcha" xsi:type="array">
+                                                                            <item name="component" xsi:type="string">Magento_PaypalCaptcha/js/view/checkout/paymentCaptcha</item>
+                                                                            <item name="displayArea" xsi:type="string">paypal-captcha</item>
+                                                                            <item name="formId" xsi:type="string">co-payment-form</item>
+                                                                            <item name="configSource" xsi:type="string">checkoutConfig</item>
+                                                                        </item>
+                                                                    </item>
+                                                                </item>
+                                                            </item>
+                                                        </item>
+                                                    </item>
+                                                </item>
+                                            </item>
+                                        </item>
+                                    </item>
+                                </item>
+                            </item>
+                        </item>
+                    </item>
+                </argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js b/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000..78e7add4ec690
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/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_Checkout/js/view/payment/list': {
+                'Magento_PaypalCaptcha/js/view/payment/list-mixin': true
+            }
+        }
+    }
+};
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
new file mode 100644
index 0000000000000..f8f119e3b3396
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Captcha/js/view/checkout/defaultCaptcha',
+    'Magento_Captcha/js/model/captchaList',
+    'Magento_Captcha/js/model/captcha'
+],
+function ($, defaultCaptcha, captchaList, Captcha) {
+    'use strict';
+
+    return defaultCaptcha.extend({
+
+        /** @inheritdoc */
+        initialize: function () {
+            var captchaConfigPayment,
+                currentCaptcha;
+
+            this._super();
+
+            if (window[this.configSource] && window[this.configSource].captchaPayments) {
+                captchaConfigPayment = window[this.configSource].captchaPayments;
+
+                $.each(captchaConfigPayment, function (formId, captchaData) {
+                    var captcha;
+
+                    captchaData.formId = formId;
+                    captcha = Captcha(captchaData);
+                    captchaList.add(captcha);
+                });
+            }
+
+            currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
+
+            if (currentCaptcha != null) {
+                currentCaptcha.setIsVisible(true);
+                this.setCurrentCaptcha(currentCaptcha);
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
new file mode 100644
index 0000000000000..c6df83a1a871c
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
@@ -0,0 +1,34 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    var mixin = {
+        /**
+         * Sets custom template for Payflow Pro
+         *
+         * @param {Object} payment
+         * @returns {Object}
+         */
+        createComponent: function (payment) {
+
+            var component = this._super(payment);
+
+            if (payment.method === 'payflowpro') {
+                component.template = 'Magento_PaypalCaptcha/payment/payflowpro-form';
+            }
+
+            return component;
+        }
+    };
+
+    /**
+     * Overrides `Magento_Checkout/js/view/payment/list::createComponent`
+     */
+    return function (target) {
+        return target.extend(mixin);
+    };
+});
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
new file mode 100644
index 0000000000000..fec5cf96b0324
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
@@ -0,0 +1,90 @@
+<!--
+/**
+ * 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 class="label" data-bind="attr: {'for': getCode()}">
+            <span data-bind="text: getTitle()"></span>
+        </label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <iframe width="0"
+                height="0"
+                data-bind="src: getSource(), attr: {id: getCode() + '-transparent-iframe', 'data-container': getCode() + '-transparent-iframe'}"
+                allowtransparency="true"
+                frameborder="0"
+                name="iframeTransparent"
+                class="payment-method-iframe">
+        </iframe>
+        <form class="form" id="co-transparent-form" action="#" method="post" data-bind="mageInit: {
+            'transparent':{
+                'context': context(),
+                'controller': getControllerName(),
+                'gateway': getCode(),
+                'orderSaveUrl':getPlaceOrderUrl(),
+                'cgiUrl': getCgiUrl(),
+                'dateDelim': getDateDelim(),
+                'cardFieldsMap': getCardFieldsMap(),
+                'nativeAction': getSaveOrderUrl()
+            }, 'validation':[]}">
+
+            <!-- ko template: 'Magento_Payment/payment/cc-form' --><!-- /ko -->
+
+            <!-- ko if: (isVaultEnabled())-->
+            <div class="field-tooltip-content">
+                <input type="checkbox"
+                       name="vault[is_enabled]"
+                       class="checkbox-inline"
+                       data-bind="attr: {'id': getCode() + '_enable_vault'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
+                <label class="label" data-bind="attr: {'for': getCode() + '_enable_vault'}">
+                    <span><!-- ko i18n: 'Save credit card information for future use.'--><!-- /ko --></span>
+                </label>
+            </div>
+            <!-- /ko -->
+        </form>
+        <fieldset class="fieldset payment items ccard">
+            <!-- ko foreach: $parent.getRegion('paypal-captcha') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!-- /ko -->
+        </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 data-role="review-save"
+                        type="submit"
+                        data-bind="
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        click: placeOrder,
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        class="action primary checkout"
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
index 3ce46a73a11c4..4d04b6e0b9653 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -137,6 +137,7 @@
                 }
             }
 
+            .captcha,
             .number {
                 .input-text {
                     width: 225px;
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 3b584bc26fe34..23bb15e6fb4fe 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
@@ -143,6 +143,7 @@
                 }
             }
 
+            .captcha,
             .number {
                 .input-text {
                     width: 225px;
diff --git a/composer.json b/composer.json
index 50b22238e0d01..27d8ac44603af 100644
--- a/composer.json
+++ b/composer.json
@@ -192,6 +192,7 @@
         "magento/module-page-cache": "*",
         "magento/module-payment": "*",
         "magento/module-paypal": "*",
+        "magento/module-paypal-captcha": "*",
         "magento/module-persistent": "*",
         "magento/module-product-alert": "*",
         "magento/module-product-video": "*",
diff --git a/composer.lock b/composer.lock
index a7131f4a16eec..793ded6baa61b 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": "60007664938710edf52eadddd7551867",
+    "content-hash": "134961111e8e1074d7155cb8f33fb927",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -164,21 +164,21 @@
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
-            "version": "v1.4.0",
+            "version": "v1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc"
+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
-                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4949ca28b86037abb44984c77bab9d0a4e075643",
+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643",
                 "shasum": ""
             },
             "require": {
                 "colinmollenhour/credis": "~1.6",
-                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0"
+                "php": "^5.5 || ^7.0"
             },
             "type": "library",
             "autoload": {
@@ -197,7 +197,7 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2018-03-29T15:54:15+00:00"
+            "time": "2019-03-18T14:43:14+00:00"
         },
         {
             "name": "composer/ca-bundle",
@@ -337,16 +337,16 @@
         },
         {
             "name": "composer/semver",
-            "version": "1.4.2",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
                 "shasum": ""
             },
             "require": {
@@ -395,7 +395,7 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30T16:08:34+00:00"
+            "time": "2019-03-19T17:25:45+00:00"
         },
         {
             "name": "composer/spdx-licenses",
@@ -1106,21 +1106,21 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.8.1",
+            "version": "v1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "57bb5ef079d3724148da3d5c99e30695ab17afda"
+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/57bb5ef079d3724148da3d5c99e30695ab17afda",
-                "reference": "57bb5ef079d3724148da3d5c99e30695ab17afda",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/87125d5b265f98c4d1b8d83a1f0726607c229421",
+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421",
                 "shasum": ""
             },
             "require": {
                 "paragonie/random_compat": ">=1",
-                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
             },
             "require-dev": {
                 "phpunit/phpunit": "^3|^4|^5"
@@ -1184,7 +1184,7 @@
                 "secret-key cryptography",
                 "side-channel resistant"
             ],
-            "time": "2019-01-03T21:00:55+00:00"
+            "time": "2019-03-20T17:19:05+00:00"
         },
         {
             "name": "pelago/emogrifier",
@@ -1382,16 +1382,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.14",
+            "version": "2.0.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "8ebfcadbf30524aeb75b2c446bc2519d5b321478"
+                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8ebfcadbf30524aeb75b2c446bc2519d5b321478",
-                "reference": "8ebfcadbf30524aeb75b2c446bc2519d5b321478",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
+                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
                 "shasum": ""
             },
             "require": {
@@ -1470,7 +1470,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2019-01-27T19:37:29+00:00"
+            "time": "2019-03-10T16:53:45+00:00"
         },
         {
             "name": "psr/container",
@@ -4965,16 +4965,16 @@
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "2.11.2",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572"
+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/004af26391cd7d1cd04b0ac736dc1324d1b4f572",
-                "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789",
+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789",
                 "shasum": ""
             },
             "require": {
@@ -5057,7 +5057,7 @@
                 }
             ],
             "description": "Initialize Symfony Console commands from annotated command class methods.",
-            "time": "2019-02-02T02:29:53+00:00"
+            "time": "2019-03-08T16:55:03+00:00"
         },
         {
             "name": "consolidation/config",
@@ -5232,16 +5232,16 @@
         },
         {
             "name": "consolidation/output-formatters",
-            "version": "3.4.0",
+            "version": "3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19"
+                "reference": "0881112642ad9059071f13f397f571035b527cb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19",
-                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/0881112642ad9059071f13f397f571035b527cb9",
+                "reference": "0881112642ad9059071f13f397f571035b527cb9",
                 "shasum": ""
             },
             "require": {
@@ -5251,11 +5251,10 @@
                 "symfony/finder": "^2.5|^3|^4"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^2",
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
                 "phpunit/phpunit": "^5.7.27",
-                "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "^2.7",
-                "symfony/console": "3.2.3",
                 "symfony/var-dumper": "^2.8|^3|^4",
                 "victorjonsson/markdowndocs": "^1.3"
             },
@@ -5264,6 +5263,52 @@
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4.0"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^6"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony3": {
+                        "require": {
+                            "symfony/console": "^3.4",
+                            "symfony/finder": "^3.4",
+                            "symfony/var-dumper": "^3.4"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "5.6.32"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        },
+                        "scenario-options": {
+                            "create-lockfile": "false"
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "3.x-dev"
                 }
@@ -5284,25 +5329,25 @@
                 }
             ],
             "description": "Format text by applying transformations provided by plug-in formatters.",
-            "time": "2018-10-19T22:35:38+00:00"
+            "time": "2019-03-14T03:45:44+00:00"
         },
         {
             "name": "consolidation/robo",
-            "version": "1.4.6",
+            "version": "1.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3"
+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
-                "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
                 "shasum": ""
             },
             "require": {
                 "consolidation/annotated-command": "^2.10.2",
-                "consolidation/config": "^1.0.10",
+                "consolidation/config": "^1.2",
                 "consolidation/log": "~1",
                 "consolidation/output-formatters": "^3.1.13",
                 "consolidation/self-update": "^1",
@@ -5392,7 +5437,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2019-02-17T05:32:27+00:00"
+            "time": "2019-03-19T18:07:19+00:00"
         },
         {
             "name": "consolidation/self-update",

From e0248ea3ce6416c9fea185a958278dd7bda1a951 Mon Sep 17 00:00:00 2001
From: AlexandrKozyr <kozyr1av@gmail.com>
Date: Thu, 21 Mar 2019 22:14:48 +0000
Subject: [PATCH 0735/1055] [+] added tests for SetPaymentMethodOnCart
 functionality

---
 .../Model/Resolver/SetPaymentMethodOnCart.php |  4 +-
 .../Customer/SetPaymentMethodOnCartTest.php   | 48 +++++++++++++++++++
 .../Guest/SetPaymentMethodOnCartTest.php      | 47 ++++++++++++++++++
 3 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
index a93c8032c996a..d1dcb4a48a76b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
@@ -60,12 +60,12 @@ public function __construct(
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
         if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
-            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing.'));
         }
         $maskedCartId = $args['input']['cart_id'];
 
         if (!isset($args['input']['payment_method']['code']) || empty($args['input']['payment_method']['code'])) {
-            throw new GraphQlInputException(__('Required parameter "payment_method" is missing'));
+            throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
         }
         $paymentMethodCode = $args['input']['payment_method']['code'];
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index c7da2144adb9e..dc970c3ab5893 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -171,6 +171,54 @@ public function testPaymentMethodOnNonExistentCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
+     */
+    public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  setPaymentMethodOnCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+      items {
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+    /**
+     * @return array
+     */
+    public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'payment_method: {code: "'.Checkmo::PAYMENT_METHOD_CHECKMO_CODE.'"}',
+                'Required parameter "cart_id" is missing.'
+            ],
+            'missed_payment_method' => [
+                'cart_id: "test"',
+                'Required parameter "code" for "payment_method" is missing.'
+            ],
+            'missed_payment_method_code' => [
+                'cart_id: "test",payment_method: {code: ""}',
+                'Required parameter "code" for "payment_method" is missing.'
+            ],
+        ];
+    }
+
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_payment_saved.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 182bbaf618505..6b6bf04b837dd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -126,6 +126,53 @@ public function testSetPaymentMethodToCustomerCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
+     */
+    public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  setPaymentMethodOnCart(
+    input: {
+      {$input}
+    }
+  ) {
+    cart {
+      items {
+        qty
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+    /**
+     * @return array
+     */
+    public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'payment_method: {code: "'.Checkmo::PAYMENT_METHOD_CHECKMO_CODE.'"}',
+                'Required parameter "cart_id" is missing.'
+            ],
+            'missed_payment_method' => [
+                'cart_id: "test"',
+                'Required parameter "code" for "payment_method" is missing.'
+            ],
+            'missed_payment_method_code' => [
+                'cart_id: "test",payment_method: {code: ""}',
+                'Required parameter "code" for "payment_method" is missing.'
+            ],
+        ];
+    }
+
     /**
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"

From 8d7b964943eae2996e9542dbfcef87e1044df825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Deg=C3=B3rski?= <kamil.degorski@snow.dog>
Date: Thu, 21 Mar 2019 23:58:25 +0100
Subject: [PATCH 0736/1055] magento/magento2#21001 - fix unit tests, by passing
 currency to number formatter, then it behaves as was expected in test.

---
 lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
index 526702afb87be..d5297b1d0c613 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
@@ -93,7 +93,7 @@ public function getPriceFormatDataProvider(): array
         return [
             ['en_US', 'USD', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
             ['de_DE', 'EUR', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
-            ['de_CH', 'CHF', ['decimalSymbol' => '.', 'groupSymbol' => '’']],
+            ['de_CH', 'CHF', ['decimalSymbol' => '.', 'groupSymbol' => '\'']],
             ['uk_UA', 'UAH', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
         ];
     }

From 645607bdd802ec87574d17d488f71277cd6eb76d Mon Sep 17 00:00:00 2001
From: Davit_Zakharyan <davit_zakharyan@epam.com>
Date: Wed, 20 Feb 2019 12:28:01 +0400
Subject: [PATCH 0737/1055] MAGETWO-58764: [GitHub] Minimal Query Length For
 Catalog Search #6681

- Added automated test script.
---
 .../AdminSetMinimalQueryLengthActionGroup.xml | 30 ++++++++++++++
 .../Mftf/Data/MinMaxQueryLengthHintsData.xml  | 14 +++++++
 .../CatalogSearchAdminConfigSection.xml       |  4 ++
 ...MinimalQueryLengthForCatalogSearchTest.xml | 41 +++++++++++++++++++
 4 files changed, 89 insertions(+)
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml

diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
new file mode 100644
index 0000000000000..ef88ea3ff7a7b
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
@@ -0,0 +1,30 @@
+<?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="SetMinimalQueryLengthActionGroup">
+        <arguments>
+            <argument name="minLength" type="string" defaultValue="1"/>
+        </arguments>
+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="navigateToConfigurationPage"/>
+        <waitForPageLoad stepKey="wait1"/>
+        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCatalogSearchTab"/>
+        <conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" visible="false" stepKey="expandCatalogSearchTab"/>
+        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" stepKey="waitTabToCollapse"/>
+        <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthHint}}" stepKey="seeHint1"/>
+        <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
+        <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
+        <fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
+        <scrollTo selector="{{AdminConfigCatalogCategoryPermissionsSection.catalogPermissionsTab}}" stepKey="goToOpenedTab"/>
+        <click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForConfigSaved"/>
+        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml b/app/code/Magento/Config/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
new file mode 100644
index 0000000000000..6fb254afea347
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/MinMaxQueryLengthHintsData.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="MinMaxQueryLength" type="constant">
+        <data key="Hint">This value must be compatible with the corresponding setting in the configured search engine</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
index e82ad4670f9b3..ab9fb55c2c9d5 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
@@ -11,5 +11,9 @@
         <element name="checkIfCatalogSearchTabExpand" type="button" selector="#catalog_search-head:not(.open)"/>
         <element name="searchEngineDefaultSystemValue" type="checkbox" selector="#catalog_search_engine_inherit"/>
         <element name="searchEngine" type="select" selector="#catalog_search_engine"/>
+        <element name="minQueryLength" type="input" selector="#catalog_search_min_query_length"/>
+        <element name="minQueryLengthInherit" type="checkbox" selector="#catalog_search_min_query_length_inherit"/>
+        <element name="minQueryLengthHint" type="text" selector="#row_catalog_search_min_query_length .value span"/>
+        <element name="maxQueryLengthHint" type="text" selector="#row_catalog_search_max_query_length .value span"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Search/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml b/app/code/Magento/Search/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
new file mode 100644
index 0000000000000..2736b3d67474f
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.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="MinimalQueryLengthForCatalogSearchTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Minimal query length for catalog search"/>
+            <description value="Minimal query length for catalog search"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-6325"/>
+            <useCaseId value="MAGETWO-58764"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="SetMinimalQueryLengthActionGroup" stepKey="setMinQueryLength"/>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="s" stepKey="fillAttribute"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeProductNameInCategoryPage"/>
+    </test>
+</tests>

From ec7015017b1e0c27c161fa62b1ead3a6367271e8 Mon Sep 17 00:00:00 2001
From: Evgeny Petrov <evgeny_petrov@epam.com>
Date: Mon, 25 Feb 2019 14:22:33 +0300
Subject: [PATCH 0738/1055] MAGETWO-58764: [GitHub] Minimal Query Length For
 Catalog Search #6681

---
 .../Adapter/Mysql/Query/Builder/Match.php     | 49 +++++++++++++++++++
 .../Magento/CatalogGraphQl/etc/graphql/di.xml |  2 +
 .../CatalogSearch/etc/adminhtml/system.xml    |  6 ++-
 app/code/Magento/CatalogSearch/etc/config.xml |  2 +-
 app/code/Magento/CatalogSearch/i18n/en_US.csv |  2 +
 .../AdminSetMinimalQueryLengthActionGroup.xml |  1 -
 .../Test/TestCase/SearchEntityResultsTest.xml |  4 +-
 .../Adapter/Mysql/Query/Builder/Match.php     | 14 +++++-
 8 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php

diff --git a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
new file mode 100644
index 0000000000000..ea262f1dd47e8
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogGraphQl\Model\Search\Adapter\Mysql\Query\Builder;
+
+use Magento\Framework\DB\Helper\Mysql\Fulltext;
+use Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface;
+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
+use Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match as BuilderMatch;
+use Magento\Search\Helper\Data;
+
+/**
+ * @inheritdoc
+ */
+class Match extends BuilderMatch
+{
+    /**
+     * @var Data
+     */
+    private $searchHelper;
+
+    /**
+     * @param ResolverInterface $resolver
+     * @param Fulltext $fulltextHelper
+     * @param Data $searchHelper
+     * @param string $fulltextSearchMode
+     * @param PreprocessorInterface[] $preprocessors
+     */
+    public function __construct(
+        ResolverInterface $resolver,
+        Fulltext $fulltextHelper,
+        Data $searchHelper,
+        $fulltextSearchMode = Fulltext::FULLTEXT_MODE_BOOLEAN,
+        array $preprocessors = []
+    ) {
+        parent::__construct($resolver, $fulltextHelper, $fulltextSearchMode, $preprocessors);
+        $this->searchHelper = $searchHelper;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getMinimalCharacterLength()
+    {
+        return $this->searchHelper->getMinQueryLength();
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
index b5622e948b7cd..a5bd42860ded0 100644
--- a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
@@ -78,4 +78,6 @@
             </argument>
         </arguments>
     </virtualType>
+    <preference for="Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match"
+                type="Magento\CatalogGraphQl\Model\Search\Adapter\Mysql\Query\Builder\Match" />
 </config>
diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
index b8f2863139e9b..c358062b88a41 100644
--- a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
+++ b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
@@ -19,13 +19,15 @@
                 <field id="engine" canRestore="1">
                     <backend_model>Magento\CatalogSearch\Model\Adminhtml\System\Config\Backend\Engine</backend_model>
                 </field>
-                <field id="min_query_length" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="min_query_length" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minimal Query Length</label>
                     <validate>validate-digits</validate>
+                    <comment>This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact.</comment>
                 </field>
-                <field id="max_query_length" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="max_query_length" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Maximum Query Length</label>
                     <validate>validate-digits</validate>
+                    <comment>This value must be compatible with the corresponding setting in the configured search engine.</comment>
                 </field>
                 <field id="max_count_cacheable_search_terms" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Number of top search results to cache</label>
diff --git a/app/code/Magento/CatalogSearch/etc/config.xml b/app/code/Magento/CatalogSearch/etc/config.xml
index 66b79226c9f34..7ea15c6caa590 100644
--- a/app/code/Magento/CatalogSearch/etc/config.xml
+++ b/app/code/Magento/CatalogSearch/etc/config.xml
@@ -13,7 +13,7 @@
             </seo>
             <search>
                 <engine>mysql</engine>
-                <min_query_length>1</min_query_length>
+                <min_query_length>3</min_query_length>
                 <max_query_length>128</max_query_length>
                 <max_count_cacheable_search_terms>100</max_count_cacheable_search_terms>
                 <autocomplete_limit>8</autocomplete_limit>
diff --git a/app/code/Magento/CatalogSearch/i18n/en_US.csv b/app/code/Magento/CatalogSearch/i18n/en_US.csv
index ba97dc9de1d31..f25d1a589d455 100644
--- a/app/code/Magento/CatalogSearch/i18n/en_US.csv
+++ b/app/code/Magento/CatalogSearch/i18n/en_US.csv
@@ -38,3 +38,5 @@ name,name
 "Maximum Query Length","Maximum Query Length"
 "Rebuild Catalog product fulltext search index","Rebuild Catalog product fulltext search index"
 "Please enter a valid price range.","Please enter a valid price range."
+"This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact.","This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact."
+"This value must be compatible with the corresponding setting in the configured search engine.","This value must be compatible with the corresponding setting in the configured search engine."
\ No newline at end of file
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
index ef88ea3ff7a7b..b9ef37cb4effe 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
@@ -21,7 +21,6 @@
         <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
         <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
         <fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
-        <scrollTo selector="{{AdminConfigCatalogCategoryPermissionsSection.catalogPermissionsTab}}" stepKey="goToOpenedTab"/>
         <click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForConfigSaved"/>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
index 9a6a66091d427..dc91608f361c2 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
@@ -57,11 +57,9 @@
         <variation name="SearchEntityResultsTestVariation12" summary="Search for simple product name using 2 symbols query length" ticketId="MAGETWO-36542">
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::name</data>
             <data name="queryLength" xsi:type="string">2</data>
-            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResultMessage" />
-            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResult" />
+            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
         </variation>
         <variation name="SearchEntityResultsTestVariation13" summary="Search for simple product name using 3 symbols query length" ticketId="MAGETWO-36542">
-            <data name="issue" xsi:type="string">MAGETWO-65509: [FT] Magento\CatalogSearch\Test\TestCase\SearchEntityResultsTest fails on Jenkins</data>
             <data name="tag" xsi:type="string">stable:no</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::name</data>
             <data name="queryLength" xsi:type="string">3</data>
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
index 51e7ea9be0c24..89815488e0bd7 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -28,7 +28,7 @@ class Match implements QueryInterface
      */
     const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
 
-    const MINIMAL_CHARACTER_LENGTH = 3;
+    const MINIMAL_CHARACTER_LENGTH = 1;
 
     /**
      * @var string[]
@@ -146,7 +146,7 @@ protected function prepareQuery($queryValue, $conditionType)
             if (empty($queryValue)) {
                 unset($queryValues[$queryKey]);
             } else {
-                $stringSuffix = self::MINIMAL_CHARACTER_LENGTH > strlen($queryValue) ? '' : '*';
+                $stringSuffix = $this->getMinimalCharacterLength() > strlen($queryValue) ? '' : '*';
                 $queryValues[$queryKey] = $stringPrefix . $queryValue . $stringSuffix;
             }
         }
@@ -155,4 +155,14 @@ protected function prepareQuery($queryValue, $conditionType)
 
         return $queryValue;
     }
+
+    /**
+     * Retrieves minimal character length
+     *
+     * @return int
+     */
+    protected function getMinimalCharacterLength()
+    {
+        return self::MINIMAL_CHARACTER_LENGTH;
+    }
 }

From 5c84ea9501971f455e5b3e01b956102782c49b8a Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Fri, 22 Mar 2019 11:46:30 +0200
Subject: [PATCH 0739/1055] graphQl-470: Creating/getting Cart queries should
 support Store context

---
 .../GraphQl/Quote/Customer/GetCartTest.php    |  4 ++--
 .../GraphQl/Quote/Guest/GetCartTest.php       |  8 +++----
 ...tive_quote_customer_not_default_store.php} |  0
 ...e_customer_not_default_store_rollback.php} |  0
 .../active_quote_guest_not_default_store.php  | 21 +++++++++++++++++++
 ...quote_guest_not_default_store_rollback.php |  8 +++++++
 6 files changed, 35 insertions(+), 6 deletions(-)
 rename dev/tests/integration/testsuite/Magento/Checkout/_files/{active_quote_not_default_store.php => active_quote_customer_not_default_store.php} (100%)
 rename dev/tests/integration/testsuite/Magento/Checkout/_files/{active_quote_not_default_store_rollback.php => active_quote_customer_not_default_store_rollback.php} (100%)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index 6581fae63e9e3..7b0f03a195958 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -135,7 +135,7 @@ public function testGetInactiveCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
      */
     public function testGetCartWithNotDefaultStore()
     {
@@ -170,7 +170,7 @@ public function testGetCartWithWrongStore()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
      *
      * @expectedException \Exception
      * @expectedExceptionMessage Store code not_existing_store does not exist
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 46c33faa088e8..f8404666e5d26 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -116,11 +116,11 @@ public function testGetInactiveCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_guest_not_default_store.php
      */
     public function testGetCartWithNotDefaultStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store_guest');
         $query = $this->getCartQuery($maskedQuoteId);
 
         $headerMap = ['Store' => 'fixture_second_store'];
@@ -148,14 +148,14 @@ public function testGetCartWithWrongStore()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_guest_not_default_store.php
      *
      * @expectedException \Exception
      * @expectedExceptionMessage Store code not_existing_store does not exist
      */
     public function testGetCartWithNotExistingStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store_guest');
 
         $headerMap['Store'] = 'not_existing_store';
         $query = $this->getCartQuery($maskedQuoteId);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php
rename to dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php
rename to dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
new file mode 100644
index 0000000000000..bbd3d5efbe8c8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+include 'testsuite/Magento/Store/_files/second_store.php';
+
+$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+$quote->setStoreId($store->getId())
+    ->setIsActive(true)
+    ->setIsMultiShipping(false)
+    ->setReservedOrderId('test_order_1_not_default_store_guest')
+    ->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();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php
new file mode 100644
index 0000000000000..f511133280e7f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_order_1_not_default_store_guest', 'reserved_order_id')->delete();

From 57c4db41be4281541fc0745bcfd4f6cbca64ef86 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 22 Mar 2019 10:32:50 +0200
Subject: [PATCH 0740/1055] ENGCOM-4302: Backward compatibility fix.

---
 .../Model/ResourceModel/Order/Collection.php  | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 33dfdcffc9a48..f5e73e2cdff27 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -769,7 +769,7 @@ public function addOrdersCount()
      */
     public function addRevenueToSelect($convertCurrency = false)
     {
-        $expr = $this->getTotalsExpression(
+        $expr = $this->getTotalsExpressionWithDiscountRefunded(
             !$convertCurrency,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
@@ -792,7 +792,7 @@ public function addSumAvgTotals($storeId = 0)
         /**
          * calculate average and total amount
          */
-        $expr = $this->getTotalsExpression(
+        $expr = $this->getTotalsExpressionWithDiscountRefunded(
             $storeId,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
@@ -810,16 +810,40 @@ public function addSumAvgTotals($storeId = 0)
     }
 
     /**
-     * Get SQL expression for totals
+     * Get SQL expression for totals.
      *
      * @param int $storeId
      * @param string $baseSubtotalRefunded
      * @param string $baseSubtotalCanceled
-     * @param string $baseDiscountRefunded
      * @param string $baseDiscountCanceled
      * @return string
+     * @deprecated
+     * @see getTotalsExpressionWithDiscountRefunded
      */
     protected function getTotalsExpression(
+        $storeId,
+        $baseSubtotalRefunded,
+        $baseSubtotalCanceled,
+        $baseDiscountCanceled
+    ) {
+        $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_to_global_rate)';
+        return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
+    }
+
+    /**
+     * Get SQL expression for totals with discount refunded.
+     *
+     * @param int $storeId
+     * @param string $baseSubtotalRefunded
+     * @param string $baseSubtotalCanceled
+     * @param string $baseDiscountRefunded
+     * @param string $baseDiscountCanceled
+     * @return string
+     */
+    private function getTotalsExpressionWithDiscountRefunded(
         $storeId,
         $baseSubtotalRefunded,
         $baseSubtotalCanceled,

From 3be8ecad58e10017f63f1bb727352719c5814f02 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <d.cheshun@atwix.com>
Date: Fri, 22 Mar 2019 13:40:26 +0200
Subject: [PATCH 0741/1055] Exclude htaccess form gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 8a15fbacaf638..8ec1104f25535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@ atlassian*
 !/pub/media/import/.htaccess
 /pub/media/logo/*
 /pub/media/custom_options/*
+!/pub/media/custom_options/.htaccess
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess

From 6fba6865685a41753fce0631bc9461e6632df8c9 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 22 Mar 2019 14:09:49 +0200
Subject: [PATCH 0742/1055] Fix functional test.

---
 app/code/Magento/Multishipping/view/frontend/web/js/overview.js | 2 +-
 .../Test/Page/MultishippingCheckoutOverview.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Multishipping/view/frontend/web/js/overview.js b/app/code/Magento/Multishipping/view/frontend/web/js/overview.js
index 9b867cd7217b1..3a6d73e304974 100644
--- a/app/code/Magento/Multishipping/view/frontend/web/js/overview.js
+++ b/app/code/Magento/Multishipping/view/frontend/web/js/overview.js
@@ -15,7 +15,7 @@ define([
             opacity: 0.5, // CSS opacity for the 'Place Order' button when it's clicked and then disabled.
             pleaseWaitLoader: 'span.please-wait', // 'Submitting order information...' Ajax loader.
             placeOrderSubmit: 'button[type="submit"]', // The 'Place Order' button.
-            agreements: '#checkout-agreements' // Container for all of the checkout agreements and terms/conditions
+            agreements: '.checkout-agreements' // Container for all of the checkout agreements and terms/conditions
         },
 
         /**
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
index d304d305a7265..a266b09278ddb 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="MultishippingCheckoutOverview" mca="multishipping/checkout/overview" module="Magento_Checkout">
-        <block name="agreementReview" class="Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview" locator="#checkout-agreements" strategy="css selector"/>
+        <block name="agreementReview" class="Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview" locator=".checkout-agreements" strategy="css selector"/>
     </page>
 </config>

From 875313e745a9c06cb777308fa53eb7952e6ce0eb Mon Sep 17 00:00:00 2001
From: Davit_Zakharyan <davit_zakharyan@epam.com>
Date: Fri, 22 Mar 2019 16:32:36 +0400
Subject: [PATCH 0743/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Updated automated test script.
---
 .../Test/Mftf/Section/StorefrontNavigationSection.xml      | 2 +-
 .../Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
index 0263e218c2417..292b2d7008bc1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
@@ -12,6 +12,6 @@
         <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"/>
-        <element name="categoryBreadcrumbsByNumber" type="textarea" selector=".breadcrumbs li:nth-of-type({{var1}})" parameterized="true"/>
+        <element name="categoryBreadcrumbsByNumber" type="textarea" selector=".breadcrumbs li:nth-of-type({{number}})" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index 990e488e9c662..47fad10977b7c 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -52,6 +52,13 @@
         <waitForPageLoad stepKey="waitForInvoicePageLoad"/>
     </actionGroup>
 
+    <actionGroup name="clearInvoicesGridFilers">
+        <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
+        <waitForPageLoad stepKey="waitInvoicesGridToLoad"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters" />
+        <waitForPageLoad stepKey="waitInvoicesGrid"/>
+    </actionGroup>
+
     <actionGroup name="goToInvoiceIntoOrder">
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
         <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeOrderInvoiceUrl"/>

From c58655ee7a12d38ac37440c19e716568fe92a662 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 22 Mar 2019 15:36:22 +0300
Subject: [PATCH 0744/1055] MAGETWO-44165:
 Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest
 fails

- Fix comments
---
 .../Mftf/Test/AdminCreateAndSwitchProductType.xml  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
index 50c17cfc4b9ab..3a40bd6661ffe 100755
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
@@ -87,6 +87,7 @@
             <title value="Admin should be able to switch a new product from simple to configurable"/>
             <description value="After selecting a simple product when adding Admin should be switch to configurable implicitly"/>
             <severity value="CRITICAL"/>
+            <useCaseId value="MAGETWO-44165"/>
             <testCaseId value="MAGETWO-29398"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
@@ -103,6 +104,8 @@
         <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
             <argument name="productType" value="simple"/>
         </actionGroup>
+        <!-- Create configurable product from simple product page-->
+        <comment userInput="Create configurable product" stepKey="commentCreateProduct"/>
         <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
@@ -112,6 +115,8 @@
         </actionGroup>
         <actionGroup ref="saveConfiguredProduct" stepKey="saveProductForm"/>
         <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product"  stepKey="seeProductTypeInGrid"/>
+        <!-- Verify product on store front -->
+        <comment userInput="Verify product on store front" stepKey="commentVerifyProductGrid"/>
         <actionGroup ref="VerifyOptionInProductStorefront" stepKey="verifyConfigurableOption" after="AssertProductInStorefrontProductPage">
             <argument name="attributeCode" value="$createConfigProductAttribute.default_frontend_label$"/>
             <argument name="optionName" value="$createConfigProductAttributeOption1.option[store_labels][1][label]$"/>
@@ -124,6 +129,7 @@
             <title value="Admin should be able to switch a new product from downloadable to configurable"/>
             <description value="After selecting a downloadable product when adding Admin should be switch to configurable implicitly"/>
             <severity value="CRITICAL"/>
+            <useCaseId value="MAGETWO-44165"/>
             <testCaseId value="MAGETWO-29398"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
@@ -145,18 +151,16 @@
             <deleteData stepKey="deleteAttribute" createDataKey="createConfigProductAttribute"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-
+        <!-- Create configurable product from downloadable product page-->
+        <comment userInput="Create configurable product" stepKey="commentCreateProduct"/>
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
         <!-- Open Dropdown and select downloadable product option -->
         <comment stepKey="beforeOpenProductFillForm" userInput="Selecting Product from the Add Product Dropdown"/>
         <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
-
         <scrollTo selector="{{AdminProductDownloadableSection.sectionHeader}}" stepKey="scrollToDownloadableInfo" />
-        <wait stepKey="2" time="3"/>
         <uncheckOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable"/>
-
         <!-- Fill form for Downloadable Product Type -->
         <comment stepKey="beforeFillProductForm" userInput="Filling Product Form"/>
         <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
@@ -178,7 +182,7 @@
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
         <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product"  stepKey="seeProductTypeInGrid"/>
-        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="AssertProductInStorefrontProductPage">
+        <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefrontProductPage">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
         <actionGroup ref="VerifyOptionInProductStorefront" stepKey="verifyConfigurableOption">

From dfd8b12280e255da6d97dbfc7272194b258e3b41 Mon Sep 17 00:00:00 2001
From: amol2jcommerce <amol@twojay.in>
Date: Fri, 22 Mar 2019 18:32:08 +0530
Subject: [PATCH 0745/1055] changes for contact us layout in I-pad

---
 .../Magento/Contact/view/frontend/web/css/source/_module.less    | 1 +
 1 file changed, 1 insertion(+)

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 0aaec05aa2afe..b31c0731c7924 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
@@ -16,6 +16,7 @@
             .form.contact {
                 float: none;
                 width: 50%;
+                min-width: 600px;
             }
         }
     }

From 4fd4281c3756748a67b82d4203ad650b89bc0c83 Mon Sep 17 00:00:00 2001
From: amol2jcommerce <amol@twojay.in>
Date: Fri, 22 Mar 2019 19:31:40 +0530
Subject: [PATCH 0746/1055] changes for contact us layout in I-pad

---
 .../Magento/Contact/view/frontend/web/css/source/_module.less    | 1 +
 1 file changed, 1 insertion(+)

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 b31c0731c7924..cb41e025d665c 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
@@ -36,6 +36,7 @@
             .form.contact {
                 float: none;
                 width: 100%;
+                min-width: auto;
             }
         }
     }

From a2416733ac6d99ef925711903e2768dac0d0909c Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 22 Mar 2019 09:41:54 -0500
Subject: [PATCH 0747/1055] =?UTF-8?q?MQE-1481:=20Investigate=20failing=20t?=
 =?UTF-8?q?est=20AdminCreateCustomProductAttributeW=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Undo change so that this test matches 2.3-develop
---
 .../AdminCreateCustomProductAttributeWithDropdownFieldTest.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
index 323a0a3a33513..09b49011938e8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
@@ -69,7 +69,7 @@
         <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.defaultStoreView('0')}}" stepKey="waitForDefaultStoreViewToVisible"/>
         <fillField selector="{{AdminCreateNewProductAttributeSection.defaultStoreView('0')}}" userInput="{{ProductAttributeOption8.label}}" stepKey="fillDefaultStoreView"/>
         <fillField selector="{{AdminCreateNewProductAttributeSection.adminOption('0')}}" userInput="{{ProductAttributeOption8.value}}" stepKey="fillAdminField"/>
-        <click selector="{{AdminCreateNewProductAttributeSection.defaultRadioButton('1')}}" stepKey="clickDefaultRadioButton"/>
+        <checkOption selector="{{AdminCreateNewProductAttributeSection.defaultRadioButton('1')}}" stepKey="selectRadioButton"/>
         <click selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}" stepKey="clickOnAdvancedAttributeProperties"/>
         <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="waitForAttributeCodeToVisible"/>
         <scrollTo selector="{{AdminCreateNewProductAttributeSection.attributeCode}}" stepKey="scrollToAttributeCode"/>

From 3825545a5dfa1ddc7ae2193ff03e4e54e0c12f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Deg=C3=B3rski?= <kamil.degorski@snow.dog>
Date: Fri, 22 Mar 2019 16:06:48 +0100
Subject: [PATCH 0748/1055] magento/magento2#21001 - make swiss group sympbol
 icu version dependent

---
 lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
index d5297b1d0c613..73a029a5a1411 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
@@ -90,10 +90,11 @@ public function testGetPriceFormat($localeCode, $currencyCode, array $expectedRe
      */
     public function getPriceFormatDataProvider(): array
     {
+        $swissGroupSymbol = INTL_ICU_VERSION >= 59.1 ? '’' : '\'';
         return [
             ['en_US', 'USD', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
             ['de_DE', 'EUR', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
-            ['de_CH', 'CHF', ['decimalSymbol' => '.', 'groupSymbol' => '\'']],
+            ['de_CH', 'CHF', ['decimalSymbol' => '.', 'groupSymbol' => $swissGroupSymbol]],
             ['uk_UA', 'UAH', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
         ];
     }

From 6e80c692bdd0e7af35e4aee738923edf083559d3 Mon Sep 17 00:00:00 2001
From: Javier Villanueva <javier@medialounge.co.uk>
Date: Fri, 22 Mar 2019 15:54:05 +0000
Subject: [PATCH 0749/1055] Trigger contentUpdate on reviews load

---
 app/code/Magento/Review/view/frontend/web/js/process-reviews.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
index d1c40959e3ec2..88c61fa38af34 100644
--- a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
+++ b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
@@ -20,7 +20,7 @@ define([
             showLoader: false,
             loaderContext: $('.product.data.items')
         }).done(function (data) {
-            $('#product-review-container').html(data);
+            $('#product-review-container').html(data).trigger('contentUpdated');
             $('[data-role="product-review"] .pages a').each(function (index, element) {
                 $(element).click(function (event) { //eslint-disable-line max-nested-callbacks
                     processReviews($(element).attr('href'), true);

From 348edaa2dd77e3f60c5ce0da973a9c5eeabca35d Mon Sep 17 00:00:00 2001
From: Yevhen Sentiabov <isentiabov@magento.com>
Date: Fri, 22 Mar 2019 12:26:13 -0500
Subject: [PATCH 0750/1055] MC-15427: Token Abuse in PayPal Payflow module

 - Added Captcha reload on negative place order flow
---
 .../templates/transparent/iframe.phtml        |  2 +-
 .../web/js/view/payment/list-mixin.js         | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
index afa71fe591495..ea06c60c30e20 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
@@ -40,7 +40,7 @@ $params = $block->getParams();
                     $(parent).trigger('clearTimeout');
                     fullScreenLoader.stopLoader();
                     globalMessageList.addErrorMessage({
-                        message: $t(<?= /* @escapeNotVerified */ json_encode($params['error_msg'])?>)
+                        message: $t(<?= /* @noEscape */ json_encode($params['error_msg'])?>)
                     });
                 }
             );
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
index c6df83a1a871c..60172f696e9ed 100644
--- a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
@@ -3,10 +3,16 @@
  * See COPYING.txt for license details.
  */
 
-define([], function () {
+define([
+    'jquery',
+    'Magento_Captcha/js/model/captchaList'
+], function ($, captchaList) {
     'use strict';
 
     var mixin = {
+
+        formId: 'co-payment-form',
+
         /**
          * Sets custom template for Payflow Pro
          *
@@ -17,11 +23,25 @@ define([], function () {
 
             var component = this._super(payment);
 
-            if (payment.method === 'payflowpro') {
+            if (component.component === 'Magento_Paypal/js/view/payment/method-renderer/payflowpro-method') {
                 component.template = 'Magento_PaypalCaptcha/payment/payflowpro-form';
+                $(window).off('clearTimeout')
+                    .on('clearTimeout', this.clearTimeout.bind(this));
             }
 
             return component;
+        },
+
+        /**
+         * Overrides default window.clearTimeout() to catch errors from iframe and reload Captcha.
+         */
+        clearTimeout: function () {
+            var captcha = captchaList.getCaptchaByFormId(this.formId);
+
+            if (captcha !== null) {
+                captcha.refresh();
+            }
+            clearTimeout();
         }
     };
 

From 34a7ec56dcc220a1983d48bc714aa3ed14daac8b Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Sat, 23 Mar 2019 03:12:09 +0200
Subject: [PATCH 0751/1055] Convert CaptchaEditCustomerTest to MFTF

---
 .../Mftf/Test/CaptchaEditCustomerTest.xml     | 74 +++++++++++++++++++
 ...frontCustomerAccountInformationSection.xml |  7 +-
 2 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
new file mode 100644
index 0000000000000..dbead37c55500
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
@@ -0,0 +1,74 @@
+<?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="CaptchaEditCustomerEmailTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="Check captcha and lockout customer on the account edit page."/>
+            <title value="Test for checking captcha on the customer account edit page and customer is locked."/>
+            <description value="Test for checking captcha on the customer account edit page and customer is locked."/>
+            <severity value="MAJOR"/>
+            <group value="captcha"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set customer/captcha/forms user_edit" stepKey="enableUserEditCaptcha"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <!-- Sign in as customer -->
+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+                <argument name="Customer" value="$$customer$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <!-- Revert Captcha forms configurations -->
+            <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="enableUserEditCaptcha"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+        </after>
+
+        <!-- Open Customer edit page -->
+        <amOnPage url="/customer/account/edit/" stepKey="goToEditPage"/>
+        <waitForPageLoad stepKey="waitForEditPage"/>
+
+        <!-- Update email with incorrect password 3 times. -->
+        <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox1"/>
+        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword1"/>
+        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange1"/>
+        <see userInput="The password doesn't match this account. Verify the password and try again." selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage1"/>
+
+        <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox2"/>
+        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword2"/>
+        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange2"/>
+        <see userInput="The password doesn't match this account. Verify the password and try again." selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage2"/>
+
+        <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox3"/>
+        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword3"/>
+        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange3"/>
+        <see userInput="The password doesn't match this account. Verify the password and try again." selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage3"/>
+
+        <!-- Check captcha visibility after incorrect password submit form -->
+        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaField}}" stepKey="seeCaptchaField"/>
+        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
+        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaField}}" stepKey="seeCaptchaField2"/>
+        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
+        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
+
+        <!-- Try to submit for with incorrect captcha -->
+        <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox4"/>
+        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword4"/>
+        <fillField selector="{{StorefrontCustomerEditFormSection.captchaField}}" userInput="wrongCaptcha" stepKey="enterWrongCaptcha"/>
+        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange4"/>
+        <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
index b819a78002c62..e93985b4f469b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
@@ -11,13 +11,16 @@
     <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="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" timeout="30"/>
         <element name="currentPassword" type="input" selector="#current-password"/>
         <element name="newPassword" type="input" selector="#password"/>
         <element name="confirmNewPassword" type="input" selector="#password-confirmation"/>
         <element name="confirmNewPasswordError" type="text" selector="#password-confirmation-error"/>
+        <element name="captchaField" type="input" selector="#captcha_user_edit"/>
+        <element name="captchaImg" type="block" selector=".captcha-img"/>
+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
     </section>
 </sections>

From d3970362db0455451f014a133d8ca297f96c0c87 Mon Sep 17 00:00:00 2001
From: Systaliuk Kostiantyn <leandry@atwix.com>
Date: Sat, 23 Mar 2019 13:05:29 +0200
Subject: [PATCH 0752/1055] Fix stepKey and comment typos

---
 .../Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
index dbead37c55500..646c9af3ba55f 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
@@ -30,8 +30,8 @@
         <after>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <!-- Revert Captcha forms configurations -->
-            <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="enableUserEditCaptcha"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+            <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="revertCaptchaConfigurations"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
         </after>
 
         <!-- Open Customer edit page -->
@@ -64,7 +64,7 @@
         <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
         <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
 
-        <!-- Try to submit for with incorrect captcha -->
+        <!-- Try to submit form with incorrect captcha -->
         <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox4"/>
         <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword4"/>
         <fillField selector="{{StorefrontCustomerEditFormSection.captchaField}}" userInput="wrongCaptcha" stepKey="enterWrongCaptcha"/>

From b2268d07c0451cde97d71b41cd9099884ac93f04 Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Sat, 23 Mar 2019 16:09:12 +0200
Subject: [PATCH 0753/1055] Convert CaptchaOnStoreFrontRegisterTest to MFTF

---
 .../Test/CaptchaOnStoreFrontRegisterTest.xml  | 51 +++++++++++++++++++
 .../StorefrontCustomerCreateFormSection.xml   |  3 ++
 2 files changed, 54 insertions(+)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontRegisterTest.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontRegisterTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontRegisterTest.xml
new file mode 100644
index 0000000000000..86a660563086e
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontRegisterTest.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="CaptchaOnStoreFrontRegisterTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="Test creation for customer register with captcha on storefront."/>
+            <title value="Captcha customer registration"/>
+            <description value="Test creation for customer register with captcha on storefront."/>
+            <severity value="MAJOR"/>
+            <group value="captcha"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!--  Enable captcha for customer. -->
+            <magentoCLI command="config:set customer/captcha/forms user_create" stepKey="enableUserRegistrationCaptcha"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+        </before>
+        <after>
+            <!-- Set default configuration. -->
+            <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="revertCaptchaConfigurations"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
+        </after>
+
+        <!-- Open Customer registration page -->
+        <amOnPage url="/customer/account/create/" stepKey="goToRegistrationPage"/>
+        <waitForPageLoad stepKey="waitForRegistrationPage"/>
+
+        <!-- Check captcha visibility registration page load -->
+        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaField}}" stepKey="seeCaptchaField"/>
+        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
+        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
+
+        <!-- Submit form with incorrect captcha -->
+        <fillField  selector="{{StorefrontCustomerCreateFormSection.firstnameField}}" userInput="FirstName"  stepKey="fillFirstName"/>
+        <fillField  selector="{{StorefrontCustomerCreateFormSection.lastnameField}}" userInput="LastName" stepKey="fillLastName" />
+        <fillField  stepKey="fillEmail" userInput="email@example.com" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
+        <fillField  stepKey="fillPassword" userInput="123123Qq" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
+        <fillField  stepKey="fillConfirmPassword" userInput="123123Qq" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.captchaField}}" userInput="wrongCaptcha" stepKey="enterWrongCaptcha"/>
+        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
+        <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
index 8881a2a012ce8..68851e88ec4b2 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -17,6 +17,9 @@
         <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"/>
+        <element name="captchaField" type="input" selector="#captcha_user_create"/>
+        <element name="captchaImg" type="block" selector=".captcha-img"/>
+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
     </section>
     <section name="StoreFrontCustomerAdvancedAttributesSection">
         <element name="textFieldAttribute" type="input" selector="//input[@id='{{var}}']" parameterized="true" />

From 2302d11380584bc8c2787df55b064b7fb62b7e8c Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sat, 23 Mar 2019 15:59:08 +0100
Subject: [PATCH 0754/1055] Convert ResetCustomerPasswordFailedTest to MFTF

---
 ...refrontResetCustomerPasswordFailedTest.xml | 47 +++++++++++++++++++
 .../ResetCustomerPasswordFailedTest.xml       |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
new file mode 100644
index 0000000000000..7050050097874
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
@@ -0,0 +1,47 @@
+<?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="StorefrontResetCustomerPasswordFailedTest">
+        <annotations>
+            <features value="Customer"/>
+            <title value="Customer tries to reset password several times"/>
+            <description value="Customer tries to reset password several times"/>
+            <group value="Customer"/>
+            <group value="security"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set customer/captcha/enable 0" stepKey="disableCaptcha"/>
+            <createData stepKey="customer" entity="Simple_US_Customer"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
+        </after>
+        <!-- Go to login page, and click on the forgot password link -->
+        <amOnPage stepKey="amOnSignInPage1"  url="{{StorefrontCustomerSignInPage.url}}"/>
+        <click stepKey="clickForgotPasswordLink1" selector="{{StorefrontCustomerSignInFormSection.forgotPasswordLink}}"/>
+        <see stepKey="seePageTitle1" userInput="Forgot Your Password" selector="{{StorefrontForgotPasswordSection.pageTitle}}"/>
+        <!-- Enter email and submit the forgot password form -->
+        <fillField stepKey="enterEmail1" userInput="$$customer.email$$" selector="{{StorefrontForgotPasswordSection.email}}"/>
+        <click stepKey="clickResetPassword1" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
+        <seeInCurrentUrl stepKey="seeInSignInPage" url="account/login"/>
+        <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.successMessage}}" stepKey="waitForSuccessMessage" />
+        <see stepKey="seeSuccessMessage" userInput="If there is an account associated with $$customer.email$$ you will receive an email with a link to reset your password." selector="{{StorefrontCustomerLoginMessagesSection.successMessage}}"/>
+        <!-- Repeat the procedure once again and ensure that on a second attempt customer sees an error -->
+        <amOnPage stepKey="amOnSignInPage2"  url="{{StorefrontCustomerSignInPage.url}}"/>
+        <click stepKey="clickForgotPasswordLink2" selector="{{StorefrontCustomerSignInFormSection.forgotPasswordLink}}"/>
+        <see stepKey="seePageTitle2" userInput="Forgot Your Password" selector="{{StorefrontForgotPasswordSection.pageTitle}}"/>
+        <fillField stepKey="enterEmail2" userInput="$$customer.email$$" selector="{{StorefrontForgotPasswordSection.email}}"/>
+        <click stepKey="clickResetPassword2" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
+        <seeInCurrentUrl stepKey="seeInForgotPasswordPage" url="account/forgotpassword"/>
+        <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" stepKey="waitForFailMessage" />
+        <see stepKey="seeFailMessage" userInput="We received too many requests for password resets. Please wait and try again later or contact hello@example.com." selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}"/>
+    </test>
+</tests>
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml
index 0b5b8a059cbbd..524f57c78b4ba 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.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\Security\Test\TestCase\ResetCustomerPasswordFailedTest" summary="Reset customer password.">
         <variation name="ResetPasswordTestVariation">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="tag" xsi:type="string">severity:S1</data>
             <data name="customer/dataset" xsi:type="string">customer_US</data>
             <data name="attempts" xsi:type="string">2</data>

From 4571e8ec1db00b4f4c0205950e127f29e60f1428 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Sat, 23 Mar 2019 20:58:48 +0100
Subject: [PATCH 0755/1055] GraphQL-423: Removed enable_shipping_methods
 fixture from prepared fixtures

---
 .../GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 8d58ff7e77bce..3715a27e2c45d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -320,7 +320,6 @@ public function testSetShippingMethodToNonExistentCart()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetShippingMethodToGuestCart()

From ae4f83491abafc882ab4f29be0eebbe5994f642e Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Sat, 23 Mar 2019 23:22:24 +0200
Subject: [PATCH 0756/1055] Convert CaptchaOnStoreFrontLoginTest to MFTF

---
 .../Test/CaptchaOnStoreFrontLoginTest.xml     | 62 +++++++++++++++++++
 .../StorefrontCustomerSignInFormSection.xml   |  3 +
 2 files changed, 65 insertions(+)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontLoginTest.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontLoginTest.xml
new file mode 100644
index 0000000000000..59de69b1d2b0d
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontLoginTest.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="CaptchaOnStoreFrontLoginTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="Check CAPTCHA on Storefront Login Page."/>
+            <title value="Captcha customer login page test"/>
+            <description value="Check CAPTCHA on Storefront Login Page."/>
+            <severity value="MAJOR"/>
+            <group value="captcha"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!-- Open storefront login form -->
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontLoginPage"/>
+
+        <!-- Login with wrong credentials 3 times -->
+        <fillField selector="{{StorefrontCustomerSignInFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail1"/>
+        <fillField selector="{{StorefrontCustomerSignInFormSection.passwordField}}" userInput="$$customer.password$$INVALID" stepKey="fillPassword1" />
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton1"/>
+        <see selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." stepKey="seeErrorMessage1" />
+        <dontSee selector="StorefrontCustomerSignInFormSection.captchaField" stepKey="dontSeeCaptchaInputField1"/>
+
+        <fillField selector="{{StorefrontCustomerSignInFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail2"/>
+        <fillField selector="{{StorefrontCustomerSignInFormSection.passwordField}}" userInput="$$customer.password$$INVALID" stepKey="fillPassword2" />
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton2"/>
+        <see selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." stepKey="seeErrorMessage2" />
+        <dontSee selector="StorefrontCustomerSignInFormSection.captchaField" stepKey="dontSeeCaptchaInputField2"/>
+
+        <fillField selector="{{StorefrontCustomerSignInFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail3"/>
+        <fillField selector="{{StorefrontCustomerSignInFormSection.passwordField}}" userInput="$$customer.password$$INVALID" stepKey="fillPassword3" />
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton3"/>
+        <see selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." stepKey="seeErrorMessage3" />
+
+        <!-- Check captcha visibility on login page  -->
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="seeCaptchaField"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
+
+        <!-- Submit form with incorrect captcha -->
+        <fillField selector="{{StorefrontCustomerSignInFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail4"/>
+        <fillField selector="{{StorefrontCustomerSignInFormSection.passwordField}}" userInput="$$customer.password$$INVALID" stepKey="fillPassword4" />
+        <fillField selector="{{StorefrontCustomerSignInFormSection.captchaField}}" userInput="InvalidCaptcha" stepKey="fillCaptcha" />
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton4"/>
+        <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
index f52b379379ad1..a6f41fb63415c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -13,6 +13,9 @@
         <element name="passwordField" type="input" selector="#pass"/>
         <element name="signInAccountButton" type="button" selector="#send2" timeout="30"/>
         <element name="forgotPasswordLink" type="link" selector=".action.remind" timeout="10"/>
+        <element name="captchaField" type="input" selector="#captcha_user_login"/>
+        <element name="captchaImg" type="block" selector=".captcha-img"/>
+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
     </section>
     <section name="StorefrontCustomerSignInPopupFormSection">
         <element name="errorMessage" type="input" selector="[data-ui-id='checkout-cart-validationmessages-message-error']"/>

From dd3eb459660b79acd6a8b34afaea1a3e7d83e3fb Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Sun, 24 Mar 2019 00:30:15 +0200
Subject: [PATCH 0757/1055] Convert CaptchaOnContactUsTest to MFTF

---
 .../StorefrontContactUsFormSection.xml        | 20 +++++++
 .../Test/Mftf/Test/CaptchaOnContactUsTest.xml | 54 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
new file mode 100644
index 0000000000000..235712b0b5b57
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.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="StorefrontContactUsFormSection">
+        <element name="captchaField" type="input" selector="#captcha_contact_us"/>
+        <element name="captchaImg" type="block" selector=".captcha-img"/>
+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
+        <element name="nameField" type="input" selector="#name"/>
+        <element name="emailField" type="input" selector="#email"/>
+        <element name="commentField" type="textarea" selector="#comment"/>
+        <element name="submitFormButton" type="button" selector=".action.submit.primary" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml
new file mode 100644
index 0000000000000..64978f32aa61a
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.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="CaptchaOnContactUsTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="Test creation for send comment using the contact us form with captcha."/>
+            <title value="Captcha contact us form test"/>
+            <description value="Test creation for send comment using the contact us form with captcha."/>
+            <severity value="MAJOR"/>
+            <group value="captcha"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set customer/captcha/forms contact_us" stepKey="enableUserEditCaptcha"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="revertCaptchaConfigurations"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!-- Open storefront contact us form -->
+        <amOnPage url="/contact/" stepKey="amOnContactUpPage"/>
+        <waitForPageLoad stepKey="waitForContactUpPage"/>
+
+        <!-- Check Captcha items -->
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaField}}" stepKey="seeCaptchaField1"/>
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaImg}}" stepKey="seeCaptchaImage1"/>
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton1"/>
+
+        <!-- Submit Contact Us form -->
+        <fillField selector="{{StorefrontContactUsFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail"/>
+        <fillField selector="{{StorefrontContactUsFormSection.nameField}}"  userInput="$$customer.firstname$$" stepKey="fillName"/>
+        <fillField selector="{{StorefrontContactUsFormSection.commentField}}"  userInput="Lorem ipsum dolor sit amet, ne enim aliquando eam, oblique deserunt no usu." stepKey="fillComment"/>
+        <fillField selector="{{StorefrontContactUsFormSection.captchaField}}" userInput="InvalidCaptcha" stepKey="fillCaptcha" />
+        <click selector="{{StorefrontContactUsFormSection.submitFormButton}}" stepKey="clickSubmitFormButton"/>
+
+        <!-- Check Captcha items after form reload -->
+        <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage"/>
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaField}}" stepKey="seeCaptchaField2"/>
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
+    </test>
+</tests>

From c3e4f07b3d377dce75c3968d2d9ced1c3d31538f Mon Sep 17 00:00:00 2001
From: Nazarn96 <nazarn96@gmail.com>
Date: Fri, 15 Mar 2019 12:14:43 +0200
Subject: [PATCH 0758/1055] fix-issue-21755

---
 .../Event/Invoker/InvokerDefault.php          | 30 ++++++++++++++++---
 .../Test/Unit/Invoker/InvokerDefaultTest.php  | 13 ++++++--
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
index a7a387b5def81..acd0a61633557 100644
--- a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
+++ b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
@@ -9,7 +9,12 @@
 namespace Magento\Framework\Event\Invoker;
 
 use Magento\Framework\Event\Observer;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\State;
 
+/**
+ * Default Invoker.
+ */
 class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
 {
     /**
@@ -22,20 +27,29 @@ class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
     /**
      * Application state
      *
-     * @var \Magento\Framework\App\State
+     * @var State
      */
     protected $_appState;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param \Magento\Framework\Event\ObserverFactory $observerFactory
-     * @param \Magento\Framework\App\State $appState
+     * @param State $appState
+     * @param LoggerInterface $logger
      */
     public function __construct(
         \Magento\Framework\Event\ObserverFactory $observerFactory,
-        \Magento\Framework\App\State $appState
+        State $appState,
+        LoggerInterface $logger = null
     ) {
         $this->_observerFactory = $observerFactory;
         $this->_appState = $appState;
+        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(LoggerInterface::class);
     }
 
     /**
@@ -61,6 +75,8 @@ public function dispatch(array $configuration, Observer $observer)
     }
 
     /**
+     * Execute Observer.
+     *
      * @param \Magento\Framework\Event\ObserverInterface $object
      * @param Observer $observer
      * @return $this
@@ -70,7 +86,7 @@ protected function _callObserverMethod($object, $observer)
     {
         if ($object instanceof \Magento\Framework\Event\ObserverInterface) {
             $object->execute($observer);
-        } elseif ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
+        } elseif ($this->_appState->getMode() == State::MODE_DEVELOPER) {
             throw new \LogicException(
                 sprintf(
                     'Observer "%s" must implement interface "%s"',
@@ -78,6 +94,12 @@ protected function _callObserverMethod($object, $observer)
                     \Magento\Framework\Event\ObserverInterface::class
                 )
             );
+        } else {
+            $this->logger->warning(sprintf(
+                'Observer "%s" must implement interface "%s"',
+                get_class($object),
+                \Magento\Framework\Event\ObserverInterface::class
+            ));
         }
         return $this;
     }
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
index 37f650dbef6a0..82e660913ddc1 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
@@ -32,6 +32,11 @@ class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
      */
     protected $_invokerDefault;
 
+    /**
+     * @var |Psr\Log|LoggerInterface
+     */
+    private $loggerMock;
+
     protected function setUp()
     {
         $this->_observerFactoryMock = $this->createMock(\Magento\Framework\Event\ObserverFactory::class);
@@ -41,10 +46,12 @@ protected function setUp()
             ['execute']
         );
         $this->_appStateMock = $this->createMock(\Magento\Framework\App\State::class);
+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
 
         $this->_invokerDefault = new \Magento\Framework\Event\Invoker\InvokerDefault(
             $this->_observerFactoryMock,
-            $this->_appStateMock
+            $this->_appStateMock,
+            $this->loggerMock
         );
     }
 
@@ -166,13 +173,15 @@ public function testWrongInterfaceCallWithDisabledDeveloperMode($shared)
             $this->returnValue($notObserver)
         );
         $this->_appStateMock->expects(
-            $this->once()
+            $this->exactly(2)
         )->method(
             'getMode'
         )->will(
             $this->returnValue(\Magento\Framework\App\State::MODE_PRODUCTION)
         );
 
+        $this->loggerMock->expects($this->once())->method('warning');
+
         $this->_invokerDefault->dispatch(
             [
                 'shared' => $shared,

From 9c1dc7ec97d7e9a942f809da5095073261e5c8ed Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Sun, 24 Mar 2019 19:40:46 +0200
Subject: [PATCH 0759/1055] Convert CaptchaOnAdminLoginTest to MFTF

---
 .../Mftf/Section/AdminLoginFormSection.xml    |  4 ++
 .../Mftf/Test/CaptchaOnAdminLoginTest.xml     | 62 +++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
index 3b10fac7bb9dc..8b28e923cc017 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
@@ -12,5 +12,9 @@
         <element name="username" type="input" selector="#username"/>
         <element name="password" type="input" selector="#login"/>
         <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
+        <element name="captchaField" type="input" selector="#captcha"/>
+        <element name="captchaImg" type="block" selector="#backend_login"/>
+        <element name="captchaReload" type="block" selector="#captcha-reload"/>
+        <element name="error" type="text" selector=".message.message-error.error"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml
new file mode 100644
index 0000000000000..80f1832200fc1
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.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="CaptchaOnAdminLoginTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="Test creation for send comment using the contact us form with captcha."/>
+            <title value="Captcha contact us form test"/>
+            <description value="Test creation for send comment using the contact us form with captcha."/>
+            <severity value="MAJOR"/>
+            <group value="captcha"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+
+        </before>
+        <after>
+
+        </after>
+        <!-- Open admin login page -->
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="goToAdminLoginPage" />
+        <waitForPageLoad stepKey="waitForPageLoad1" />
+
+        <!-- Login as Admin with incorrect credentials 3 times -->
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillUsername1"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPassword1"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin1"/>
+        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." selector="{{AdminLoginFormSection.error}}" stepKey="seeLoginError1"/>
+
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillUsername2"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPassword2"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin2"/>
+        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." selector="{{AdminLoginFormSection.error}}" stepKey="seeLoginError2"/>
+
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillUsername3"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPassword3"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin3"/>
+        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." selector="{{AdminLoginFormSection.error}}" stepKey="seeLoginError3"/>
+
+        <!-- Check captcha visibility on admin login page  -->
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeCaptchaField1"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeCaptchaImage1"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton1"/>
+
+        <!-- Submit form with incorrect captcha -->
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillUsername4"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPassword4"/>
+        <fillField selector="{{AdminLoginFormSection.captchaField}}" userInput="incorrectCaptcha" stepKey="fillCaptcha4"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin4"/>
+        <see userInput="Incorrect CAPTCHA." selector="{{AdminLoginFormSection.error}}" stepKey="seeCaptchaError"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeCaptchaField2"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
+    </test>
+</tests>

From a71f53ac7a42648499e6faf425e018990c6d6d87 Mon Sep 17 00:00:00 2001
From: amol2jcommerce <amol@twojay.in>
Date: Mon, 25 Mar 2019 10:57:16 +0530
Subject: [PATCH 0760/1055] changes for contact-us-layout-ipad-not-proper-2.3

---
 .../view/frontend/web/css/source/_module.less        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 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 cb41e025d665c..a9454bb6be253 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
@@ -16,12 +16,21 @@
             .form.contact {
                 float: none;
                 width: 50%;
-                min-width: 600px;
             }
         }
     }
 }
 
+//
+// Desktop
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+    .contact-index-index .column:not(.sidebar-additional) .form.contact {
+        min-width: 600px;
+    }
+}
+
 //  Mobile
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .contact-index-index {
@@ -36,7 +45,6 @@
             .form.contact {
                 float: none;
                 width: 100%;
-                min-width: auto;
             }
         }
     }

From 756a9258521867bbf7b6c90978acbebd16ecaded Mon Sep 17 00:00:00 2001
From: Evgeny Petrov <evgeny_petrov@epam.com>
Date: Mon, 25 Mar 2019 09:28:52 +0300
Subject: [PATCH 0761/1055] MAGETWO-58764: [GitHub] Minimal Query Length For
 Catalog Search #6681

---
 .../Model/Search/Adapter/Mysql/Query/Builder/Match.php          | 2 ++
 .../Framework/Search/Adapter/Mysql/Query/Builder/Match.php      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
index ea262f1dd47e8..f5b06d9715d8d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogGraphQl\Model\Search\Adapter\Mysql\Query\Builder;
 
 use Magento\Framework\DB\Helper\Mysql\Fulltext;
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
index 89815488e0bd7..c881dd9b49079 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Search\Adapter\Mysql\Query\Builder;
 
 use Magento\Framework\DB\Helper\Mysql\Fulltext;

From df5d4e397de34d743da1b903bfe1e5d21368987d Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Mon, 25 Mar 2019 09:30:55 +0200
Subject: [PATCH 0762/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 .../Product/View/Type/Bundle/Option.php       | 40 ++++++++++++++++---
 .../Bundle/view/base/web/js/price-bundle.js   | 33 ++++++++++++++-
 .../view/type/bundle/option/checkbox.phtml    |  3 ++
 .../view/type/bundle/option/radio.phtml       |  3 ++
 .../view/type/bundle/option/select.phtml      |  9 +++++
 5 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 7c63af0bd0e2e..c6b97e7d55695 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -6,6 +6,10 @@
 
 namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\TierPrice;
+use Magento\Framework\Pricing\Render;
+
 /**
  * Bundle option renderer
  * @api
@@ -179,7 +183,7 @@ protected function assignSelection(\Magento\Bundle\Model\Option $option, $select
     /**
      * Define if selection is selected
      *
-     * @param  \Magento\Catalog\Model\Product $selection
+     * @param  Product $selection
      * @return bool
      */
     public function isSelected($selection)
@@ -219,7 +223,7 @@ protected function _getSelectedQty()
     /**
      * Get product model
      *
-     * @return \Magento\Catalog\Model\Product
+     * @return Product
      */
     public function getProduct()
     {
@@ -232,7 +236,7 @@ public function getProduct()
     /**
      * Get bundle option price title.
      *
-     * @param \Magento\Catalog\Model\Product $selection
+     * @param Product $selection
      * @param bool $includeContainer
      * @return string
      */
@@ -254,7 +258,7 @@ public function getSelectionQtyTitlePrice($selection, $includeContainer = true)
     /**
      * Get price for selection product
      *
-     * @param \Magento\Catalog\Model\Product $selection
+     * @param Product $selection
      * @return int|float
      */
     public function getSelectionPrice($selection)
@@ -277,7 +281,7 @@ public function getSelectionPrice($selection)
     /**
      * Get title price for selection product
      *
-     * @param \Magento\Catalog\Model\Product $selection
+     * @param Product $selection
      * @param bool $includeContainer
      * @return string
      */
@@ -318,7 +322,7 @@ public function setOption(\Magento\Bundle\Model\Option $option)
     /**
      * Format price string
      *
-     * @param \Magento\Catalog\Model\Product $selection
+     * @param Product $selection
      * @param bool $includeContainer
      * @return string
      */
@@ -339,4 +343,28 @@ public function renderPriceString($selection, $includeContainer = true)
 
         return $priceHtml;
     }
+
+    /**
+     * Format tier price string
+     *
+     * @param Product $selection
+     * @param array $arguments
+     * @return string
+     */
+    public function renderTierPriceString(Product $selection, array $arguments = []): string
+    {
+        if (!array_key_exists('zone', $arguments)) {
+            $arguments['zone'] = Render::ZONE_ITEM_OPTION;
+        }
+
+        /** @var Render $priceRender */
+        $priceRender = $this->getLayout()->getBlock('product.price.render.default');
+        $priceHtml = $priceRender->render(
+            TierPrice::PRICE_CODE,
+            $selection,
+            $arguments
+        );
+
+        return $priceHtml;
+    }
 }
diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index e56cc6f32d804..b139d8bdd1807 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -27,7 +27,8 @@ define([
         '<% } %>',
         controlContainer: 'dd', // should be eliminated
         priceFormat: {},
-        isFixedPrice: false
+        isFixedPrice: false,
+        optionTierPricesBlocksSelector: '#option-tier-prices-{1} [data-role="selection-tier-prices"]'
     };
 
     $.widget('mage.priceBundle', {
@@ -91,6 +92,8 @@ define([
             if (changes) {
                 priceBox.trigger('updatePrice', changes);
             }
+
+            this._displayTierPriceBlock(bundleOption);
             this.updateProductSummary();
         },
 
@@ -207,6 +210,34 @@ define([
             return this;
         },
 
+        /**
+         * Show or hide option tier prices block
+         *
+         * @param {Object} optionElement
+         * @private
+         */
+        _displayTierPriceBlock: function (optionElement) {
+            var optionType = optionElement.prop('type'),
+                optionId,
+                optionValue,
+                optionTierPricesElements;
+
+            if (optionType === 'select-one') {
+                optionId = utils.findOptionId(optionElement[0]);
+                optionValue = optionElement.val() || null;
+                optionTierPricesElements = $(this.options.optionTierPricesBlocksSelector.replace('{1}', optionId));
+
+                _.each(optionTierPricesElements, function (tierPriceElement) {
+                    var selectionId = $(tierPriceElement).data('selection-id') + '';
+                    if (selectionId === optionValue) {
+                        $(tierPriceElement).show();
+                    } else {
+                        $(tierPriceElement).hide();
+                    }
+                });
+            }
+        },
+
         /**
          * Handler to update productSummary box
          */
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
index bda649eb603e6..231fd3c9e5ab7 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -19,6 +19,7 @@
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
                 <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+                <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selections[0]) ?>
                 <input type="hidden"
                        class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
                        name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
@@ -38,6 +39,8 @@
                         <label class="label"
                                for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
                             <span><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
+                            <br/>
+                            <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selection) ?>
                         </label>
                     </div>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
index 7ea89e8609818..e08c52def52cb 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
@@ -21,6 +21,7 @@
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
                 <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
+                <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selections[0]) ?>
                 <input type="hidden"
                     class="bundle-option-<?= (int)$_option->getId() ?>  product bundle option"
                     name="bundle_option[<?= (int)$_option->getId() ?>]"
@@ -57,6 +58,8 @@
                         <label class="label"
                                for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
                             <span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span>
+                            <br/>
+                            <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selection) ?>
                         </label>
                     </div>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
index 977daa2b2a446..73c9db32eb91e 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
@@ -20,6 +20,7 @@
     <div class="control">
         <?php if ($block->showSingle()): ?>
             <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
+            <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selections[0]) ?>
             <input type="hidden"
                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
@@ -39,6 +40,14 @@
                     </option>
                 <?php endforeach; ?>
             </select>
+            <div id="option-tier-prices-<?= /* @escapeNotVerified */ $_option->getId() ?>">
+                <?php foreach ($_selections as $_selection): ?>
+                    <div data-role="selection-tier-prices"
+                         data-selection-id="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
+                        <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selection) ?>
+                    </div>
+                <?php endforeach; ?>
+            </div>
         <?php endif; ?>
         <div class="nested">
             <div class="field qty qty-holder">

From 44ddbab42b47a16bf3f1491a5658c2ba255c81cf Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 25 Mar 2019 11:28:02 +0200
Subject: [PATCH 0763/1055] Fix functional test.

---
 .../tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml
index 8445a21604cdd..4d96ebd2edbe3 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest70">
-            <data name="menuItem" xsi:type="string">Marketing > Reviews</data>
+            <data name="menuItem" xsi:type="string">Marketing > All Reviews</data>
             <data name="pageTitle" xsi:type="string">Reviews</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>

From 53be539210a54273bacdceefa5efc5fde61e128b Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Mon, 25 Mar 2019 12:16:01 +0200
Subject: [PATCH 0764/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 app/code/Magento/Bundle/view/base/web/js/price-bundle.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index 2b176a4bba4ed..49ee253ad1e88 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -229,6 +229,7 @@ define([
 
                 _.each(optionTierPricesElements, function (tierPriceElement) {
                     var selectionId = $(tierPriceElement).data('selection-id') + '';
+
                     if (selectionId === optionValue) {
                         $(tierPriceElement).show();
                     } else {

From 6f2c98b7b19368f7d5e4a19f9b0bff1d5b5f430a Mon Sep 17 00:00:00 2001
From: Ivan Gerchak <ivang@ven.com>
Date: Mon, 25 Mar 2019 12:40:52 +0200
Subject: [PATCH 0765/1055] Change event "mouseup" to "mousedown"

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

diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js
index db98a1cc39a30..c20329c0ce63d 100644
--- a/lib/web/mage/gallery/gallery.js
+++ b/lib/web/mage/gallery/gallery.js
@@ -141,7 +141,7 @@ define([
             this.setupBreakpoints();
             this.initFullscreenSettings();
 
-            this.settings.$element.on('mouseup', '.fotorama__stage__frame', function () {
+            this.settings.$element.on('mousedown', '.fotorama__stage__frame', function () {
                 if (
                     !$(this).parents('.fotorama__shadows--left, .fotorama__shadows--right').length &&
                     !$(this).hasClass('fotorama-video-container')

From 7cba972fabb18ccea6b46b1bb7d4baf8e8127b25 Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Mon, 25 Mar 2019 13:39:38 +0200
Subject: [PATCH 0766/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 .../Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php   | 3 +--
 app/code/Magento/Bundle/Model/Product/Price.php                | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index c6b97e7d55695..e169efb0c40a3 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -7,7 +7,6 @@
 namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
 
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Pricing\Price\TierPrice;
 use Magento\Framework\Pricing\Render;
 
 /**
@@ -360,7 +359,7 @@ public function renderTierPriceString(Product $selection, array $arguments = [])
         /** @var Render $priceRender */
         $priceRender = $this->getLayout()->getBlock('product.price.render.default');
         $priceHtml = $priceRender->render(
-            TierPrice::PRICE_CODE,
+            'tier_price',
             $selection,
             $arguments
         );
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index c1a995266e94e..c9ed97fada966 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -15,6 +15,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Price extends \Magento\Catalog\Model\Product\Type\Price

From 42ed84a97209f120655261fdb290bef9b456c6d3 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Mon, 25 Mar 2019 14:27:39 +0300
Subject: [PATCH 0767/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Add strict type declaration
---
 .../Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php      | 2 ++
 .../Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php      | 2 ++
 .../Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
index 882fec2ab7c46..64e569977429c 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Pdf\Items\Creditmemo;
 
 /**
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 9c183ed44c72a..4a77053521e4a 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
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Pdf\Items\Invoice;
 
 /**
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
index c175b9866fb8e..fd18830e45b6e 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Pdf\Items\Shipment;
 
 /**

From c289f5dd45e879c48b2dda152985de7611174e15 Mon Sep 17 00:00:00 2001
From: Aliaksei Yakimovich2 <aliaksei_yakimovich2@epam.com>
Date: Mon, 25 Mar 2019 14:42:53 +0300
Subject: [PATCH 0768/1055] MAGETWO-70232: [GITHUB] Import customizable options
 adds it to another product if same SKU is filled#9457

- code refactoring;
---
 app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index 4d5dd57b76f61..6b2f3aba12e7a 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Product\Option;
 
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface as OptionRepository;
@@ -71,7 +73,7 @@ public function execute($entity, $arguments = [])
      * @param bool $hasChangedSku
      * @param string $newSku
      */
-    private function processOptionsSaving($options, $hasChangedSku, $newSku)
+    private function processOptionsSaving(array $options, bool $hasChangedSku, string $newSku)
     {
         foreach ($options as $option) {
             if ($hasChangedSku && $option->hasData('product_sku')) {

From 222fd6570e88050185cebe08e58842862bca6615 Mon Sep 17 00:00:00 2001
From: Aliaksei Yakimovich2 <aliaksei_yakimovich2@epam.com>
Date: Mon, 25 Mar 2019 15:06:12 +0300
Subject: [PATCH 0769/1055] MAGETWO-64838: Unable to create order from store
 front if customer address custom attribute is required

- code refactoring;
---
 app/code/Magento/Customer/Model/FileProcessor.php             | 2 ++
 .../Magento/Framework/Webapi/ServiceInputProcessor.php        | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Model/FileProcessor.php b/app/code/Magento/Customer/Model/FileProcessor.php
index e7e235b31fe49..c16faea284296 100644
--- a/app/code/Magento/Customer/Model/FileProcessor.php
+++ b/app/code/Magento/Customer/Model/FileProcessor.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Model;
 
 /**
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index 96f06e93a0411..f8fe514903ea8 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -349,7 +349,7 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
      *
      * @return array
      */
-    private function getAttributesPreprocessorsMap()
+    private function getAttributesPreprocessorsMap(): array
     {
         if (!$this->attributesPreprocessorsMap) {
             foreach ($this->customAttributePreprocessors as $attributePreprocessor) {
@@ -368,7 +368,7 @@ private function getAttributesPreprocessorsMap()
      * @param string $key
      * @param mixed $customAttribute
      */
-    private function runCustomAttributePreprocessors($key, &$customAttribute)
+    private function runCustomAttributePreprocessors(string $key, &$customAttribute)
     {
         $preprocessorsMap = $this->getAttributesPreprocessorsMap();
         if ($key && is_array($customAttribute) && array_key_exists($key, $preprocessorsMap)) {

From def3be9388834af9809f03f469d4d6fc10ad8d8d Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 25 Mar 2019 14:18:24 +0200
Subject: [PATCH 0770/1055] magento/magento2#21749: Static test fix.

---
 .../Sitemap/Model/ResourceModel/Catalog/Product.php   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
index ebcc7b9bd62e8..2e2e3cc1dcc5b 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Sitemap\Model\ResourceModel\Catalog;
 
+use Magento\Catalog\Helper\Product as HelperProduct;
 use Magento\Catalog\Model\Product\Image\UrlBuilder;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-use Magento\Store\Model\Store;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Catalog\Helper\Product as HelperProduct;
+use Magento\Store\Model\Store;
 
 /**
  * Sitemap resource product collection model
@@ -259,7 +259,7 @@ protected function _joinAttribute($storeId, $attributeCode, $column = null)
         // Add attribute value to result set if needed
         if (isset($column)) {
             $this->_select->columns([
-               $column => $columnValue
+                $column => $columnValue
             ]);
         }
     }
@@ -282,7 +282,7 @@ protected function _getAttribute($attributeCode)
                 'attribute_id' => $attribute->getId(),
                 'table' => $attribute->getBackend()->getTable(),
                 'is_global' => $attribute->getIsGlobal() ==
-                \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
+                    \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL,
                 'backend_type' => $attribute->getBackendType(),
             ];
         }
@@ -324,7 +324,8 @@ public function getCollection($storeId)
             []
         )->joinLeft(
             ['url_rewrite' => $this->getTable('url_rewrite')],
-            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND NULLIF(url_rewrite.metadata,"") IS '
+            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 '
+            . 'AND NULLIF(url_rewrite.metadata,"") IS '
             . $urlsConfigCondition . 'NULL'
             . $connection->quoteInto(' AND url_rewrite.store_id = ?', $store->getId())
             . $connection->quoteInto(' AND url_rewrite.entity_type = ?', ProductUrlRewriteGenerator::ENTITY_TYPE),

From 59771c40c1a2aa857d3b64b0905aa67c1705a1c9 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 25 Mar 2019 14:58:00 +0200
Subject: [PATCH 0771/1055] Fix static tests.

---
 .../Magento/Quote/Model/QuoteManagement.php   | 60 ++++++++++++-------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index e1058c98271c1..2fcfd2dfadabb 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -532,28 +532,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
             );
             $this->quoteRepository->save($quote);
         } catch (\Exception $e) {
-            try {
-                if (!empty($this->addressesToSync)) {
-                    foreach ($this->addressesToSync as $addressId) {
-                        $this->addressRepository->deleteById($addressId);
-                    }
-                }
-                $this->eventManager->dispatch(
-                    'sales_model_service_quote_submit_failure',
-                    [
-                        'order' => $order,
-                        'quote' => $quote,
-                        'exception' => $e,
-                    ]
-                );
-            } catch (\Exception $consecutiveException) {
-                $message = sprintf(
-                    "An exception occurred on 'sales_model_service_quote_submit_failure' event: %s",
-                    $consecutiveException->getMessage()
-                );
-
-                throw new \Exception($message, 0, $e);
-            }
+            $this->rollbackAddresses($quote, $order, $e);
             throw $e;
         }
         return $order;
@@ -620,4 +599,41 @@ protected function _prepareCustomerQuote($quote)
             $shipping->setIsDefaultBilling(true);
         }
     }
+
+    /**
+     * Remove related to order and quote addresses and submit exception to further processing.
+     *
+     * @param Quote $quote
+     * @param \Magento\Sales\Api\Data\OrderInterface $order
+     * @param \Exception $e
+     * @throws \Exception
+     */
+    private function rollbackAddresses(
+        QuoteEntity $quote,
+        \Magento\Sales\Api\Data\OrderInterface $order,
+        \Exception $e
+    ): void {
+        try {
+            if (!empty($this->addressesToSync)) {
+                foreach ($this->addressesToSync as $addressId) {
+                    $this->addressRepository->deleteById($addressId);
+                }
+            }
+            $this->eventManager->dispatch(
+                'sales_model_service_quote_submit_failure',
+                [
+                    'order' => $order,
+                    'quote' => $quote,
+                    'exception' => $e,
+                ]
+            );
+        } catch (\Exception $consecutiveException) {
+            $message = sprintf(
+                "An exception occurred on 'sales_model_service_quote_submit_failure' event: %s",
+                $consecutiveException->getMessage()
+            );
+
+            throw new \Exception($message, 0, $e);
+        }
+    }
 }

From b8f5c5363a3ea33fe9e79c79fee77cc448f07fe0 Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Mon, 25 Mar 2019 15:20:18 +0200
Subject: [PATCH 0772/1055] graphQl-527: Category Tree Contains null Leaves

---
 .../Model/Category/DepthCalculator.php        |  4 +-
 .../Magento/GraphQl/Catalog/CategoryTest.php  | 43 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
index dbe58a9c77cd0..5645b18017a2f 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
@@ -26,7 +26,9 @@ public function calculate(FieldNode $fieldNode) : int
         $depth = count($selections) ? 1 : 0;
         $childrenDepth = [0];
         foreach ($selections as $node) {
-            if ($node->kind === 'InlineFragment') {
+            if ($node->kind === 'InlineFragment'
+            || null !== $node->alias
+            ) {
                 continue;
             }
 
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 cbce53325e9e6..dc3b348c2706e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -8,6 +8,7 @@
 namespace Magento\GraphQl\Catalog;
 
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Framework\DataObject;
 use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
@@ -23,9 +24,15 @@ class CategoryTest extends GraphQlAbstract
      */
     private $objectManager;
 
+    /**
+     * @var CategoryRepository
+     */
+    private $categoryRepository;
+
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->categoryRepository = $this->objectManager->get(CategoryRepository::class);
     }
 
     /**
@@ -103,6 +110,42 @@ public function testCategoriesTree()
         );
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testCategoriesTreeWithDisabledCategory()
+    {
+        $category = $this->categoryRepository->get(3);
+        $category->setIsActive(false);
+        $this->categoryRepository->save($category);
+
+        $rootCategoryId = 2;
+        $query = <<<QUERY
+{
+  category(id: {$rootCategoryId}) {
+      id
+      name
+      level
+      description
+      children {
+        id
+        name
+        productImagePreview: products(pageSize: 1) {
+            items {
+                id
+                } 
+            }
+      }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey('category', $response);
+        $this->assertArrayHasKey('children', $response['category']);
+        $this->assertSame(6, count($response['category']['children']));
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      */

From b7dd71842d576faabf07c10b4cbac6436ee6aca9 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Mon, 25 Mar 2019 17:39:01 +0300
Subject: [PATCH 0773/1055] MAGETWO-44165:
 Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnCreationTest
 fails

- Skip tests till the next MSI release
---
 .../Test/Mftf/Test/AdminCreateAndSwitchProductType.xml   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
index 3a40bd6661ffe..93df31a7d89e5 100755
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml
@@ -53,6 +53,9 @@
             <testCaseId value="MC-10930"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MSI-2110"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
@@ -91,6 +94,9 @@
             <testCaseId value="MAGETWO-29398"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MSI-2110"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
@@ -133,6 +139,9 @@
             <testCaseId value="MAGETWO-29398"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MSI-2110"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>

From a8c14f12153898d2c1a58fab67afa51d45101ad8 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Mon, 25 Mar 2019 10:53:00 -0500
Subject: [PATCH 0774/1055] MQE-1492: Deliver weekly mtf-to-mftf PR

- Add mtf migrated flag to MTF tests
---
 .../Test/TestCase/NavigateMenuTest.xml          |  1 +
 .../Test/TestCase/NavigateMenuTest.xml          |  2 ++
 .../Backend/Test/TestCase/NavigateMenuTest.xml  |  5 +++++
 .../Catalog/Test/TestCase/NavigateMenuTest.xml  |  4 ++++
 .../Test/TestCase/NavigateMenuTest.xml          |  1 +
 .../Test/TestCase/NavigateMenuTest.xml          |  2 ++
 .../Test/TestCase/SearchEntityResultsTest.xml   | 17 ++++++++++++++++-
 .../Test/TestCase/NavigateMenuTest.xml          |  2 +-
 .../Cms/Test/TestCase/NavigateMenuTest.xml      |  4 ++--
 .../Test/TestCase/NavigateMenuTest.xml          |  2 ++
 .../Customer/Test/TestCase/NavigateMenuTest.xml |  3 +++
 .../Email/Test/TestCase/NavigateMenuTest.xml    |  1 +
 .../Test/TestCase/NavigateMenuTest.xml          |  2 ++
 .../Indexer/Test/TestCase/NavigateMenuTest.xml  |  1 +
 .../Test/TestCase/NavigateMenuTest.xml          |  1 +
 .../Test/TestCase/NavigateMenuTest.xml          |  4 ++++
 .../Paypal/Test/TestCase/NavigateMenuTest.xml   |  4 ++--
 .../Reports/Test/TestCase/NavigateMenuTest.xml  | 15 +++++++++++++++
 .../Review/Test/TestCase/NavigateMenuTest.xml   |  4 ++++
 .../Sales/Test/TestCase/NavigateMenuTest.xml    |  6 ++++++
 .../Test/TestCase/NavigateMenuTest.xml          |  1 +
 .../Sitemap/Test/TestCase/NavigateMenuTest.xml  |  2 +-
 .../TestCase/CreateStoreGroupEntityTest.xml     |  5 +++--
 .../MoveStoreToOtherGroupSameWebsiteTest.xml    |  1 +
 .../Test/TestCase/UpdateStoreEntityTest.xml     |  4 ++--
 .../TestCase/UpdateStoreGroupEntityTest.xml     |  4 ++--
 .../Tax/Test/TestCase/NavigateMenuTest.xml      |  3 +++
 .../Theme/Test/TestCase/NavigateMenuTest.xml    |  1 +
 .../Test/TestCase/NavigateMenuTest.xml          |  1 +
 .../User/Test/TestCase/NavigateMenuTest.xml     |  4 ++++
 .../Variable/Test/TestCase/NavigateMenuTest.xml |  1 +
 .../Widget/Test/TestCase/NavigateMenuTest.xml   |  2 +-
 32 files changed, 96 insertions(+), 14 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/AdminNotification/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/AdminNotification/Test/TestCase/NavigateMenuTest.xml
index f2f56eb74f704..99bd9c6d9d220 100644
--- a/dev/tests/functional/tests/app/Magento/AdminNotification/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/AdminNotification/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Notifications</data>
             <data name="pageTitle" xsi:type="string">Notifications</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
index cdb73c5d36f25..8f7b07c8c14c4 100644
--- a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate to menu chapter">
         <variation name="NavigateMenuTestBIEssentials" summary="Navigate through BI Essentials admin menu to Sign Up page" ticketId="MAGETWO-63700">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="issue" xsi:type="string">MAGETWO-97261: Magento\Backend\Test\TestCase\NavigateMenuTest fails on Jenkins</data>
             <data name="menuItem" xsi:type="string">Reports > BI Essentials</data>
             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
@@ -15,6 +16,7 @@
             <constraint name="Magento\Analytics\Test\Constraint\AssertBIEssentialsLink" />
         </variation>
         <variation name="NavigateMenuTestAdvancedReporting" summary="Navigate through Advanced Reporting admin menu to BI Reports page" ticketId="MAGETWO-65748">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Advanced Reporting</data>
             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
             <data name="advancedReportingLink" xsi:type="string">https://advancedreporting.rjmetrics.com/report</data>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.xml
index 67842f62d7c92..afdf70704a984 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.xml
@@ -8,26 +8,31 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate through admin menu" ticketId="MAGETWO-34874">
         <variation name="NavigateMenuTest2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Dashboard</data>
             <data name="pageTitle" xsi:type="string">Dashboard</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Content > Schedule</data>
             <data name="pageTitle" xsi:type="string">Store Design Schedule</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > All Stores</data>
             <data name="pageTitle" xsi:type="string">Stores</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Configuration</data>
             <data name="pageTitle" xsi:type="string">Configuration</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest6">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Cache Management</data>
             <data name="pageTitle" xsi:type="string">Cache Management</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
index 260095048431e..08bff9f70708a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml
@@ -8,21 +8,25 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest9">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Catalog > Products</data>
             <data name="pageTitle" xsi:type="string">Products</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest10">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Catalog > Categories</data>
             <data name="pageTitle" xsi:type="string">Default Category (ID: 2)</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest11">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Product</data>
             <data name="pageTitle" xsi:type="string">Product Attributes</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest12">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Attribute Set</data>
             <data name="pageTitle" xsi:type="string">Attribute Sets</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/NavigateMenuTest.xml
index 659d76eabccbe..4a965d5708947 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest14">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Catalog Price Rule</data>
             <data name="pageTitle" xsi:type="string">Catalog Price Rule</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/NavigateMenuTest.xml
index 493d427dd0ac2..d9bb0f65e704e 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest15">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Search Terms</data>
             <data name="pageTitle" xsi:type="string">Search Terms</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest16">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Search Terms</data>
             <data name="pageTitle" xsi:type="string">Search Terms Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
index 9a6a66091d427..6bfd12407b1c8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
@@ -8,53 +8,64 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogSearch\Test\TestCase\SearchEntityResultsTest" summary="Use Quick Search to Find Product" ticketId="MAGETWO-25095">
         <variation name="SearchEntityResultsTestVariation1" summary="Use Quick Search to Find the Product" ticketId="MAGETWO-12420">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::sku</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
         </variation>
         <variation name="SearchEntityResultsTestVariation2" summary="Search simple product and add to cart" ticketId="MAGETWO-43235">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::simple</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
         </variation>
         <variation name="SearchEntityResultsTestVariation3" summary="Search virtual product and add to cart" ticketId="MAGETWO-43235">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductVirtual::default::virtual</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
         </variation>
         <variation name="SearchEntityResultsTestVariation4" summary="Search configurable product and add to cart" ticketId="MAGETWO-43235">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">configurableProduct::default::configurable</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
         </variation>
         <variation name="SearchEntityResultsTestVariation5" summary="Search downloadable product and add to cart" ticketId="MAGETWO-43235">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">downloadableProduct::default::downloadable</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
         </variation>
         <variation name="SearchEntityResultsTestVariation6" summary="Search grouped product and add to cart" ticketId="MAGETWO-43235">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">groupedProduct::withSimpleProducts_without_qty::grouped</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
         </variation>
         <variation name="SearchEntityResultsTestVariation7" summary="Search bundle dynamic product and add to cart" ticketId="MAGETWO-43235">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">bundleProduct::bundle_dynamic_product::bundle</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductAddedToCartFromSearchResults" />
         </variation>
         <variation name="SearchEntityResultsTestVariation8" summary="Search fixed product">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">bundleProduct::bundle_fixed_product::bundle</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchResult" />
         </variation>
         <variation name="SearchEntityResultsTestVariation9">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::name</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
         </variation>
         <variation name="SearchEntityResultsTestVariation10">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::product_with_special_symbols_in_name::name</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
         </variation>
         <variation name="SearchEntityResultsTestVariation11">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/search_query" xsi:type="string">TryToFindMeAndI&#39;llFindYOU</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResultMessage" />
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResult" />
         </variation>
         <variation name="SearchEntityResultsTestVariation12" summary="Search for simple product name using 2 symbols query length" ticketId="MAGETWO-36542">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::name</data>
             <data name="queryLength" xsi:type="string">2</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResultMessage" />
@@ -68,6 +79,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
         </variation>
         <variation name="SearchEntityResultsTestVariation14" summary="Search for simple product name using 128 symbols query length" ticketId="MAGETWO-36542">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::product_with_long_name::name</data>
             <data name="queryLength" xsi:type="string">128</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
@@ -82,6 +94,7 @@
         <variation name="SearchEntityResultsTestVariation16"
                    summary="Search for two simple products for text in attributes with same search weight and check their sort order"
                    ticketId="MAGETWO-64501">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/search_query" xsi:type="string">alaska</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="array">
                 <item name="product_2" xsi:type="string">catalogProductSimple::search_weight_term_twice_weight_1</item>
@@ -92,6 +105,7 @@
         <variation name="SearchEntityResultsTestVariation17"
                    summary="Search for two simple products for text in attributes with different search weight and check their sort order"
                    ticketId="MAGETWO-64502">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/search_query" xsi:type="string">alaska</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="array">
                 <item name="product_1" xsi:type="string">catalogProductSimple::search_weight_term_once_weight_5</item>
@@ -100,6 +114,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchResultOrder" />
         </variation>
         <variation name="SearchEntityResultsTestVariation18" summary="Search Configurable Product with Enabled and Disabled Children." ticketId="MAGETWO-69181">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">configurableProduct::one_simple_product_not_visible_individually::name</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchResult" />
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertConfigurableWithDisabledOptionCatalogSearchNoResult" />
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/NavigateMenuTest.xml
index 18cbf32ded5c1..3458e2944a9ec 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest17">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Terms and Conditions</data>
             <data name="pageTitle" xsi:type="string">Terms and Conditions</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/NavigateMenuTest.xml
index f9f0a11c0a475..cff5f7f2a5622 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/NavigateMenuTest.xml
@@ -8,13 +8,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest18">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Content > Pages</data>
             <data name="pageTitle" xsi:type="string">Pages</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest19">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Content > Blocks</data>
             <data name="pageTitle" xsi:type="string">Blocks</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/NavigateMenuTest.xml
index 0a061eb4be6c7..fc031a77ff53f 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest20">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Currency Rates</data>
             <data name="pageTitle" xsi:type="string">Currency Rates</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest21">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Currency Symbols</data>
             <data name="pageTitle" xsi:type="string">Currency Symbols</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
index 404e62dcad648..a4a3aa34f9f1c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
@@ -8,16 +8,19 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest22">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Customers > All Customers</data>
             <data name="pageTitle" xsi:type="string">Customers</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest23">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Customers > Now Online</data>
             <data name="pageTitle" xsi:type="string">Customers Now Online</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest24">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Customers > Customer Groups</data>
             <data name="pageTitle" xsi:type="string">Customer Groups</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/NavigateMenuTest.xml
index f6dcdd5b65d02..4e98019c25317 100644
--- a/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest29">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Email Templates</data>
             <data name="pageTitle" xsi:type="string">Email Templates</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/NavigateMenuTest.xml
index 6ce4d01d177db..d396a364a3f42 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest35">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Import</data>
             <data name="pageTitle" xsi:type="string">Import</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest36">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Export</data>
             <data name="pageTitle" xsi:type="string">Export</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Indexer/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Indexer/Test/TestCase/NavigateMenuTest.xml
index 883e9bde47bf8..16ae092e62cad 100644
--- a/dev/tests/functional/tests/app/Magento/Indexer/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Indexer/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest37">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Index Management</data>
             <data name="pageTitle" xsi:type="string">Index Management</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/NavigateMenuTest.xml
index 22def36751f53..265790ed4b763 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest38">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Integrations</data>
             <data name="pageTitle" xsi:type="string">Integrations</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/NavigateMenuTest.xml
index 13843a50868e7..b1a6b3e0c4386 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/NavigateMenuTest.xml
@@ -8,21 +8,25 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest46">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Newsletter Template</data>
             <data name="pageTitle" xsi:type="string">Newsletter Templates</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest47">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Newsletter Queue</data>
             <data name="pageTitle" xsi:type="string">Newsletter Queue</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest48">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Newsletter Subscribers</data>
             <data name="pageTitle" xsi:type="string">Newsletter Subscribers</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest49">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Newsletter Problem Reports</data>
             <data name="pageTitle" xsi:type="string">Newsletter Problems Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml
index d7d031f559f82..114235e75524f 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/NavigateMenuTest.xml
@@ -8,13 +8,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate through admin menu" ticketId="MAGETWO-34874">
         <variation name="NavigateMenuTest50">
-            <data name="tag" xsi:type="string">severity:S0</data>
+            <data name="tag" xsi:type="string">severity:S0, mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > PayPal Settlement</data>
             <data name="pageTitle" xsi:type="string">PayPal Settlement Reports</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest51">
-            <data name="tag" xsi:type="string">severity:S0</data>
+            <data name="tag" xsi:type="string">severity:S0, mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Sales > Billing Agreements</data>
             <data name="pageTitle" xsi:type="string">Billing Agreements</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NavigateMenuTest.xml
index 08cce1ffe7d23..4e3cd1824767a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/NavigateMenuTest.xml
@@ -8,76 +8,91 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate through Reports admin menu">
         <variation name="NavigateMenuTest55">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Products in Cart</data>
             <data name="pageTitle" xsi:type="string">Products in Carts</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest56">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Abandoned Carts</data>
             <data name="pageTitle" xsi:type="string">Abandoned Carts</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest57">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Orders</data>
             <data name="pageTitle" xsi:type="string">Orders Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest58">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Tax</data>
             <data name="pageTitle" xsi:type="string">Tax Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest59">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Invoiced</data>
             <data name="pageTitle" xsi:type="string">Invoice Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest60">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Coupons</data>
             <data name="pageTitle" xsi:type="string">Coupons Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest61">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Order Total</data>
             <data name="pageTitle" xsi:type="string">Order Total Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest62">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Order Count</data>
             <data name="pageTitle" xsi:type="string">Order Count Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest63">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > New</data>
             <data name="pageTitle" xsi:type="string">New Accounts Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest64">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Views</data>
             <data name="pageTitle" xsi:type="string">Product Views Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest65">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Bestsellers</data>
             <data name="pageTitle" xsi:type="string">Bestsellers Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest66">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Low Stock</data>
             <data name="pageTitle" xsi:type="string">Low Stock Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest67">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Ordered</data>
             <data name="pageTitle" xsi:type="string">Ordered Products Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest68">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Downloads</data>
             <data name="pageTitle" xsi:type="string">Downloads Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest69">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Refresh Statistics</data>
             <data name="pageTitle" xsi:type="string">Refresh Statistics</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml
index 8445a21604cdd..a70636a132a4f 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/TestCase/NavigateMenuTest.xml
@@ -8,21 +8,25 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest70">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Reviews</data>
             <data name="pageTitle" xsi:type="string">Reviews</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest71">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > By Customers</data>
             <data name="pageTitle" xsi:type="string">Customer Reviews Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest72">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > By Products</data>
             <data name="pageTitle" xsi:type="string">Product Reviews Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest73">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Rating</data>
             <data name="pageTitle" xsi:type="string">Ratings</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/NavigateMenuTest.xml
index 316ba33f19fdb..5cc673f4b4fa5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/NavigateMenuTest.xml
@@ -8,31 +8,37 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest77">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Sales > Orders</data>
             <data name="pageTitle" xsi:type="string">Orders</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest78">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Sales > Invoices</data>
             <data name="pageTitle" xsi:type="string">Invoices</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest79">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Sales > Shipments</data>
             <data name="pageTitle" xsi:type="string">Shipments</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest80">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Sales > Credit Memos</data>
             <data name="pageTitle" xsi:type="string">Credit Memos</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest81">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Sales > Transactions</data>
             <data name="pageTitle" xsi:type="string">Transactions</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest82">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Order Status</data>
             <data name="pageTitle" xsi:type="string">Order Status</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/NavigateMenuTest.xml
index 0a100eabcff46..1eeaeaaa483c0 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest83">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Cart Price Rules</data>
             <data name="pageTitle" xsi:type="string">Cart Price Rules</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/NavigateMenuTest.xml
index cbef8fd52fd80..0f9514ffc7a00 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest85">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Site Map</data>
             <data name="pageTitle" xsi:type="string">Site Map</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml
index 8cdeb48bb1c98..dcfe22eb0d5f8 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/CreateStoreGroupEntityTest.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\Store\Test\TestCase\CreateStoreGroupEntityTest" summary="Create Store Group" ticketId="MAGETWO-27345">
         <variation name="CreateStoreGroupEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
             <data name="storeGroup/data/website_id/dataset" xsi:type="string">main_website</data>
             <data name="storeGroup/data/name" xsi:type="string">store_name_%isolation%</data>
             <data name="storeGroup/data/code" xsi:type="string">store_code_%isolation%</data>
@@ -18,7 +18,7 @@
             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupOnStoreViewForm" />
         </variation>
         <variation name="CreateStoreGroupEntityTestVariation2">
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
             <data name="storeGroup/data/website_id/dataset" xsi:type="string">custom_website</data>
             <data name="storeGroup/data/name" xsi:type="string">store_name_%isolation%</data>
             <data name="storeGroup/data/code" xsi:type="string">store_code_%isolation%</data>
@@ -29,6 +29,7 @@
             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupOnStoreViewForm" />
         </variation>
         <variation name="CreateStoreGroupEntityTestVariation3" summary="Check the absence of delete button" ticketId="MAGETWO-17475">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="storeGroup/dataset" xsi:type="string">custom_new_group</data>
             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupSuccessSaveMessage" />
             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupForm" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/MoveStoreToOtherGroupSameWebsiteTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/MoveStoreToOtherGroupSameWebsiteTest.xml
index 8da208bc3f0f1..ab702dfdd4b78 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/MoveStoreToOtherGroupSameWebsiteTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/MoveStoreToOtherGroupSameWebsiteTest.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\Store\Test\TestCase\MoveStoreToOtherGroupSameWebsiteTest" summary="Move Store View" ticketId="MAGETWO-58361">
         <variation name="MoveStoreTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="storeInitialA/dataset" xsi:type="string">custom_group_custom_store</data>
             <data name="storeInitialB/dataset" xsi:type="string">custom_group_custom_store</data>
             <constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessSaveMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml
index 4a73986673c60..6053352386203 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreEntityTest.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\Store\Test\TestCase\UpdateStoreEntityTest" summary="Update Store View" ticketId="MAGETWO-27786">
         <variation name="UpdateStoreEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="storeInitial/dataset" xsi:type="string">custom</data>
             <data name="store/data/group_id/dataset" xsi:type="string">default</data>
             <data name="store/data/name" xsi:type="string">storename_updated%isolation%</data>
@@ -21,7 +21,7 @@
             <constraint name="Magento\Store\Test\Constraint\AssertStoreFrontend" />
         </variation>
         <variation name="UpdateStoreEntityTestVariation2">
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
             <data name="storeInitial/dataset" xsi:type="string">default</data>
             <data name="store/data/name" xsi:type="string">storename_updated%isolation%</data>
             <constraint name="Magento\Store\Test\Constraint\AssertStoreSuccessSaveMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml
index 593d9c365a92e..9ff67a9ba9fec 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/UpdateStoreGroupEntityTest.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\Store\Test\TestCase\UpdateStoreGroupEntityTest" summary="Update Store Group" ticketId="MAGETWO-27568">
         <variation name="UpdateStoreGroupEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="storeGroupOrigin/dataset" xsi:type="string">custom</data>
             <data name="storeGroup/data/website_id/dataset" xsi:type="string">main_website</data>
             <data name="storeGroup/data/name" xsi:type="string">store_name_updated_%isolation%</data>
@@ -20,7 +20,7 @@
             <constraint name="Magento\Store\Test\Constraint\AssertStoreGroupOnStoreViewForm" />
         </variation>
         <variation name="UpdateStoreGroupEntityTestVariation2">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="storeGroupOrigin/dataset" xsi:type="string">custom</data>
             <data name="storeGroup/data/website_id/dataset" xsi:type="string">custom_website</data>
             <data name="storeGroup/data/name" xsi:type="string">store_name_updated_%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/NavigateMenuTest.xml
index ee225f21462ea..ecf202ddae3a8 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/NavigateMenuTest.xml
@@ -8,16 +8,19 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest87">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Tax Rules</data>
             <data name="pageTitle" xsi:type="string">Tax Rules</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest88">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Tax Zones and Rates</data>
             <data name="pageTitle" xsi:type="string">Tax Zones and Rates</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest89">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Import/Export Tax Rates</data>
             <data name="pageTitle" xsi:type="string">Import and Export Tax Rates</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Theme/Test/TestCase/NavigateMenuTest.xml
index 71964fc926499..ee38659122301 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest90">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Content > Themes</data>
             <data name="pageTitle" xsi:type="string">Themes</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/NavigateMenuTest.xml
index cdf1d9e3617d8..30d9e57602af1 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest91">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > URL Rewrites</data>
             <data name="pageTitle" xsi:type="string">URL Rewrites</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/NavigateMenuTest.xml
index d196bebca0e9a..4572738b6cb48 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/NavigateMenuTest.xml
@@ -8,21 +8,25 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest52">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Locked Users</data>
             <data name="pageTitle" xsi:type="string">Locked Users</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest53">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Manage Encryption Key</data>
             <data name="pageTitle" xsi:type="string">Encryption Key</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest92">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > All Users</data>
             <data name="pageTitle" xsi:type="string">Users</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest93">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > User Roles</data>
             <data name="pageTitle" xsi:type="string">Roles</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/NavigateMenuTest.xml
index 3fceddf1a807a..0a9c74cd92bc6 100644
--- a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest94">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Custom Variables</data>
             <data name="pageTitle" xsi:type="string">Custom Variables</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/NavigateMenuTest.xml
index 6b3215dd30d16..6a2a533c59df2 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/NavigateMenuTest.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\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest96">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Content > Widgets</data>
             <data name="pageTitle" xsi:type="string">Widgets</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />

From 99134c0a1ee7161177ca65889e85b62d2b5f24f8 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 25 Mar 2019 12:16:58 -0500
Subject: [PATCH 0775/1055] GraphQL-428: Test coverage:
 GetAvailableShippingMethodsTest

---
 .../GetAvailablePaymentMethodsTest.php        | 10 ++++-----
 .../GetAvailableShippingMethodsTest.php       | 21 ++++++++++++-------
 .../Guest/GetAvailablePaymentMethodsTest.php  |  8 +++----
 .../Guest/GetAvailableShippingMethodsTest.php | 20 +++++++++---------
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index a7287ada093b8..00627cb893103 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -54,7 +54,7 @@ protected function setUp()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      */
-    public function testGetCartWithPaymentMethods()
+    public function testGetAvailablePaymentMethods()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
         $query = $this->getQuery($maskedQuoteId);
@@ -74,7 +74,7 @@ public function testGetCartWithPaymentMethods()
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      */
-    public function testGetPaymentMethodsFromGuestCart()
+    public function testGetAvailablePaymentMethodsFromGuestCart()
     {
         $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId(
             'test_order_with_virtual_product_without_address'
@@ -91,7 +91,7 @@ public function testGetPaymentMethodsFromGuestCart()
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      */
-    public function testGetPaymentMethodsFromAnotherCustomerCart()
+    public function testGetAvailablePaymentMethodsFromAnotherCustomerCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
         $query = $this->getQuery($maskedQuoteId);
@@ -106,7 +106,7 @@ public function testGetPaymentMethodsFromAnotherCustomerCart()
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      * @magentoApiDataFixture Magento/Payment/_files/disable_all_active_payment_methods.php
      */
-    public function testGetPaymentMethodsIfPaymentsAreNotSet()
+    public function testGetAvailablePaymentMethodsIfAllPaymentsAreDisabled()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
         $query = $this->getQuery($maskedQuoteId);
@@ -120,7 +120,7 @@ public function testGetPaymentMethodsIfPaymentsAreNotSet()
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
-    public function testGetPaymentMethodsOfNonExistentCart()
+    public function testGetAvailablePaymentMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
         $query = $this->getQuery($maskedQuoteId);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index da5801cb9a06e..6f5a9b5d99cbf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
@@ -46,9 +46,9 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
     /**
@@ -59,7 +59,7 @@ protected function setUp()
     public function testGetAvailableShippingMethods()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $response = $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId), [], '', $this->getHeaderMap());
+        $response = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('shipping_addresses', $response['cart']);
@@ -98,7 +98,12 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
 
-        $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId), [], '', $this->getHeaderMap('customer2@search.example.com'));
+        $this->graphQlQuery(
+            $this->getQuery($maskedQuoteId),
+            [],
+            '',
+            $this->getHeaderMap('customer2@search.example.com')
+        );
     }
 
     /**
@@ -107,10 +112,10 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
      */
-    public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
+    public function testGetAvailableShippingMethodsIfAllShippingsAreDisabled()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $response = $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId), [], '', $this->getHeaderMap());
+        $response = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
 
         self::assertEquals(0, count($response['cart']['shipping_addresses'][0]['available_shipping_methods']));
     }
@@ -125,7 +130,7 @@ public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
     public function testGetAvailableShippingMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getAvailableShippingMethodsQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
@@ -134,7 +139,7 @@ public function testGetAvailableShippingMethodsOfNonExistentCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getAvailableShippingMethodsQuery(
+    private function getQuery(
         string $maskedQuoteId
     ): string
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index c4dd9af490c99..d083e8a859e9f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -47,7 +47,7 @@ protected function setUp()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      */
-    public function testGetCartWithPaymentMethods()
+    public function testGetAvailablePaymentMethods()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
         $query = $this->getQuery($maskedQuoteId);
@@ -73,7 +73,7 @@ public function testGetCartWithPaymentMethods()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      */
-    public function testGetPaymentMethodsFromCustomerCart()
+    public function testGetAvailablePaymentMethodsFromCustomerCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
         $query = $this->getQuery($maskedQuoteId);
@@ -88,7 +88,7 @@ public function testGetPaymentMethodsFromCustomerCart()
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Payment/_files/disable_all_active_payment_methods.php
      */
-    public function testGetPaymentMethodsIfPaymentsAreNotSet()
+    public function testGetPaymentMethodsIfPaymentsAreDisabled()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
         $query = $this->getQuery($maskedQuoteId);
@@ -101,7 +101,7 @@ public function testGetPaymentMethodsIfPaymentsAreNotSet()
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
-    public function testGetPaymentMethodsOfNonExistentCart()
+    public function testGetAvailablePaymentMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
         $query = $this->getQuery($maskedQuoteId);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 3b955fb53f6b1..c9f8f37669e5d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -40,8 +40,8 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteResource = $objectManager->create(QuoteResource::class);
-        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
     /**
@@ -49,10 +49,10 @@ protected function setUp()
      *
      * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
      */
-    public function testGetAvailableShippingMethodsFromGuestCart()
+    public function testGetAvailableShippingMethods()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
-        $response = $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId));
+        $response = $this->graphQlQuery($this->getQuery($maskedQuoteId));
 
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('shipping_addresses', $response['cart']);
@@ -82,7 +82,7 @@ public function testGetAvailableShippingMethodsFromGuestCart()
      *
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      */
-    public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
+    public function testGetAvailableShippingMethodsFromCustomerCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
 
@@ -90,7 +90,7 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
 
-        $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId));
+        $this->graphQlQuery($this->getQuery($maskedQuoteId));
     }
 
     /**
@@ -99,10 +99,10 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
      * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
      * @magentoApiDataFixture Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
      */
-    public function testGetAvailableShippingMethodsIfShippingsAreNotSet()
+    public function testGetAvailableShippingMethodsIfShippingsAreDisabled()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
-        $response = $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId));
+        $response = $this->graphQlQuery($this->getQuery($maskedQuoteId));
 
         self::assertEquals(0, count($response['cart']['shipping_addresses'][0]['available_shipping_methods']));
     }
@@ -117,14 +117,14 @@ public function testGetAvailableShippingMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
 
-        $this->graphQlQuery($this->getAvailableShippingMethodsQuery($maskedQuoteId));
+        $this->graphQlQuery($this->getQuery($maskedQuoteId));
     }
 
     /**
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getAvailableShippingMethodsQuery(
+    private function getQuery(
         string $maskedQuoteId
     ): string
     {

From 73088cdba04c5783165c0f2a7c20bae78c370ec2 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 25 Mar 2019 13:17:47 -0500
Subject: [PATCH 0776/1055] GraphQL-281: [Shipping methods] Support of UPS
 shipping method

---
 .../Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index af85b616be696..463f2c4af101f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -83,8 +83,8 @@ public function testSetUpsShippingMethod()
         $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
         $expectedResult = [
             'carrier_code' => self::CARRIER_CODE,
-            'method_code'  => self::CARRIER_METHOD_CODE_GROUND,
-            'label'        => 'United Parcel Service - Ground',
+            'method_code' => self::CARRIER_METHOD_CODE_GROUND,
+            'label' => 'United Parcel Service - Ground',
         ];
         self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
     }

From b948b62baa0ec1ee81b5f08330e4545780eb9dce Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 25 Mar 2019 13:20:45 -0500
Subject: [PATCH 0777/1055] GraphQL-527: Category Tree Contains null Leaves

---
 .../CatalogGraphQl/Model/Category/DepthCalculator.php        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
index 5645b18017a2f..3d30f26be3b61 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
@@ -26,8 +26,9 @@ public function calculate(FieldNode $fieldNode) : int
         $depth = count($selections) ? 1 : 0;
         $childrenDepth = [0];
         foreach ($selections as $node) {
-            if ($node->kind === 'InlineFragment'
-            || null !== $node->alias
+            if (
+                $node->kind === 'InlineFragment'
+                || null !== $node->alias
             ) {
                 continue;
             }

From 8136c3816dfa47b1f15d7ae61b8f75b9074fb02e Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Mon, 25 Mar 2019 20:30:19 +0200
Subject: [PATCH 0778/1055] 428 - Test coverage:
 GetAvailableShippingMethodsTest 1. Rollback fixture changes

---
 .../Magento/Sales/_files/guest_quote_with_addresses.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index f25cf8e927ca3..b8f2ca38e2489 100644
--- 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
@@ -14,7 +14,7 @@
 $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId('simple')
     ->setAttributeSetId($product->getDefaultAttributeSetId())
-    ->setName('Simple Product For Guest Quote')
+    ->setName('Simple Product')
     ->setSku('simple-product-guest-quote')
     ->setPrice(10)
     ->setTaxClassId(0)

From 5aa062cb4801d4311ddcde2c59b63c2f4dc16e49 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 25 Mar 2019 13:33:16 -0500
Subject: [PATCH 0779/1055] GraphQL-483: [Test Coverage]
 'SetPaymentMethodOnCart' functionality

---
 .../GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php     | 4 ++--
 .../GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index dc970c3ab5893..51c48f5041dd9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -205,7 +205,7 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
     {
         return [
             'missed_cart_id' => [
-                'payment_method: {code: "'.Checkmo::PAYMENT_METHOD_CHECKMO_CODE.'"}',
+                'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
                 'Required parameter "cart_id" is missing.'
             ],
             'missed_payment_method' => [
@@ -213,7 +213,7 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
                 'Required parameter "code" for "payment_method" is missing.'
             ],
             'missed_payment_method_code' => [
-                'cart_id: "test",payment_method: {code: ""}',
+                'cart_id: "test", payment_method: {code: ""}',
                 'Required parameter "code" for "payment_method" is missing.'
             ],
         ];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 6b6bf04b837dd..017b85ba17b93 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -159,7 +159,7 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
     {
         return [
             'missed_cart_id' => [
-                'payment_method: {code: "'.Checkmo::PAYMENT_METHOD_CHECKMO_CODE.'"}',
+                'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
                 'Required parameter "cart_id" is missing.'
             ],
             'missed_payment_method' => [
@@ -167,7 +167,7 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
                 'Required parameter "code" for "payment_method" is missing.'
             ],
             'missed_payment_method_code' => [
-                'cart_id: "test",payment_method: {code: ""}',
+                'cart_id: "test", payment_method: {code: ""}',
                 'Required parameter "code" for "payment_method" is missing.'
             ],
         ];

From ae14c96dc6e68f8a8814b728d6fd536577bbd6e5 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Mon, 25 Mar 2019 20:42:00 +0100
Subject: [PATCH 0780/1055] Removing obsolete non-English translation files,
 these aren't translated and serve no purpose.

---
 app/code/Magento/Developer/i18n/de_DE.csv         |  5 -----
 app/code/Magento/Developer/i18n/es_ES.csv         |  5 -----
 app/code/Magento/Developer/i18n/fr_FR.csv         |  5 -----
 app/code/Magento/Developer/i18n/nl_NL.csv         |  5 -----
 app/code/Magento/Developer/i18n/pt_BR.csv         |  5 -----
 app/code/Magento/Developer/i18n/zh_Hans_CN.csv    |  5 -----
 app/code/Magento/Msrp/i18n/de_DE.csv              |  2 --
 app/code/Magento/Msrp/i18n/es_ES.csv              |  2 --
 app/code/Magento/Msrp/i18n/fr_FR.csv              |  2 --
 app/code/Magento/Msrp/i18n/nl_NL.csv              |  2 --
 app/code/Magento/Msrp/i18n/pt_BR.csv              |  2 --
 app/code/Magento/Msrp/i18n/zh_Hans_CN.csv         |  2 --
 app/code/Magento/ProductVideo/i18n/de_DE.csv      | 10 ----------
 app/code/Magento/ProductVideo/i18n/es_ES.csv      | 10 ----------
 app/code/Magento/ProductVideo/i18n/fr_FR.csv      | 10 ----------
 app/code/Magento/ProductVideo/i18n/nl_NL.csv      | 10 ----------
 app/code/Magento/ProductVideo/i18n/pt_BR.csv      | 10 ----------
 app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv | 10 ----------
 app/code/Magento/Search/i18n/de_DE.csv            |  1 -
 app/code/Magento/Search/i18n/es_ES.csv            |  1 -
 app/code/Magento/Search/i18n/fr_FR.csv            |  1 -
 app/code/Magento/Search/i18n/nl_NL.csv            |  1 -
 app/code/Magento/Search/i18n/pt_BR.csv            |  1 -
 app/code/Magento/Search/i18n/zh_Hans_CN.csv       |  1 -
 app/code/Magento/Swatches/i18n/de_DE.csv          |  2 --
 app/code/Magento/Swatches/i18n/es_ES.csv          |  2 --
 app/code/Magento/Swatches/i18n/fr_FR.csv          |  2 --
 app/code/Magento/Swatches/i18n/nl_NL.csv          |  2 --
 app/code/Magento/Swatches/i18n/pt_BR.csv          |  2 --
 app/code/Magento/Swatches/i18n/zh_Hans_CN.csv     |  2 --
 app/code/Magento/Ui/i18n/de_DE.csv                |  4 ----
 app/code/Magento/Ui/i18n/es_ES.csv                |  4 ----
 app/code/Magento/Ui/i18n/fr_FR.csv                |  4 ----
 app/code/Magento/Ui/i18n/nl_NL.csv                |  4 ----
 app/code/Magento/Ui/i18n/pt_BR.csv                |  4 ----
 app/code/Magento/Ui/i18n/zh_Hans_CN.csv           |  4 ----
 36 files changed, 144 deletions(-)
 delete mode 100644 app/code/Magento/Developer/i18n/de_DE.csv
 delete mode 100644 app/code/Magento/Developer/i18n/es_ES.csv
 delete mode 100644 app/code/Magento/Developer/i18n/fr_FR.csv
 delete mode 100644 app/code/Magento/Developer/i18n/nl_NL.csv
 delete mode 100644 app/code/Magento/Developer/i18n/pt_BR.csv
 delete mode 100644 app/code/Magento/Developer/i18n/zh_Hans_CN.csv
 delete mode 100644 app/code/Magento/Msrp/i18n/de_DE.csv
 delete mode 100644 app/code/Magento/Msrp/i18n/es_ES.csv
 delete mode 100644 app/code/Magento/Msrp/i18n/fr_FR.csv
 delete mode 100644 app/code/Magento/Msrp/i18n/nl_NL.csv
 delete mode 100644 app/code/Magento/Msrp/i18n/pt_BR.csv
 delete mode 100644 app/code/Magento/Msrp/i18n/zh_Hans_CN.csv
 delete mode 100644 app/code/Magento/ProductVideo/i18n/de_DE.csv
 delete mode 100644 app/code/Magento/ProductVideo/i18n/es_ES.csv
 delete mode 100644 app/code/Magento/ProductVideo/i18n/fr_FR.csv
 delete mode 100644 app/code/Magento/ProductVideo/i18n/nl_NL.csv
 delete mode 100644 app/code/Magento/ProductVideo/i18n/pt_BR.csv
 delete mode 100644 app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
 delete mode 100644 app/code/Magento/Search/i18n/de_DE.csv
 delete mode 100644 app/code/Magento/Search/i18n/es_ES.csv
 delete mode 100644 app/code/Magento/Search/i18n/fr_FR.csv
 delete mode 100644 app/code/Magento/Search/i18n/nl_NL.csv
 delete mode 100644 app/code/Magento/Search/i18n/pt_BR.csv
 delete mode 100644 app/code/Magento/Search/i18n/zh_Hans_CN.csv
 delete mode 100644 app/code/Magento/Swatches/i18n/de_DE.csv
 delete mode 100644 app/code/Magento/Swatches/i18n/es_ES.csv
 delete mode 100644 app/code/Magento/Swatches/i18n/fr_FR.csv
 delete mode 100644 app/code/Magento/Swatches/i18n/nl_NL.csv
 delete mode 100644 app/code/Magento/Swatches/i18n/pt_BR.csv
 delete mode 100644 app/code/Magento/Swatches/i18n/zh_Hans_CN.csv
 delete mode 100644 app/code/Magento/Ui/i18n/de_DE.csv
 delete mode 100644 app/code/Magento/Ui/i18n/es_ES.csv
 delete mode 100644 app/code/Magento/Ui/i18n/fr_FR.csv
 delete mode 100644 app/code/Magento/Ui/i18n/nl_NL.csv
 delete mode 100644 app/code/Magento/Ui/i18n/pt_BR.csv
 delete mode 100644 app/code/Magento/Ui/i18n/zh_Hans_CN.csv

diff --git a/app/code/Magento/Developer/i18n/de_DE.csv b/app/code/Magento/Developer/i18n/de_DE.csv
deleted file mode 100644
index e9c858101b71c..0000000000000
--- a/app/code/Magento/Developer/i18n/de_DE.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"Front-end development workflow","Front-end development workflow"
-"Workflow type","Workflow type"
-"Server side less compilation","Server side less compilation"
-"Client side less compilation","Client side less compilation"
-"Not available in production mode","Not available in production mode"
diff --git a/app/code/Magento/Developer/i18n/es_ES.csv b/app/code/Magento/Developer/i18n/es_ES.csv
deleted file mode 100644
index e9c858101b71c..0000000000000
--- a/app/code/Magento/Developer/i18n/es_ES.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"Front-end development workflow","Front-end development workflow"
-"Workflow type","Workflow type"
-"Server side less compilation","Server side less compilation"
-"Client side less compilation","Client side less compilation"
-"Not available in production mode","Not available in production mode"
diff --git a/app/code/Magento/Developer/i18n/fr_FR.csv b/app/code/Magento/Developer/i18n/fr_FR.csv
deleted file mode 100644
index e9c858101b71c..0000000000000
--- a/app/code/Magento/Developer/i18n/fr_FR.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"Front-end development workflow","Front-end development workflow"
-"Workflow type","Workflow type"
-"Server side less compilation","Server side less compilation"
-"Client side less compilation","Client side less compilation"
-"Not available in production mode","Not available in production mode"
diff --git a/app/code/Magento/Developer/i18n/nl_NL.csv b/app/code/Magento/Developer/i18n/nl_NL.csv
deleted file mode 100644
index e9c858101b71c..0000000000000
--- a/app/code/Magento/Developer/i18n/nl_NL.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"Front-end development workflow","Front-end development workflow"
-"Workflow type","Workflow type"
-"Server side less compilation","Server side less compilation"
-"Client side less compilation","Client side less compilation"
-"Not available in production mode","Not available in production mode"
diff --git a/app/code/Magento/Developer/i18n/pt_BR.csv b/app/code/Magento/Developer/i18n/pt_BR.csv
deleted file mode 100644
index e9c858101b71c..0000000000000
--- a/app/code/Magento/Developer/i18n/pt_BR.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"Front-end development workflow","Front-end development workflow"
-"Workflow type","Workflow type"
-"Server side less compilation","Server side less compilation"
-"Client side less compilation","Client side less compilation"
-"Not available in production mode","Not available in production mode"
diff --git a/app/code/Magento/Developer/i18n/zh_Hans_CN.csv b/app/code/Magento/Developer/i18n/zh_Hans_CN.csv
deleted file mode 100644
index e9c858101b71c..0000000000000
--- a/app/code/Magento/Developer/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"Front-end development workflow","Front-end development workflow"
-"Workflow type","Workflow type"
-"Server side less compilation","Server side less compilation"
-"Client side less compilation","Client side less compilation"
-"Not available in production mode","Not available in production mode"
diff --git a/app/code/Magento/Msrp/i18n/de_DE.csv b/app/code/Magento/Msrp/i18n/de_DE.csv
deleted file mode 100644
index be8e733a4bfd1..0000000000000
--- a/app/code/Magento/Msrp/i18n/de_DE.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
-"Warning!","Warning!"
diff --git a/app/code/Magento/Msrp/i18n/es_ES.csv b/app/code/Magento/Msrp/i18n/es_ES.csv
deleted file mode 100644
index be8e733a4bfd1..0000000000000
--- a/app/code/Magento/Msrp/i18n/es_ES.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
-"Warning!","Warning!"
diff --git a/app/code/Magento/Msrp/i18n/fr_FR.csv b/app/code/Magento/Msrp/i18n/fr_FR.csv
deleted file mode 100644
index be8e733a4bfd1..0000000000000
--- a/app/code/Magento/Msrp/i18n/fr_FR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
-"Warning!","Warning!"
diff --git a/app/code/Magento/Msrp/i18n/nl_NL.csv b/app/code/Magento/Msrp/i18n/nl_NL.csv
deleted file mode 100644
index be8e733a4bfd1..0000000000000
--- a/app/code/Magento/Msrp/i18n/nl_NL.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
-"Warning!","Warning!"
diff --git a/app/code/Magento/Msrp/i18n/pt_BR.csv b/app/code/Magento/Msrp/i18n/pt_BR.csv
deleted file mode 100644
index be8e733a4bfd1..0000000000000
--- a/app/code/Magento/Msrp/i18n/pt_BR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
-"Warning!","Warning!"
diff --git a/app/code/Magento/Msrp/i18n/zh_Hans_CN.csv b/app/code/Magento/Msrp/i18n/zh_Hans_CN.csv
deleted file mode 100644
index be8e733a4bfd1..0000000000000
--- a/app/code/Magento/Msrp/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Enabling MAP by default will hide all product prices on Storefront.","Enabling MAP by default will hide all product prices on Storefront."
-"Warning!","Warning!"
diff --git a/app/code/Magento/ProductVideo/i18n/de_DE.csv b/app/code/Magento/ProductVideo/i18n/de_DE.csv
deleted file mode 100644
index ca24668bb8d16..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/de_DE.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/es_ES.csv b/app/code/Magento/ProductVideo/i18n/es_ES.csv
deleted file mode 100644
index ca24668bb8d16..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/es_ES.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/fr_FR.csv b/app/code/Magento/ProductVideo/i18n/fr_FR.csv
deleted file mode 100644
index ca24668bb8d16..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/fr_FR.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
diff --git a/app/code/Magento/ProductVideo/i18n/nl_NL.csv b/app/code/Magento/ProductVideo/i18n/nl_NL.csv
deleted file mode 100644
index 5ad8386573040..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/nl_NL.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/i18n/pt_BR.csv b/app/code/Magento/ProductVideo/i18n/pt_BR.csv
deleted file mode 100644
index 5ad8386573040..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/pt_BR.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv b/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
deleted file mode 100644
index 5ad8386573040..0000000000000
--- a/app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Add video","Add video"
-"New Video","New Video"
-"Product Video","Product Video"
-"YouTube API key","YouTube API key"
-"You have not entered youtube API key. No information about youtube video will be retrieved.","You have not entered youtube API key. No information about youtube video will be retrieved."
-"Url","Url"
-"Preview Image","Preview Image"
-"Get Video Information","Get Video Information"
-"Youtube or Vimeo supported","Youtube or Vimeo supported"
-"Delete image in all store views","Delete image in all store views"
\ No newline at end of file
diff --git a/app/code/Magento/Search/i18n/de_DE.csv b/app/code/Magento/Search/i18n/de_DE.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/de_DE.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Search/i18n/es_ES.csv b/app/code/Magento/Search/i18n/es_ES.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/es_ES.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Search/i18n/fr_FR.csv b/app/code/Magento/Search/i18n/fr_FR.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/fr_FR.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Search/i18n/nl_NL.csv b/app/code/Magento/Search/i18n/nl_NL.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/nl_NL.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Search/i18n/pt_BR.csv b/app/code/Magento/Search/i18n/pt_BR.csv
deleted file mode 100644
index c10566a7c9800..0000000000000
--- a/app/code/Magento/Search/i18n/pt_BR.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Mecanismo de Busca"
diff --git a/app/code/Magento/Search/i18n/zh_Hans_CN.csv b/app/code/Magento/Search/i18n/zh_Hans_CN.csv
deleted file mode 100644
index 8b4b04aa3b9ec..0000000000000
--- a/app/code/Magento/Search/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Search Engine","Search Engine"
diff --git a/app/code/Magento/Swatches/i18n/de_DE.csv b/app/code/Magento/Swatches/i18n/de_DE.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/de_DE.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/es_ES.csv b/app/code/Magento/Swatches/i18n/es_ES.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/es_ES.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/fr_FR.csv b/app/code/Magento/Swatches/i18n/fr_FR.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/fr_FR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/nl_NL.csv b/app/code/Magento/Swatches/i18n/nl_NL.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/nl_NL.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/pt_BR.csv b/app/code/Magento/Swatches/i18n/pt_BR.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/pt_BR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Swatches/i18n/zh_Hans_CN.csv b/app/code/Magento/Swatches/i18n/zh_Hans_CN.csv
deleted file mode 100644
index f0aa34bbef26e..0000000000000
--- a/app/code/Magento/Swatches/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Swatch","Swatch"
-"Swatches per Product","Swatches per Product"
diff --git a/app/code/Magento/Ui/i18n/de_DE.csv b/app/code/Magento/Ui/i18n/de_DE.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/de_DE.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/es_ES.csv b/app/code/Magento/Ui/i18n/es_ES.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/es_ES.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/fr_FR.csv b/app/code/Magento/Ui/i18n/fr_FR.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/fr_FR.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/nl_NL.csv b/app/code/Magento/Ui/i18n/nl_NL.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/nl_NL.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/pt_BR.csv b/app/code/Magento/Ui/i18n/pt_BR.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/pt_BR.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"
diff --git a/app/code/Magento/Ui/i18n/zh_Hans_CN.csv b/app/code/Magento/Ui/i18n/zh_Hans_CN.csv
deleted file mode 100644
index 2efac126b857c..0000000000000
--- a/app/code/Magento/Ui/i18n/zh_Hans_CN.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"Log JS Errors to Session Storage","Log JS Errors to Session Storage"
-"If enabled, can be used by functional tests for extended reporting","If enabled, can be used by functional tests for extended reporting"
-"Log JS Errors to Session Storage Key","Log JS Errors to Session Storage Key"
-"Use this key to retrieve collected js errors","Use this key to retrieve collected js errors"

From 2e0a846b0b0d3bdcac0786ed7e91eaf96c0d501e Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 25 Mar 2019 22:31:45 +0200
Subject: [PATCH 0781/1055] unit test fix

---
 .../Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
index 82e660913ddc1..b339ed55bf691 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
@@ -173,7 +173,7 @@ public function testWrongInterfaceCallWithDisabledDeveloperMode($shared)
             $this->returnValue($notObserver)
         );
         $this->_appStateMock->expects(
-            $this->exactly(2)
+            $this->exactly(1)
         )->method(
             'getMode'
         )->will(

From 0b8bebc0698d8433d62e620b8d4ee111ec21797a Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 25 Mar 2019 15:47:31 -0500
Subject: [PATCH 0782/1055] GraphQL-428: Test coverage:
 GetAvailableShippingMethodsTest

---
 .../Quote/Customer/GetAvailableShippingMethodsTest.php        | 4 +---
 .../GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index 6f5a9b5d99cbf..5ca3307371d2f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
@@ -139,9 +139,7 @@ public function testGetAvailableShippingMethodsOfNonExistentCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getQuery(
-        string $maskedQuoteId
-    ): string
+    private function getQuery(string $maskedQuoteId): string
     {
         return <<<QUERY
 query {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index c9f8f37669e5d..9522d65991cd2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -124,9 +124,7 @@ public function testGetAvailableShippingMethodsOfNonExistentCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getQuery(
-        string $maskedQuoteId
-    ): string
+    private function getQuery(string $maskedQuoteId): string
     {
         return <<<QUERY
 query {

From 18cafdc0aaee73fe6320e0ad8e736d563d40ca51 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 25 Mar 2019 15:55:34 -0500
Subject: [PATCH 0783/1055] GraphQL-482: [Test Coverage]
 'SetBillingAddressOnCart' functionality

---
 .../GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php     | 3 ++-
 .../GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 02cd428767ccc..f79e6b8211b00 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -548,7 +548,8 @@ public function dataProviderSetWithoutRequiredParameters()
         return [
             'missed_billing_address' => [
                 'cart_id: "cart_id_value"',
-                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput! was not provided.',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
+                    . 'was not provided.',
             ],
             'missed_cart_id' => [
                 'billing_address: {}',
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index de07b80b39592..81969cf610f74 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -338,7 +338,8 @@ public function dataProviderSetWithoutRequiredParameters()
         return [
             'missed_billing_address' => [
                 'cart_id: "cart_id_value"',
-                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput! was not provided.',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
+                    . 'was not provided.',
             ],
             'missed_cart_id' => [
                 'billing_address: {}',

From 594e5563d671eb34409b7da35e80f4d35bf7ced9 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 25 Mar 2019 16:41:47 -0500
Subject: [PATCH 0784/1055] GraphQL-482: [Test Coverage]
 'SetBillingAddressOnCart' functionality

---
 .../GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php      | 2 +-
 .../Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index f79e6b8211b00..55a32f7cdf653 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -549,7 +549,7 @@ public function dataProviderSetWithoutRequiredParameters()
             'missed_billing_address' => [
                 'cart_id: "cart_id_value"',
                 'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
-                    . 'was not provided.',
+                    . ' was not provided.',
             ],
             'missed_cart_id' => [
                 'billing_address: {}',
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 81969cf610f74..a2f092b9e0e1d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -339,7 +339,7 @@ public function dataProviderSetWithoutRequiredParameters()
             'missed_billing_address' => [
                 'cart_id: "cart_id_value"',
                 'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
-                    . 'was not provided.',
+                    . ' was not provided.',
             ],
             'missed_cart_id' => [
                 'billing_address: {}',

From 049f57c57c565635c904f7e0e3e848ba4a5ee9f7 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Tue, 26 Mar 2019 07:00:47 +0200
Subject: [PATCH 0785/1055] Tests data rollback

---
 .../GraphQl/Customer/CreateCustomerTest.php   | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

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 b58cffbea9130..317c0d5d3e3e2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -24,6 +24,11 @@ class CreateCustomerTest extends GraphQlAbstract
      */
     private $customerRepository;
 
+    /**
+     * @var null|string
+     */
+    private $customerRandomEmail = null;
+
     protected function setUp()
     {
         parent::setUp();
@@ -40,7 +45,7 @@ public function testCreateCustomerAccountWithPassword()
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
         $currentPassword = 'test123#';
-        $newEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+        $this->customerRandomEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -48,7 +53,7 @@ public function testCreateCustomerAccountWithPassword()
         input: {
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
-            email: "{$newEmail}"
+            email: "{$this->customerRandomEmail}"
             password: "{$currentPassword}"
           	is_subscribed: true
         }
@@ -67,7 +72,7 @@ public function testCreateCustomerAccountWithPassword()
 
         $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
         $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
-        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
+        $this->assertEquals($this->customerRandomEmail, $response['createCustomer']['customer']['email']);
         $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
     }
 
@@ -78,7 +83,7 @@ public function testCreateCustomerAccountWithoutPassword()
     {
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
-        $newEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+        $this->customerRandomEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -86,7 +91,7 @@ public function testCreateCustomerAccountWithoutPassword()
         input: {
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
-            email: "{$newEmail}"
+            email: "{$this->customerRandomEmail}"
           	is_subscribed: true
         }
     ) {
@@ -104,7 +109,7 @@ public function testCreateCustomerAccountWithoutPassword()
 
         $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
         $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
-        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
+        $this->assertEquals($this->customerRandomEmail, $response['createCustomer']['customer']['email']);
         $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
     }
 
@@ -240,16 +245,17 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
 
     public function tearDown()
     {
-        /** @var \Magento\Framework\Registry $registry */
-        $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-        $registry->unregister('isSecureArea');
-        $registry->register('isSecureArea', true);
-        $customersCollection = Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Customer::class);
-        foreach ($customersCollection as $customer) {
-            $this->customerRepository->deleteById($customer->getId());
+        if ($this->customerRandomEmail !== null) {
+            $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+            $registry->unregister('isSecureArea');
+            $registry->register('isSecureArea', true);
+            $customer = $this->customerRepository->get($this->customerRandomEmail);
+            if (isset($customer) && $customer->getId()) {
+                $this->customerRepository->delete($customer);
+            }
+            $registry->unregister('isSecureArea');
+            $registry->register('isSecureArea', false);
         }
-        $registry->unregister('isSecureArea');
-        $registry->register('isSecureArea', false);
         parent::tearDown();
     }
 }

From 16ce0467b88b7ded25b9d1e25bd1393784a615c2 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Tue, 26 Mar 2019 12:16:55 +0530
Subject: [PATCH 0786/1055] Removed duplicate case & applied logic fixes

---
 .../Guest/SetShippingMethodsOnCartTest.php    | 75 +++++++------------
 1 file changed, 27 insertions(+), 48 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index f6444027d0ca3..eadc131ee464a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -71,21 +71,25 @@ public function testShippingMethodWithVirtualProduct()
         );
 
         self::expectException(\Exception::class);
-        self::expectExceptionMessage('Carrier with such method not found: ' . $methodCode . ', ' . $methodCode . '');
+        self::expectExceptionMessage('You can\'t set shipping methods for virtual products');
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
      */
     public function testShippingMethodWithSimpleProduct()
     {
         $methodCode = 'flatrate';
         $carrierCode = 'flatrate';
-        $reservedOrderId = 'test_order_with_simple_product_without_address';
+        $reservedOrderId = 'guest_quote';
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-        $quoteAddressId = $this->getQuoteAddressIdByReversedQuoteId($reservedOrderId);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
 
         $query = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -109,27 +113,38 @@ public function testShippingMethodWithSimpleProduct()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Required parameter "cart_address_id" is missing.
      */
-    public function testShippingMethodWithSimpleProductWithoutAddress()
+    public function testShippingMethodWithSimpleProductWithoutAddress(int $addressId, string $message)
     {
         $methodCode = 'flatrate';
         $carrierCode = 'flatrate';
         $reservedOrderId = 'test_order_with_simple_product_without_address';
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-        $quoteAddressId = 0;
-
         $query = $this->prepareMutationQuery(
             $maskedQuoteId,
             $methodCode,
             $carrierCode,
-            $quoteAddressId
+            $addressId
         );
 
+        $this->expectExceptionMessage($message);
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @return array
+     */
+    public function dataProviderWithMissedRequiredParameters()
+    {
+        return [
+            'shipping_methods' => [
+                0,
+                'Required parameter "cart_address_id" is missing.',
+            ]
+        ];
+    }
+
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @expectedException \Exception
@@ -213,16 +228,15 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage No such entity with cartId = 0
+     * @expectedException \Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
     public function testSetShippingMethodToNonExistentCart()
     {
         $methodCode = 'flatrate';
         $carrierCode = 'flatrate';
-        $reservedOrderId = 'non_existent_cart_reversed_quote_id';
 
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+        $maskedQuoteId = 'non_existent_masked_id';
         $quoteAddressId = 1;
 
         $query = $this->prepareMutationQuery(
@@ -235,41 +249,6 @@ public function testSetShippingMethodToNonExistentCart()
         $this->graphQlQuery($query);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     */
-    public function testSetShippingMethodToGuestCart()
-    {
-        $methodCode = 'flatrate';
-        $carrierCode = 'flatrate';
-        $reservedOrderId = 'guest_quote';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $methodCode,
-            $carrierCode,
-            $quoteAddressId
-        );
-
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-
-        $shippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingMethod);
-        self::assertEquals($carrierCode, $shippingMethod['selected_shipping_method']['carrier_code']);
-        self::assertEquals($methodCode, $shippingMethod['selected_shipping_method']['method_code']);
-    }
-
     /**
      * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php

From c2f15b388db0ba654920289f32a3e3e0def072e2 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Tue, 26 Mar 2019 12:53:33 +0530
Subject: [PATCH 0787/1055] Added data Provider

---
 .../GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index eadc131ee464a..2fc919fd86689 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -112,6 +112,9 @@ public function testShippingMethodWithSimpleProduct()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @dataProvider dataProviderWithMissedRequiredParameters
+     * @param int $addressId
+     * @param string $message
      * @expectedException \Exception
      */
     public function testShippingMethodWithSimpleProductWithoutAddress(int $addressId, string $message)

From 38dd5a03bdfe3c3aa600afcdf2518d7f0a3c6996 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Tue, 26 Mar 2019 09:36:47 +0200
Subject: [PATCH 0788/1055] 428 - Test coverage:
 GetAvailableShippingMethodsTest 1. Fix for "URL key for specified store
 already exists"

---
 .../_files/quote_with_simple_product_saved_rollback.php       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
index 105a981ccfc84..2e333bbcb3049 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * Rollback for quote_with_payment_saved.php fixture.
+ * Rollback for quote_with_simple_product_saved_rollback.php fixture.
  *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
+require 'simple_product_rollback.php';
+
 /** @var $objectManager \Magento\TestFramework\ObjectManager */
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);

From a82bac4ddd85147cc133de51e0cc580e1171aeea Mon Sep 17 00:00:00 2001
From: Aliaksei Yakimovich2 <aliaksei_yakimovich2@epam.com>
Date: Tue, 26 Mar 2019 10:48:59 +0300
Subject: [PATCH 0789/1055] MAGETWO-64838: Unable to create order from store
 front if customer address custom attribute is required

- code refactoring;
---
 .../Webapi/CustomAttribute/PreprocessorInterface.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
index 820936abd49ba..8de30e92218c0 100644
--- a/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/CustomAttribute/PreprocessorInterface.php
@@ -17,7 +17,7 @@ interface PreprocessorInterface
      * @param mixed $attribute
      * @return bool
      */
-    public function shouldBeProcessed($key, $attribute);
+    public function shouldBeProcessed(string $key, $attribute): bool;
 
     /**
      * Process attribute object according to type rules
@@ -25,12 +25,12 @@ public function shouldBeProcessed($key, $attribute);
      * @param string $key
      * @param mixed $attribute
      */
-    public function process($key, &$attribute);
+    public function process(string $key, &$attribute);
 
     /**
      * Get list of affected attributes for the current preprocessor
      *
      * @return array
      */
-    public function getAffectedAttributes();
+    public function getAffectedAttributes(): array;
 }

From b78c229577b10b0b0334ba7ede392a556382f509 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Mon, 25 Feb 2019 14:58:11 +0400
Subject: [PATCH 0790/1055] MAGETWO-70232: Import customizable options adds it
 to another product if same SKU is filled

- Add automated test script
---
 .../ActionGroup/CustomOptionsActionGroup.xml  | 52 ++++++++++++
 ...AdminProductCustomizableOptionsSection.xml | 12 ++-
 ...CustomizableOptionToProductWithSKUTest.xml | 84 +++++++++++++++++++
 3 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
index 2d966dde64c4a..b372166f1d0de 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -52,4 +52,56 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions('0')}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
     </actionGroup>
+
+    <actionGroup name="AddProductCustomOptionField">
+        <arguments>
+            <argument name="option" defaultValue="ProductOptionField"/>
+            <argiment name="optionIndex" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" stepKey="waitForOption"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{option.title}}" stepKey="fillTitle"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}" stepKey="openTypeSelect"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionType('Field')}}" stepKey="selectTypeFile"/>
+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPrice(optionIndex)}}" stepKey="waitForElements"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice(optionIndex)}}" userInput="{{option.price}}" stepKey="fillPrice"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType(optionIndex)}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku(optionIndex)}}" userInput="{{option.title}}" stepKey="fillSku"/>
+    </actionGroup>
+
+    <actionGroup name="importProductCustomizableOptions">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductCustomizableOptionsSection.importOptions}}" stepKey="clickImportOptions"/>
+        <waitForElementVisible selector="{{AdminProductImportOptionsSection.selectProductTitle}}" stepKey="waitForTitleVisible"/>
+        <conditionalClick selector="{{AdminProductImportOptionsSection.resetFiltersButton}}" dependentSelector="{{AdminProductImportOptionsSection.resetFiltersButton}}" visible="true" stepKey="clickResetFilters"/>
+        <click selector="{{AdminProductImportOptionsSection.filterButton}}" stepKey="clickFilterButton"/>
+        <waitForElementVisible selector="{{AdminProductImportOptionsSection.nameField}}" stepKey="waitForNameField"/>
+        <fillField selector="{{AdminProductImportOptionsSection.nameField}}" userInput="{{productName}}" stepKey="fillProductName"/>
+        <click selector="{{AdminProductImportOptionsSection.applyFiltersButton}}" stepKey="clickApplyFilters"/>
+        <checkOption selector="{{AdminProductImportOptionsSection.firstRowItemCheckbox}}"  stepKey="checkProductCheckbox"/>
+        <click selector="{{AdminProductImportOptionsSection.importButton}}" stepKey="clickImport"/>
+    </actionGroup>
+
+    <actionGroup name="resetImportOptionFilter">
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.importOptions}}" stepKey="clickImportOptions"/>
+        <click selector="{{AdminProductImportOptionsSection.resetFiltersButton}}" stepKey="clickResetFilterButton"/>
+    </actionGroup>
+
+    <actionGroup name="checkCustomizableOptionImport">
+        <arguments>
+            <argument name="option" defaultValue="ProductOptionField"/>
+            <argiment name="optionIndex" type="string"/>
+        </arguments>
+        <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionTitleInput(optionIndex)}}" stepKey="grabOptionTitle"/>
+        <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionPrice(optionIndex)}}" stepKey="grabOptionPrice"/>
+        <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionSku(optionIndex)}}" stepKey="grabOptionSku"/>
+
+        <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionTitle" stepKey="assertOptionTitle"/>
+        <assertEquals expected="{{option.price}}" expectedType="string" actual="$grabOptionPrice" stepKey="assertOptionPrice"/>
+        <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionSku" stepKey="assertOptionSku"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
index fc78c25ec49fa..5598edcfbcb28 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -45,5 +45,15 @@
         <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"/>
+        <element name="importOptions" type="button" selector="//button[@data-index='button_import']" timeout="30"/>
     </section>
-</sections>
\ No newline at end of file
+    <section name="AdminProductImportOptionsSection">
+        <element name="selectProductTitle" type="text" selector="//h1[contains(text(), 'Select Product')]" timeout="30"/>
+        <element name="filterButton" type="button" selector="//button[@data-action='grid-filter-expand']" timeout="30"/>
+        <element name="nameField" type="input" selector="//input[@name='name']" timeout="30"/>
+        <element name="applyFiltersButton" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
+        <element name="resetFiltersButton" type="button" selector="//button[@data-action='grid-filter-reset']" timeout="30"/>
+        <element name="firstRowItemCheckbox" type="input" selector="//input[@data-action='select-row']" timeout="30"/>
+        <element name="importButton" type="button" selector="//button[@class='action-primary']/span[contains(text(), 'Import')]" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
new file mode 100644
index 0000000000000..836c07a7c1935
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
@@ -0,0 +1,84 @@
+<?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="AdminImportCustomizableOptionToProductWithSKUTest">
+        <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-98211"/>
+            <useCaseId value="MAGETWO-70232"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Create category-->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <!-- Create two product -->
+            <createData entity="SimpleProduct2" stepKey="createFirstProduct"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSecondProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+        </before>
+        <after>
+
+           <!--Delete second product with changed sku-->
+            <actionGroup ref="deleteProductBySku" stepKey="deleteSecondProduct">
+                <argument name="sku" value="$$createFirstProduct.sku$$-1"/>
+            </actionGroup>
+
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
+
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <!--Go to product page -->
+        <amOnPage url="{{AdminProductEditPage.url($$createFirstProduct.id$$)}}" stepKey="goToProductEditPage"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
+        <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption1">
+            <argument name="option" value="ProductOptionField"/>
+            <argument name="optionIndex" value="0"/>
+        </actionGroup>
+        <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption2">
+            <argument name="option" value="ProductOptionField2"/>
+            <argument name="optionIndex" value="1"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Change second product sku to first product sku-->
+        <amOnPage url="{{AdminProductEditPage.url($$createSecondProduct.id$$)}}" stepKey="goToProductEditPage1"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="$$createFirstProduct.sku$$" stepKey="fillProductSku1"/>
+
+        <!--Import customizable options and check-->
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
+        <actionGroup ref="importProductCustomizableOptions" stepKey="importOptions">
+            <argument name="productName" value="$$createFirstProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="checkCustomizableOptionImport" stepKey="checkFirstOptionImport">
+            <argument name="option" value="ProductOptionField"/>
+            <argument name="optionIndex" value="0"/>
+        </actionGroup>
+        <actionGroup ref="checkCustomizableOptionImport" stepKey="checkSecondOptionImport">
+            <argument name="option" value="ProductOptionField2"/>
+            <argument name="optionIndex" value="1"/>
+        </actionGroup>
+
+        <!--SAve product and check sku changed message-->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
+        <see userInput="SKU for product $$createSecondProduct.name$$ has been changed to $$createFirstProduct.sku$$-1." stepKey="seeSkuChangedMessage"/>
+    </test>
+</tests>

From fc94ab8d0c1df4654a92b9817bc47f5ff7dce802 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Mon, 25 Mar 2019 18:59:26 +0400
Subject: [PATCH 0791/1055] MAGETWO-70232: Import customizable options adds it
 to another product if same SKU is filled

- Update automated test script
---
 .../ActionGroup/CustomOptionsActionGroup.xml  |  5 ----
 ...AdminProductCustomizableOptionsSection.xml |  2 +-
 ...CustomizableOptionToProductWithSKUTest.xml | 26 +++++++++----------
 ...eForProductOptionsWithoutTierPriceTest.xml |  4 +--
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
index b372166f1d0de..b914d5e20712d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -52,7 +52,6 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions('0')}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
     </actionGroup>
-
     <actionGroup name="AddProductCustomOptionField">
         <arguments>
             <argument name="option" defaultValue="ProductOptionField"/>
@@ -69,7 +68,6 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType(optionIndex)}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku(optionIndex)}}" userInput="{{option.title}}" stepKey="fillSku"/>
     </actionGroup>
-
     <actionGroup name="importProductCustomizableOptions">
         <arguments>
             <argument name="productName" type="string"/>
@@ -84,13 +82,11 @@
         <checkOption selector="{{AdminProductImportOptionsSection.firstRowItemCheckbox}}"  stepKey="checkProductCheckbox"/>
         <click selector="{{AdminProductImportOptionsSection.importButton}}" stepKey="clickImport"/>
     </actionGroup>
-
     <actionGroup name="resetImportOptionFilter">
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
         <click selector="{{AdminProductCustomizableOptionsSection.importOptions}}" stepKey="clickImportOptions"/>
         <click selector="{{AdminProductImportOptionsSection.resetFiltersButton}}" stepKey="clickResetFilterButton"/>
     </actionGroup>
-
     <actionGroup name="checkCustomizableOptionImport">
         <arguments>
             <argument name="option" defaultValue="ProductOptionField"/>
@@ -99,7 +95,6 @@
         <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionTitleInput(optionIndex)}}" stepKey="grabOptionTitle"/>
         <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionPrice(optionIndex)}}" stepKey="grabOptionPrice"/>
         <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionSku(optionIndex)}}" stepKey="grabOptionSku"/>
-
         <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionTitle" stepKey="assertOptionTitle"/>
         <assertEquals expected="{{option.price}}" expectedType="string" actual="$grabOptionPrice" stepKey="assertOptionPrice"/>
         <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionSku" stepKey="assertOptionSku"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
index 5598edcfbcb28..352d219351fb8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -54,6 +54,6 @@
         <element name="applyFiltersButton" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
         <element name="resetFiltersButton" type="button" selector="//button[@data-action='grid-filter-reset']" timeout="30"/>
         <element name="firstRowItemCheckbox" type="input" selector="//input[@data-action='select-row']" timeout="30"/>
-        <element name="importButton" type="button" selector="//button[@class='action-primary']/span[contains(text(), 'Import')]" timeout="30"/>
+        <element name="importButton" type="button" selector="//button[contains(@class, 'action-primary')]/span[contains(text(), 'Import')]" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
index 836c07a7c1935..79ff7bcade77b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
@@ -11,8 +11,8 @@
     <test name="AdminImportCustomizableOptionToProductWithSKUTest">
         <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'"/>
+            <title value="Import customizable options to a product with existing SKU"/>
+            <description value="Import customizable options to a product with existing SKU"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-98211"/>
             <useCaseId value="MAGETWO-70232"/>
@@ -20,32 +20,30 @@
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
             <!--Create category-->
+            <comment userInput="Create category" stepKey="commentCreateCategory"/>
             <createData entity="ApiCategory" stepKey="createCategory"/>
-
             <!-- Create two product -->
+            <comment userInput="Create two product" stepKey="commentCreateTwoProduct"/>
             <createData entity="SimpleProduct2" stepKey="createFirstProduct"/>
             <createData entity="ApiSimpleProduct" stepKey="createSecondProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-
         </before>
         <after>
-
-           <!--Delete second product with changed sku-->
+            <!--Delete second product with changed sku-->
+            <comment userInput="Delete second product with changed sku" stepKey="commentDeleteProduct"/>
             <actionGroup ref="deleteProductBySku" stepKey="deleteSecondProduct">
                 <argument name="sku" value="$$createFirstProduct.sku$$-1"/>
             </actionGroup>
-
             <!--Delete created data-->
+            <comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
-
             <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
         </after>
-
         <!--Go to product page -->
+        <comment userInput="Go to product page" stepKey="commentGoToProductPage"/>
         <amOnPage url="{{AdminProductEditPage.url($$createFirstProduct.id$$)}}" stepKey="goToProductEditPage"/>
         <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
         <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption1">
@@ -57,13 +55,13 @@
             <argument name="optionIndex" value="1"/>
         </actionGroup>
         <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
-
         <!--Change second product sku to first product sku-->
+        <comment userInput="Change second product sku to first product sku" stepKey="commentChangeSecondProduct"/>
         <amOnPage url="{{AdminProductEditPage.url($$createSecondProduct.id$$)}}" stepKey="goToProductEditPage1"/>
         <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="$$createFirstProduct.sku$$" stepKey="fillProductSku1"/>
-
         <!--Import customizable options and check-->
+        <comment userInput="Import customizable options and check" stepKey="commentImportOptions"/>
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
         <actionGroup ref="importProductCustomizableOptions" stepKey="importOptions">
             <argument name="productName" value="$$createFirstProduct.name$$"/>
@@ -76,8 +74,8 @@
             <argument name="option" value="ProductOptionField2"/>
             <argument name="optionIndex" value="1"/>
         </actionGroup>
-
-        <!--SAve product and check sku changed message-->
+        <!--Save product and check sku changed message-->
+        <comment userInput="Save product and check sku changed message" stepKey="commentSAveProductAndCheck"/>
         <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
         <see userInput="SKU for product $$createSecondProduct.name$$ has been changed to $$createFirstProduct.sku$$-1." stepKey="seeSkuChangedMessage"/>
     </test>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
index 3086f4398e08d..51af9d78dfd46 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
@@ -11,8 +11,8 @@
     <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'"/>
+            <title value="Check that 'tier price' block not available for simple product from options without 'tier price'"/>
+            <description value="Check that 'tier price' block not available for simple product from options without 'tier price'"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-97050"/>
             <useCaseId value="MAGETWO-96842"/>

From 67fc1a0a297634d85d59f3ea4803a7ee1be420ad Mon Sep 17 00:00:00 2001
From: Karan Shah <karan.shah@krishtechnolabs.com>
Date: Tue, 26 Mar 2019 14:38:44 +0530
Subject: [PATCH 0792/1055] 
 Admin-Order-Create-Set-Save-address-checkbox-true-as-default-#106

---
 .../adminhtml/templates/order/create/form/address.phtml     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index b0a88b8fa37dc..b08a76789642d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -89,11 +89,7 @@ endif; ?>
         <?= $block->getForm()->toHtml() ?>
 
         <div class="admin__field admin__field-option order-save-in-address-book">
-            <input name="<?= $block->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox"
-                   id="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
-                   value="1"
-                   <?php if (!$block->getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()): ?> checked="checked"<?php endif; ?>
-                   class="admin__control-checkbox"/>
+            <input name="<?= $block->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox" id="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book" value="1" checked="checked" class="admin__control-checkbox"/>
             <label for="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
                    class="admin__field-label"><?= /* @escapeNotVerified */ __('Save in address book') ?></label>
         </div>

From 18e41ba22fcd5126c7d1731781538f65ce997ab6 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Tue, 26 Mar 2019 12:07:27 +0200
Subject: [PATCH 0793/1055] 428 - Test coverage:
 GetAvailableShippingMethodsTest

---
 .../_files/simple_product_rollback.php        | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
new file mode 100644
index 0000000000000..43beafe822043
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('simple', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 63cbf8b0e47617c8fb3f381d7a7e5114f77eea35 Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Tue, 26 Mar 2019 12:11:43 +0200
Subject: [PATCH 0794/1055] Resolve random fails on Bamboo with
 \Magento\GraphQl\Quote\CouponTest::testApplyCouponToCartWithNoItems

---
 .../testsuite/Magento/GraphQl/Quote/CouponTest.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
index ce409bbcfb0a8..810fc793fb1e2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
@@ -100,7 +100,7 @@ public function testApplyCouponToCartWithNoItems()
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage(
-            str_replace('$cartId', $cartId, 'The "$cartId" Cart doesn\'t contain products.')
+            'The "' . $cartId . '" Cart doesn\'t contain products.'
         );
         $this->graphQlQuery($query);
     }

From 203b807ea5d262115a42509c39af64e9a1f2a9b6 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Tue, 26 Mar 2019 18:21:30 +0530
Subject: [PATCH 0795/1055] Correct spelling

---
 .../Magento/Framework/Config/ConfigOptionsListConstants.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
index 92f0302d93baf..6bdb74ef7b89a 100644
--- a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
+++ b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
@@ -47,7 +47,7 @@ class ConfigOptionsListConstants
     const CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION = 'static_content_on_demand_in_production';
 
     /**
-     * Paramater for forcing HTML minification even if file is already minified.
+     * Parameter for forcing HTML minification even if file is already minified.
      */
     const CONFIG_PATH_FORCE_HTML_MINIFICATION = 'force_html_minification';
 

From ef181ca1902b60bccd6c1a5e972f9f8435ebcde9 Mon Sep 17 00:00:00 2001
From: Karan Shah <karan.shah@krishtechnolabs.com>
Date: Tue, 26 Mar 2019 18:25:11 +0530
Subject: [PATCH 0796/1055] 
 Admin-Order-Create-Set-Save-address-checkbox-true-as-default-#106

---
 .../view/adminhtml/templates/order/create/form/address.phtml   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index b08a76789642d..d1a90783c68c7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -89,7 +89,8 @@ endif; ?>
         <?= $block->getForm()->toHtml() ?>
 
         <div class="admin__field admin__field-option order-save-in-address-book">
-            <input name="<?= $block->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox" id="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book" value="1" checked="checked" class="admin__control-checkbox"/>
+            <input name="<?= $block->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox" id="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book" value="1"
+                   <?php if (!$block->getDontSaveInAddressBook()): ?> checked="checked"<?php endif; ?> class="admin__control-checkbox"/>
             <label for="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
                    class="admin__field-label"><?= /* @escapeNotVerified */ __('Save in address book') ?></label>
         </div>

From 059f399232fe51f54e0e8c16986bf99c6fecbc4d Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 26 Mar 2019 15:27:12 +0200
Subject: [PATCH 0797/1055] Fix static tests.

---
 app/code/Magento/Eav/Model/Form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index 1d867109aaf38..a34b53eede354 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -286,7 +286,8 @@ public function getFormCode()
     }
 
     /**
-     * Return entity type instance
+     * Return entity type instance.
+     *
      * Return EAV entity type if entity type is not defined
      *
      * @return \Magento\Eav\Model\Entity\Type

From 4dcc18aba77d27dd7f284bf4f5421be2cf9a585d Mon Sep 17 00:00:00 2001
From: Roman Zhupanyn <roma.dj.elf@gmail.com>
Date: Tue, 26 Mar 2019 16:01:09 +0200
Subject: [PATCH 0798/1055] MAGETWO-98680: Cart Price Rule code is absent on
 "view Order/Invoice" Admin page if had been used for Free Shipping

---
 .../Magento/Sales/Block/Adminhtml/Totals.php  | 27 +++++++++-
 .../Sales/Block/Adminhtml/TotalsTest.php      | 53 +++++++++++++++++++
 .../order_with_free_shipping_by_coupon.php    | 34 ++++++++++++
 ..._with_free_shipping_by_coupon_rollback.php |  8 +++
 4 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
index 83b155293c2b9..3f08dc48d38d1 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Sales\Block\Adminhtml;
 
+use Magento\Sales\Model\Order;
+
 class Totals extends \Magento\Sales\Block\Order\Totals
 {
     /**
@@ -67,12 +69,16 @@ protected function _initTotals()
         if (!$this->getSource()->getIsVirtual() && ((double)$this->getSource()->getShippingAmount() ||
             $this->getSource()->getShippingDescription())
         ) {
+            $shippingLabel = __('Shipping & Handling');
+            if ($this->isHasFreeShipping($this->getSource()) && $this->getSource()->getDiscountDescription()) {
+                $shippingLabel .= sprintf(' (%s)', $this->getSource()->getDiscountDescription());
+            }
             $this->_totals['shipping'] = new \Magento\Framework\DataObject(
                 [
                     'code' => 'shipping',
                     'value' => $this->getSource()->getShippingAmount(),
                     'base_value' => $this->getSource()->getBaseShippingAmount(),
-                    'label' => __('Shipping & Handling'),
+                    'label' => $shippingLabel,
                 ]
             );
         }
@@ -109,4 +115,23 @@ protected function _initTotals()
 
         return $this;
     }
+
+    /**
+     * Availability of free shipping in at least one order item
+     *
+     * @param Order $order
+     * @return bool
+     */
+    private function isHasFreeShipping(Order $order): bool
+    {
+        $isActive = false;
+        foreach ($order->getItems() as $orderItem) {
+            if ($orderItem->getFreeShipping() === '1') {
+                $isActive = true;
+                break;
+            }
+        }
+
+        return $isActive;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
new file mode 100644
index 0000000000000..a77676e64a331
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Block\Adminhtml;
+
+use Magento\Framework\View\LayoutInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\OrderFactory;
+
+/**
+ * Test class for \Magento\Sales\Block\Adminhtml\Totals
+ */
+class TotalsTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /** @var LayoutInterface */
+    protected $_layout;
+
+    /** @var Totals */
+    protected $_block;
+
+    /** @var OrderFactory */
+    private $orderFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->_layout = $this->_objectManager->get(LayoutInterface::class);
+        $this->_block = $this->_layout->createBlock(Totals::class, 'totals_block');
+        $this->orderFactory = $this->_objectManager->get(OrderFactory::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order_with_free_shipping_by_coupon.php
+     */
+    public function testShowShippingCoupon()
+    {
+        /** @var Order $order */
+        $order = $this->orderFactory->create();
+        $order->loadByIncrementId('100000001');
+
+        $this->_block->setOrder($order);
+        $this->_block->toHtml();
+
+        $shippingTotal = $this->_block->getTotal('shipping');
+        $this->assertNotFalse($shippingTotal, 'Shipping method is absent on the total\'s block.');
+        $this->assertContains('1234567890', $shippingTotal->getLabel(), 'Coupon code is absent in the shipping method label name.');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
new file mode 100644
index 0000000000000..04e39ae3e462c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Item as OrderItem;
+
+require __DIR__ . '/../../../Magento/Sales/_files/order.php';
+/** @var \Magento\Catalog\Model\Product $product */
+
+/** @var OrderItem $orderItem */
+$orderItem = $objectManager->create(OrderItem::class);
+$orderItem->setProductId($product->getId())
+    ->setQtyOrdered(2)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType('simple')
+    ->setName($product->getName())
+    ->setFreeShipping('1');
+
+/** @var Order $order */
+$order->setShippingDescription('Flat Rate - Fixed')
+    ->setShippingAmount(0)
+    ->setCouponCode('1234567890')
+    ->setDiscountDescription('1234567890')
+    ->addItem($orderItem);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php
new file mode 100644
index 0000000000000..1fb4b4636ab29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'default_rollback.php';

From c0df80b46c7304dff84f8a19aa1d4301a8369dd5 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 26 Mar 2019 15:37:38 +0100
Subject: [PATCH 0799/1055] Tests refactoring

---
 .../Quote/AddSimpleProductToCartTest.php      | 24 +++---------
 .../Quote/AddVirtualProductToCartTest.php     | 39 +++++++++----------
 .../Catalog/_files/product_virtual.php        | 13 +++++--
 .../_files/product_virtual_rollback.php       | 17 ++++----
 4 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
index cbd40189c70fd..e6a5395b0d7b3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
@@ -7,12 +7,12 @@
 
 namespace Magento\GraphQl\Quote;
 
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 class AddSimpleProductToCartTest extends GraphQlAbstract
 {
@@ -65,13 +65,7 @@ public function testAddSimpleProductWithOptions()
         /* Generate customizable options fragment for GraphQl request */
         $queryCustomizableOptions = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = <<<QUERY
 mutation {  
@@ -157,7 +151,7 @@ public function testAddSimpleProductToCartWithNegativeQty()
     /**
      * @return string
      */
-    public function getMaskedQuoteId() : string
+    private function getMaskedQuoteId() : string
     {
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
@@ -251,13 +245,7 @@ public function testAddSimpleProductWithNoRequiredOptionsSet()
         $sku = 'simple';
         $qty = 1;
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = <<<QUERY
 mutation {  
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php
index 4e1f97ec17ee6..da4e6de2d0aa6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php
@@ -7,9 +7,9 @@
 
 namespace Magento\GraphQl\Quote;
 
+use Magento\Quote\Model\QuoteFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
@@ -17,13 +17,13 @@
 class AddVirtualProductToCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var QuoteFactory
      */
-    private $quoteResource;
+    private $quoteFactory;
     /**
-     * @var Quote
+     * @var QuoteResource
      */
-    private $quote;
+    private $quoteResource;
 
     /**
      * @var QuoteIdToMaskedQuoteIdInterface
@@ -42,7 +42,7 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->productCustomOptionsRepository = $objectManager->get(ProductCustomOptionRepositoryInterface::class);
     }
@@ -64,13 +64,7 @@ public function testAddVirtualProductWithOptions()
         /* Generate customizable options fragment for GraphQl request */
         $queryCustomizableOptions = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = <<<QUERY
 mutation {  
@@ -130,13 +124,7 @@ public function testAddVirtualProductWithNoRequiredOptionsSet()
         $sku = 'virtual';
         $qty = 1;
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = <<<QUERY
 mutation {  
@@ -206,4 +194,15 @@ private function getCustomOptionsValuesForQuery(string $sku): array
 
         return $customOptionsValues;
     }
+
+    /**
+     * @return string
+     */
+    public function getMaskedQuoteId() : string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
index 38e8c404dc002..d9db7b72a7a13 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
@@ -4,8 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+use Magento\Catalog\Model\ProductFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+
+$productFactory = Bootstrap::getObjectManager()->get(ProductFactory::class);
+$product = $productFactory->create();
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
     ->setId(21)
     ->setAttributeSetId(4)
@@ -22,4 +26,7 @@
             'is_in_stock' => 1,
             'manage_stock' => 1,
         ]
-    )->save();
+    );
+/** @var ProductResource $productResource */
+$productResource = Bootstrap::getObjectManager()->create(ProductResource::class);
+$productResource->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
index 7fdeca846885a..84039adc416aa 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
@@ -4,22 +4,25 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository = Bootstrap::getObjectManager()
+    ->create(ProductRepositoryInterface::class);
 
 try {
     $product = $productRepository->get('virtual-product', false, null, true);
     $productRepository->delete($product);
-} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+} catch (NoSuchEntityException $exception) {
     //Product already removed
-} catch (\Magento\Framework\Exception\StateException $exception) {
+} catch (StateException $exception) {
 }
 
 $registry->unregister('isSecureArea');

From b2ed9fd3a55d2f59e410fcbadf1a291687ac7099 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 26 Mar 2019 09:48:58 -0500
Subject: [PATCH 0800/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

- Fix static and integration tests
---
 .../Magento/GraphQl/Controller/GraphQl.php    | 15 +++---
 .../ContentTypeProcessor.php                  |  2 +-
 .../HttpHeaderProcessor/StoreProcessor.php    |  2 +-
 .../GraphQl/Config/GraphQlReaderTest.php      |  4 +-
 .../Controller/GraphQlControllerTest.php      | 49 ++++++++++++++++++-
 5 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index d28535e45ac09..3009b7948e2cc 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -115,17 +115,18 @@ public function dispatch(RequestInterface $request) : ResponseInterface
                 $data = $request->getParams();
                 $data['variables'] = isset($data['variables']) ?
                     $this->jsonSerializer->unserialize($data['variables']) : null;
-
-                // The easiest way to determine mutations without additional parsing
-                if (strpos(trim($data['query']), 'mutation') === 0) {
-                    throw new LocalizedException(
-                        __('Mutation requests allowed only for POST requests')
-                    );
-                }
             }
 
             $query = isset($data['query']) ? $data['query'] : '';
             $variables = isset($data['variables']) ? $data['variables'] : null;
+
+            // The easiest way to determine mutations without additional parsing
+            if ($request->isSafeMethod() && strpos(trim($query), 'mutation') === 0) {
+                throw new LocalizedException(
+                    __('Mutation requests allowed only for POST requests')
+                );
+            }
+
             // 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, $variables);
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
index 69201f93ab4ea..02cd5761834a2 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
@@ -19,7 +19,7 @@ class ContentTypeProcessor implements HttpHeaderProcessorInterface
     /**
      * Handle the mandatory application/json header
      *
-     * @inheritDoc
+     * {@inheritDoc}
      * @throws LocalizedException
      */
     public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
index e92ff374eb355..cd8f954a4edbc 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
@@ -35,7 +35,7 @@ public function __construct(StoreManagerInterface $storeManager)
     /**
      * Handle the value of the store and set the scope
      *
-     * @inheritDoc
+     * {@inheritDoc}
      * @throws GraphQlInputException
      */
     public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
index 7f8996daa6e97..10a6b9d8caae4 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Framework\GraphQl\Config;
 
 use Magento\Framework\App\Cache;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\GraphQl\Config;
 use Magento\Framework\GraphQl\Schema\SchemaGenerator;
 use Magento\Framework\ObjectManagerInterface;
@@ -175,8 +176,9 @@ enumValues(includeDeprecated: true) {
             'operationName' => 'IntrospectionQuery'
         ];
         /** @var Http $request */
-        $request = $this->objectManager->get(\Magento\Framework\App\Request\Http::class);
+        $request = $this->objectManager->get(Http::class);
         $request->setPathInfo('/graphql');
+        $request->setMethod('POST');
         $request->setContent(json_encode($postData));
         $headers = $this->objectManager->create(\Zend\Http\Headers::class)
             ->addHeaders(['Content-Type' => 'application/json']);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index 384892d6fd5d2..0e05a8260a24f 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -91,8 +91,9 @@ public function testDispatch() : void
             'operationName' => null
         ];
         /** @var Http $request */
-        $request = $this->objectManager->get(\Magento\Framework\App\Request\Http::class);
+        $request = $this->objectManager->get(Http::class);
         $request->setPathInfo('/graphql');
+        $request->setMethod('POST');
         $request->setContent(json_encode($postData));
         $headers = $this->objectManager->create(\Zend\Http\Headers::class)
             ->addHeaders(['Content-Type' => 'application/json']);
@@ -109,6 +110,49 @@ public function testDispatch() : void
         $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
     }
 
+    /**
+     * Test request is dispatched and response generated when using GET request with query string
+     *
+     * @return void
+     */
+    public function testDispatchWithGet() : void
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+
+        /** @var ProductInterface $product */
+        $product = $productRepository->get('simple1');
+
+        $query
+            = <<<QUERY
+ {
+           products(filter: {sku: {eq: "simple1"}})
+           {
+               items {
+                   id
+                   name
+                   sku
+               }
+           }
+       }
+QUERY;
+        /** @var Http $request */
+        $request = $this->objectManager->get(Http::class);
+        $request->setPathInfo('/graphql');
+        $request->setMethod('GET');
+        $request->setQueryValue('query', $query);
+        $response = $this->graphql->dispatch($request);
+        $output = $this->jsonSerializer->unserialize($response->getContent());
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+
+        $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
+        $this->assertTrue(!empty($output['data']['products']['items']), 'Products array has items');
+        $this->assertTrue(!empty($output['data']['products']['items'][0]), 'Products array has items');
+        $this->assertEquals($output['data']['products']['items'][0]['id'], $product->getData($linkField));
+        $this->assertEquals($output['data']['products']['items'][0]['sku'], $product->getSku());
+        $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
+    }
+
     /**
      * Test the errors on graphql output
      *
@@ -141,8 +185,9 @@ public function testError() : void
             'operationName' => null
         ];
         /** @var Http $request */
-        $request = $this->objectManager->get(\Magento\Framework\App\Request\Http::class);
+        $request = $this->objectManager->get(Http::class);
         $request->setPathInfo('/graphql');
+        $request->setMethod('POST');
         $request->setContent(json_encode($postData));
         $headers = $this->objectManager->create(\Zend\Http\Headers::class)
             ->addHeaders(['Content-Type' => 'application/json']);

From 1d91d51a37167eff1148664f9fdafe09a8eacdb8 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Tue, 26 Mar 2019 17:12:20 +0200
Subject: [PATCH 0801/1055] Fixed Ui typos

---
 .../Ui/view/base/web/js/lib/core/storage/local.js    | 10 +++++-----
 .../base/web/js/lib/knockout/template/renderer.js    |  2 +-
 .../Ui/view/base/web/js/lib/logger/logger-utils.js   | 12 ++++++------
 .../Ui/view/base/web/js/lib/validation/validator.js  |  2 +-
 .../view/base/web/js/lib/view/utils/dom-observer.js  |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
index 87b5b2f5fe8fe..adeb510ab3e40 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/storage/local.js
@@ -79,7 +79,7 @@ define([
 
     /**
      * Extracts and parses data stored in localStorage by the
-     * key specified in 'root' varaible.
+     * key specified in 'root' variable.
      *
      * @returns {Object}
      */
@@ -114,8 +114,8 @@ define([
          *
          * @param {String} path - Path to the property.
          *
-         * @example Retrieveing data.
-         *      localStoarge =>
+         * @example Retrieving data.
+         *      localStorage =>
          *          'appData' => '
          *              "one": {"two": "three"}
          *          '
@@ -139,7 +139,7 @@ define([
          *
          * @example Setting data.
          *      storage.set('one.two', 'four');
-         *      => localStoarge =>
+         *      => localStorage =>
          *          'appData' => '
          *              "one": {"two": "four"}
          *          '
@@ -159,7 +159,7 @@ define([
          *
          * @example Removing data.
          *      storage.remove('one.two', 'four');
-         *      => localStoarge =>
+         *      => localStorage =>
          *          'appData' => '
          *              "one": {}
          *          '
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js
index 2e0c53373f807..2cfd961619249 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/template/renderer.js
@@ -519,7 +519,7 @@ define([
         },
 
         /**
-         * Custom 'render' attrobute handler function. Wraps child elements
+         * Custom 'render' attribute handler function. Wraps child elements
          * of a node with knockout's 'ko template:' comment tag.
          *
          * @param {HTMLElement} node - Element to be processed.
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js b/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
index fe83f600132ed..bf7ae0cdc3e98 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/logger/logger-utils.js
@@ -42,14 +42,14 @@ define([], function () {
      * Method that creates object of messages
      * @param {String} requested - log message that showing that request for class is started
      * @param {String} loaded - log message that show when requested class is loaded
-     * @param {String} failded - log message that show when requested class is failed
+     * @param {String} failed - log message that show when requested class is failed
      * @returns {Object}
      */
-    LogUtils.prototype.createMessages = function (requested, loaded, failded) {
+    LogUtils.prototype.createMessages = function (requested, loaded, failed) {
         return {
             requested: requested || '',
             loaded: loaded || '',
-            failed: failded || ''
+            failed: failed || ''
         };
     };
 
@@ -57,14 +57,14 @@ define([], function () {
      * Method that creates object of log levels
      * @param {String} requested - log message that showing that request for class is started
      * @param {String} loaded - log message that show when requested class is loaded
-     * @param {String} failded - log message that show when requested class is failed
+     * @param {String} failed - log message that show when requested class is failed
      * @returns {Object}
      */
-    LogUtils.prototype.createLevels = function (requested, loaded, failded) {
+    LogUtils.prototype.createLevels = function (requested, loaded, failed) {
         return {
             requested: requested || 'info',
             loaded: loaded || 'info',
-            failed: failded || 'warn'
+            failed: failed || 'warn'
         };
     };
 
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
index 8ebbf88775b86..407984c7881a2 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
@@ -64,7 +64,7 @@ define([
     }
 
     /**
-     * Validates provied value by a specified set of rules.
+     * Validates provided value by a specified set of rules.
      *
      * @param {(String|Object)} rules - One or many validation rules.
      * @param {*} value - Value to be checked.
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
index 03012918f4a0d..f8e752fb77af2 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
@@ -141,7 +141,7 @@ define([
     }
 
     /**
-     * Calls handlers assocoiated with an added node.
+     * Calls handlers associated with an added node.
      * Adds listeners for the node removal.
      *
      * @param {HTMLElement} node - Added node.
@@ -163,7 +163,7 @@ define([
     }
 
     /**
-     * Calls handlers assocoiated with a removed node.
+     * Calls handlers associated with a removed node.
      *
      * @param {HTMLElement} node - Removed node.
      */

From d073b0c6367c492637ce1aa8f007b5310a72825a Mon Sep 17 00:00:00 2001
From: Valerij Ivashchenko <likemusicdev@gmail.com>
Date: Mon, 25 Mar 2019 22:53:25 +0300
Subject: [PATCH 0802/1055] Set minimum qty 1 after cast to int

---
 .../Magento/CatalogInventory/Model/StockStateProvider.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
index 31fd5606a9849..e5b51ca37c6a2 100644
--- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -119,14 +119,12 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
         $result->setItemIsQtyDecimal($stockItem->getIsQtyDecimal());
         if (!$stockItem->getIsQtyDecimal()) {
             $result->setHasQtyOptionUpdate(true);
-            $qty = (int) $qty;
+            $qty = (int) $qty ?: 1;
             /**
              * Adding stock data to quote item
              */
             $result->setItemQty($qty);
-            $qty = $this->getNumber($qty);
-            $origQty = (int) $origQty;
-            $result->setOrigQty($origQty);
+            $result->setOrigQty((int)$this->getNumber($origQty) ?: 1);
         }
 
         if ($stockItem->getMinSaleQty() && $qty < $stockItem->getMinSaleQty()) {

From 6c7b1db8da645fe0e0d18e0239426142b41a7fab Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 26 Mar 2019 17:25:57 +0100
Subject: [PATCH 0803/1055] Fixed composer.json code style issue

---
 app/code/Magento/QuoteGraphQl/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
index b53cab6656217..22ca9cfdfae9a 100644
--- a/app/code/Magento/QuoteGraphQl/composer.json
+++ b/app/code/Magento/QuoteGraphQl/composer.json
@@ -11,7 +11,7 @@
         "magento/module-store": "*",
         "magento/module-customer": "*",
         "magento/module-customer-graph-ql": "*",
-        "magento/module-sales" : "*"
+        "magento/module-sales": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*"

From b82503ae50f324ce9fb5add2b5e21159567b2412 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <d.cheshun@atwix.com>
Date: Tue, 26 Mar 2019 18:50:19 +0200
Subject: [PATCH 0804/1055] Fix encoding issue

---
 app/code/Magento/CatalogInventory/Model/StockStateProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
index e5b51ca37c6a2..6851b05aa56a6 100644
--- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.

From c8cd9e56dc9b8b32c69489d7ab5e96e159b691b4 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 26 Mar 2019 13:47:12 -0500
Subject: [PATCH 0805/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../Integrity/DeclarativeDependencyTest.php   | 35 ++++++++++++++++++-
 .../blacklisted_dependencies_ce.php           |  9 +++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/blacklisted_dependencies_ce.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
index 257da9669d9b5..a7fb86e7dff29 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
@@ -22,6 +22,11 @@ class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
      */
     private $dependencyProvider;
 
+    /**
+     * @var array
+     */
+    private $blacklistedDependencies = [];
+
     /**
      * Sets up data
      *
@@ -45,6 +50,14 @@ protected function setUp()
      */
     public function testUndeclaredDependencies()
     {
+        /** TODO: Remove this temporary solution after MC-15534 is closed */
+        $filePattern = __DIR__ . '/_files/dependency_test/blacklisted_dependencies_*.php';
+        $blacklistedDependencies = [];
+        foreach (glob($filePattern) as $fileName) {
+            $blacklistedDependencies = array_merge($blacklistedDependencies, require $fileName);
+        }
+        $this->blacklistedDependencies = $blacklistedDependencies;
+
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
             /**
@@ -71,7 +84,9 @@ function ($file) {
                 $result = [];
                 foreach ($undeclaredDependency as $name => $modules) {
                     $modules = array_unique($modules);
-                    $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules);
+                    if ($this->filterBlacklistedDependencies($foundModuleName, $modules)) {
+                        $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules);
+                    }
                 }
                 if (count($result)) {
                     $this->fail(
@@ -83,6 +98,24 @@ function ($file) {
         );
     }
 
+    /**
+     * Filter blacklisted dependencies.
+     *
+     * @todo Remove this temporary solution after MC-15534 is closed
+     *
+     * @param string $moduleName
+     * @param array $dependencies
+     * @return array
+     */
+    private function filterBlacklistedDependencies(string $moduleName, array $dependencies): array
+    {
+        if (!empty($this->blacklistedDependencies[$moduleName])) {
+            $dependencies = array_diff($dependencies, $this->blacklistedDependencies[$moduleName]);
+        }
+
+        return $dependencies;
+    }
+
     /**
      * Convert file list to data provider structure.
      *
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/blacklisted_dependencies_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/blacklisted_dependencies_ce.php
new file mode 100644
index 0000000000000..270cb99c29caa
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/blacklisted_dependencies_ce.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+return [
+    "Magento\InventorySales" => ["Magento\Inventory"],
+];

From bbe3d6cd2db89f9c87ec9794701867ae1ff0e99b Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 26 Mar 2019 14:18:43 -0500
Subject: [PATCH 0806/1055] MC-15466: Migrate PWA GraphQL scenarios

---
 setup/performance-toolkit/benchmark.jmx | 5399 ++++++++++++++---------
 1 file changed, 3373 insertions(+), 2026 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 0e1860405e946..cd014af101d7b 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -34,6 +34,11 @@
             <stringProp name="Argument.value">${__P(request_protocol,http)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="graphql_port_number" elementType="Argument">
+            <stringProp name="Argument.name">graphql_port_number</stringProp>
+            <stringProp name="Argument.value">${__P(graphql_port_number,80)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="admin_password" elementType="Argument">
             <stringProp name="Argument.name">admin_password</stringProp>
             <stringProp name="Argument.value">${__P(admin_password,123123q)}</stringProp>
@@ -354,6 +359,66 @@
             <stringProp name="Argument.value">${__P(frontendPoolUsers,1)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="graphQLPoolUsers" elementType="Argument">
+            <stringProp name="Argument.name">graphQLPoolUsers</stringProp>
+            <stringProp name="Argument.value">${__P(graphQLPoolUsers,1)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetCategoryListByCategoryIdPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetCategoryListByCategoryIdPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetCategoryListByCategoryIdPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetCmsBlockByIdentifierPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetCmsBlockByIdentifierPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetCmsBlockByIdentifierPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetCmsPageByIdPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetCmsPageByIdPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetCmsPageByIdPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetConfigurableProductDetailsByNamePercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetConfigurableProductDetailsByNamePercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetConfigurableProductDetailsByNamePercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetListOfProductsByCategoryIdPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetListOfProductsByCategoryIdPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetListOfProductsByCategoryIdPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetNavigationMenuByCategoryIdPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetNavigationMenuByCategoryIdPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetNavigationMenuByCategoryIdPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetProductSearchByProductNamePercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetProductSearchByProductNamePercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetProductSearchByProductNamePercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetProductSearchByTextAndCategoryIdPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetProductSearchByTextAndCategoryIdPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetProductSearchByTextAndCategoryIdPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlGetSimpleProductDetailsByProductUrlKeyPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetSimpleProductDetailsByProductUrlKeyPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetSimpleProductDetailsByProductUrlKeyPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlUrlInfoByUrlKeyPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlUrlInfoByUrlKeyPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlUrlInfoByUrlKeyPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="guest_checkout_percent" elementType="Argument">
             <stringProp name="Argument.name">guest_checkout_percent</stringProp>
             <stringProp name="Argument.value">${__P(guest_checkout_percent,100)}</stringProp>
@@ -658,6 +723,9 @@ props.remove("configurable_products_list");
 props.remove("configurable_products_list_for_edit");
 props.remove("users");
 props.remove("customer_emails_list");
+props.remove("categories");
+props.remove("cms_pages");
+props.remove("cms_blocks");
 
 /* This is only used when admin is enabled. */
 props.put("activeAdminThread", "");
@@ -821,167 +889,253 @@ if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substr
       </hashTree>
     </hashTree>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract categories" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_categories.jmx</stringProp>
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract admin users" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_admin_users.jmx</stringProp>
 </TestFragmentController>
     <hashTree>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Extract categories" enabled="true"/>
-      <hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Content-Type</stringProp>
-              <stringProp name="Header.value">application/json</stringProp>
-            </elementProp>
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Accept</stringProp>
-              <stringProp name="Header.value">*/*</stringProp>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Admin Users" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
             </elementProp>
           </collectionProp>
-        </HeaderManager>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/user/roleGrid/limit/200/?ajax=true&amp;isAjax=true</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
+          <stringProp name="filename"/>
+          <stringProp name="parameters"/>
+          <boolProp name="resetInterpreter">false</boolProp>
+          <stringProp name="script">import java.util.regex.Pattern;
+                    import java.util.regex.Matcher;
+                    import java.util.LinkedList;
+
+                    LinkedList adminUserList = new LinkedList();
+                    String response = new String(data);
+                    Pattern pattern = Pattern.compile("&lt;td\\W*?data-column=.username[^&gt;]*?&gt;\\W*?(\\w+)\\W*?&lt;");
+                    Matcher matcher = pattern.matcher(response);
+
+                    while (matcher.find()) {
+                    adminUserList.add(matcher.group(1));
+                    }
+
+                    adminUserList.poll();
+                    props.put("adminUserList", adminUserList);
+                    props.put("adminUserListIterator", adminUserList.descendingIterator());
+                </stringProp>
+        </BeanShellPostProcessor>
         <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-            <stringProp name="VAR">admin_token</stringProp>
-            <stringProp name="JSONPATH">$</stringProp>
-            <stringProp name="DEFAULT"/>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">1</intProp>
-            <stringProp name="Assertion.scope">variable</stringProp>
-            <stringProp name="Scope.variable">admin_token</stringProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Authorization</stringProp>
-              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+      </hashTree>
+    </hashTree>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract customers" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_customers.jmx</stringProp>
+</TestFragmentController>
+    <hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Open Customer Grid" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
+          <stringProp name="filename"/>
+          <stringProp name="parameters"/>
+          <boolProp name="resetInterpreter">true</boolProp>
+          <stringProp name="script">import org.apache.jmeter.protocol.http.control.CookieManager;
+import org.apache.jmeter.protocol.http.control.Cookie;
+CookieManager manager = sampler.getCookieManager();
+Cookie cookie = new Cookie("adminhtml",vars.get("COOKIE_adminhtml"),vars.get("host"),"/",false,0);
+manager.add(cookie); </stringProp>
+        </BeanShellPreProcessor>
+        <hashTree/>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Customer Grid" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-679437259">Customers</stringProp>
+            <stringProp name="495525733">&lt;title&gt;Customers / Customers / Magento Admin&lt;/title&gt;</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Search Customers" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="namespace" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">customer_listing</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">namespace</stringProp>
+            </elementProp>
+            <elementProp name="sorting[field]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">entity_id</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">sorting[field]</stringProp>
+            </elementProp>
+            <elementProp name="sorting[direction]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">asc</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">sorting[direction]</stringProp>
+            </elementProp>
+            <elementProp name="isAjax" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">isAjax</stringProp>
+            </elementProp>
+            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">customer_since[locale]=en_US</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">filters[placeholder]</stringProp>
+            </elementProp>
+            <elementProp name="filters[group_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">filters[group_id]</stringProp>
+            </elementProp>
+            <elementProp name="filters[website_id]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">filters[website_id]</stringProp>
+            </elementProp>
+            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${customers_page_size}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">paging[pageSize]</stringProp>
+            </elementProp>
+            <elementProp name="paging[current]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">paging[current]</stringProp>
+            </elementProp>
+            <elementProp name="sorting[field]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">entity_id</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">sorting[field]</stringProp>
+            </elementProp>
+            <elementProp name="sorting[direction]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">asc</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">sorting[direction]</stringProp>
+            </elementProp>
+            <elementProp name="isAjax" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">true</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">isAjax</stringProp>
             </elementProp>
           </collectionProp>
-        </HeaderManager>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
+          <stringProp name="JSON_PATH">$.totalRecords</stringProp>
+          <stringProp name="EXPECTED_VALUE">0</stringProp>
+          <boolProp name="JSONVALIDATION">true</boolProp>
+          <boolProp name="EXPECT_NULL">false</boolProp>
+          <boolProp name="INVERT">true</boolProp>
+          <boolProp name="ISREGEX">true</boolProp>
+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+        <hashTree/>
+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer emails" enabled="true">
+          <stringProp name="VAR">customer_emails</stringProp>
+          <stringProp name="JSONPATH">$.items[*].email</stringProp>
+          <stringProp name="DEFAULT"/>
+          <stringProp name="VARIABLE"/>
+          <stringProp name="SUBJECT">BODY</stringProp>
+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+        <hashTree/>
+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer ids" enabled="true">
+          <stringProp name="VAR">customer_ids</stringProp>
+          <stringProp name="JSONPATH">$.items[*].entity_id</stringProp>
+          <stringProp name="DEFAULT"/>
+          <stringProp name="VARIABLE"/>
+          <stringProp name="SUBJECT">BODY</stringProp>
+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+        <hashTree/>
+        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Make email list" enabled="true">
+          <boolProp name="resetInterpreter">false</boolProp>
+          <stringProp name="parameters"/>
+          <stringProp name="filename"/>
+          <stringProp name="script">import java.util.LinkedList;
+LinkedList emailsList = new LinkedList();
+props.put("customer_emails_list", emailsList);</stringProp>
+        </BeanShellPostProcessor>
         <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Categories Names and skus" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">path</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">1/2/%</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][0][filters][0][conditionType]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">like</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][conditionType]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">level</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">2</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">${categories_count}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/categories/list</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract category url key" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">category_url_keys</stringProp>
-            <stringProp name="RegexExtractor.regex">url_key\",\"value\":\"(.*?)\"</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">-1</stringProp>
-          </RegexExtractor>
-          <hashTree/>
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract category name" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">category_names</stringProp>
-            <stringProp name="RegexExtractor.regex">name\":\"(.*?)\"</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">-1</stringProp>
-          </RegexExtractor>
-          <hashTree/>
-        </hashTree>
       </hashTree>
-      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: category url keys loop" enabled="true">
-        <stringProp name="ForeachController.inputVal">category_url_keys</stringProp>
-        <stringProp name="ForeachController.returnVal">category_url_key</stringProp>
+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: customer emails loop (search result)" enabled="true">
+        <stringProp name="ForeachController.inputVal">customer_emails</stringProp>
+        <stringProp name="ForeachController.returnVal">customer_email</stringProp>
         <boolProp name="ForeachController.useSeparator">true</boolProp>
       </ForeachController>
       <hashTree>
@@ -989,32 +1143,31 @@ if (!slash.equals(path.substring(path.length() -1)) || !slash.equals(path.substr
           <stringProp name="CounterConfig.start">1</stringProp>
           <stringProp name="CounterConfig.end"/>
           <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">category_url_key_counter</stringProp>
+          <stringProp name="CounterConfig.name">email_counter</stringProp>
           <stringProp name="CounterConfig.format"/>
           <boolProp name="CounterConfig.per_user">false</boolProp>
         </CounterConfig>
         <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect category url keys" enabled="true">
-          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect customer emails" enabled="true">
+          <stringProp name="BeanShellSampler.query">
+try {
 
-// If it is first iteration of cycle then recreate category url key list
-if (1 == Integer.parseInt(vars.get("category_url_key_counter"))) {
-    categoryUrlKeysList = new ArrayList();
-    props.put("category_url_keys_list", categoryUrlKeysList);
-    props.put("category_url_key", vars.get("category_url_key"));
-} else {
-    categoryUrlKeysList = props.get("category_url_keys_list");
+props.get("customer_emails_list").add(vars.get("customer_email"));
+
+} catch (java.lang.Exception e) {
+	log.error("error&#x2026;", e);
+	SampleResult.setStopThread(true);
 }
-categoryUrlKeysList.add(vars.get("category_url_key"));</stringProp>
+          </stringProp>
           <stringProp name="BeanShellSampler.filename"/>
           <stringProp name="BeanShellSampler.parameters"/>
           <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
         </BeanShellSampler>
         <hashTree/>
       </hashTree>
-      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: category names loop" enabled="true">
-        <stringProp name="ForeachController.inputVal">category_names</stringProp>
-        <stringProp name="ForeachController.returnVal">category_name</stringProp>
+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: customer ids loop (search result)" enabled="true">
+        <stringProp name="ForeachController.inputVal">customer_ids</stringProp>
+        <stringProp name="ForeachController.returnVal">customer_id</stringProp>
         <boolProp name="ForeachController.useSeparator">true</boolProp>
       </ForeachController>
       <hashTree>
@@ -1022,166 +1175,177 @@ categoryUrlKeysList.add(vars.get("category_url_key"));</stringProp>
           <stringProp name="CounterConfig.start">1</stringProp>
           <stringProp name="CounterConfig.end"/>
           <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">category_name_counter</stringProp>
+          <stringProp name="CounterConfig.name">id_counter</stringProp>
           <stringProp name="CounterConfig.format"/>
           <boolProp name="CounterConfig.per_user">false</boolProp>
         </CounterConfig>
         <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect category names" enabled="true">
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect customer ids" enabled="true">
           <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
 
-// If it is first iteration of cycle then recreate category name list
-if (1 == Integer.parseInt(vars.get("category_name_counter"))) {
-    categoryNamesList = new ArrayList();
-    props.put("category_names_list",categoryNamesList);
-    props.put("category_name", vars.get("category_name"));
+// If it is first iteration of cycle then recreate idsList
+if (1 == Integer.parseInt(vars.get("id_counter"))) {
+    idsList = new ArrayList();
+    props.put("customer_ids_list", idsList);
 } else {
-    categoryNamesList = props.get("category_names_list");
+    idsList = props.get("customer_ids_list");
 }
-
-categoryNamesList.add(vars.get("category_name"));</stringProp>
+idsList.add(vars.get("customer_id"));</stringProp>
           <stringProp name="BeanShellSampler.filename"/>
           <stringProp name="BeanShellSampler.parameters"/>
           <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
         </BeanShellSampler>
         <hashTree/>
       </hashTree>
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect category" enabled="true">
-        <stringProp name="BeanShellSampler.query">props.put("category_url_key", vars.get("category_url_key"));
-props.put("category_name", vars.get("category_name"));</stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      </BeanShellSampler>
-      <hashTree/>
     </hashTree>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract categories id of last level" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_categories_id_of_last_level.jmx</stringProp>
-</TestFragmentController>
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract region ids" enabled="true">
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_region_ids.jmx</stringProp>
+    </TestFragmentController>
     <hashTree>
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Clear Admin Category Management properties" enabled="true">
-        <stringProp name="BeanShellSampler.query">props.remove("admin_category_ids_list");</stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      </BeanShellSampler>
-      <hashTree/>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Get categories of last level" enabled="true"/>
-      <hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Content-Type</stringProp>
-              <stringProp name="Header.value">application/json</stringProp>
-            </elementProp>
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Accept</stringProp>
-              <stringProp name="Header.value">*/*</stringProp>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Region ids" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="parent" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">false</boolProp>
+              <stringProp name="Argument.value">US</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">parent</stringProp>
             </elementProp>
           </collectionProp>
-        </HeaderManager>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout"/>
+        <stringProp name="HTTPSampler.response_timeout"/>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/directory/json/countryRegion/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Parse and put region id into variables" enabled="true">
+          <stringProp name="scriptLanguage">groovy</stringProp>
+          <stringProp name="parameters"/>
+          <stringProp name="filename"/>
+          <stringProp name="cacheKey"/>
+          <stringProp name="script">import groovy.json.JsonSlurper
+def jsonSlurper = new JsonSlurper();
+def regionResponse = jsonSlurper.parseText(prev.getResponseDataAsString());
+
+regionResponse.each { region -&gt;
+	if (region.label.toString() == "Alabama") {
+		props.put("alabama_region_id", region.value.toString());
+	} else if (region.label.toString() == 'California') {
+		props.put("california_region_id", region.value.toString());
+	}
+}</stringProp>
+        </JSR223PostProcessor>
         <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-            <stringProp name="VAR">admin_token</stringProp>
-            <stringProp name="JSONPATH">$</stringProp>
-            <stringProp name="DEFAULT"/>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">1</intProp>
-            <stringProp name="Assertion.scope">variable</stringProp>
-            <stringProp name="Scope.variable">admin_token</stringProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Authorization</stringProp>
-              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get categories" enabled="true">
+      </hashTree>
+    </hashTree>
+  
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Api Data Retrieval" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+        <stringProp name="VAR">admin_token</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_token</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Authorization</stringProp>
+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="SetUp - Get CMS pages" enabled="true"/>
+      <hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get CMS blocks" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments">
-              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">children_count</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">0</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">level</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">2</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[filterGroups][1][filters][0][conditionType]" elementType="HTTPArgument">
+              <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">gt</stringProp>
+                <stringProp name="Argument.value">1</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][conditionType]</stringProp>
+                <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
               </elementProp>
-              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">${adminCategoryCount}</stringProp>
+              <elementProp name="searchCriteria[page_size]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">20</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
+                <stringProp name="Argument.name">searchCriteria[page_size]</stringProp>
               </elementProp>
             </collectionProp>
           </elementProp>
@@ -1191,7 +1355,7 @@ props.put("category_name", vars.get("category_name"));</stringProp>
           <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories/list</stringProp>
+          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/cmsPage/search</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -1199,70 +1363,56 @@ props.put("category_name", vars.get("category_name"));</stringProp>
           <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
           <boolProp name="HTTPSampler.monitor">false</boolProp>
           <stringProp name="HTTPSampler.embedded_url_re"/>
+          <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/get_cms_pages.jmx</stringProp>
         </HTTPSamplerProxy>
         <hashTree>
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">category_list_id</stringProp>
-            <stringProp name="RegexExtractor.regex">\{\"id\":(\d+),</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">-1</stringProp>
-          </RegexExtractor>
+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert results are present" enabled="true">
+            <stringProp name="JSON_PATH">$.total_count</stringProp>
+            <stringProp name="EXPECTED_VALUE">0</stringProp>
+            <boolProp name="JSONVALIDATION">true</boolProp>
+            <boolProp name="EXPECT_NULL">false</boolProp>
+            <boolProp name="INVERT">true</boolProp>
+            <boolProp name="ISREGEX">false</boolProp>
+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
           <hashTree/>
-        </hashTree>
-        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Category Id" enabled="true">
-          <stringProp name="ForeachController.inputVal">category_list_id</stringProp>
-          <stringProp name="ForeachController.returnVal">category_id</stringProp>
-          <boolProp name="ForeachController.useSeparator">true</boolProp>
-        </ForeachController>
-        <hashTree>
-          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Process categories ids" enabled="true">
-            <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="PostProcessor" enabled="true">
+            <stringProp name="scriptLanguage">javascript</stringProp>
+            <stringProp name="parameters"/>
+            <stringProp name="filename"/>
+            <stringProp name="cacheKey"/>
+            <stringProp name="script">var data = JSON.parse(prev.getResponseDataAsString());
 
-adminCategoryIdsList = props.get("admin_category_ids_list");
-// If it is first iteration of cycle then recreate categories ids list
-if (adminCategoryIdsList == null) {
-    adminCategoryIdsList = new ArrayList();
-    props.put("admin_category_ids_list", adminCategoryIdsList);
-}
-adminCategoryIdsList.add(vars.get("category_id"));</stringProp>
-            <stringProp name="BeanShellSampler.filename"/>
-            <stringProp name="BeanShellSampler.parameters"/>
-            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-          </BeanShellSampler>
+var cmsPages = [];
+
+for (var i in data.items) {
+    cmsPages.push({"id": data.items[i].id, "identifier": data.items[i].identifier});
+ }
+
+props.put("cms_pages", cmsPages);
+</stringProp>
+          </JSR223PostProcessor>
           <hashTree/>
         </hashTree>
-      </hashTree>
     </hashTree>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract configurable products" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_configurable_products.jmx</stringProp>
-</TestFragmentController>
-    <hashTree>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve configurable products" enabled="true"/>
+      <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="SetUp - Get CMS blocks" enabled="true"/>
       <hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Content-Type</stringProp>
-              <stringProp name="Header.value">application/json</stringProp>
-            </elementProp>
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Accept</stringProp>
-              <stringProp name="Header.value">*/*</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get CMS blocks" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
+              <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">1</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[page_size]" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+                <stringProp name="Argument.value">20</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[page_size]</stringProp>
               </elementProp>
             </collectionProp>
           </elementProp>
@@ -1272,45 +1422,50 @@ adminCategoryIdsList.add(vars.get("category_id"));</stringProp>
           <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/cmsBlock/search</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
           <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
           <boolProp name="HTTPSampler.monitor">false</boolProp>
           <stringProp name="HTTPSampler.embedded_url_re"/>
+          <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/get_cms_blocks.jmx</stringProp>
         </HTTPSamplerProxy>
         <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-            <stringProp name="VAR">admin_token</stringProp>
-            <stringProp name="JSONPATH">$</stringProp>
-            <stringProp name="DEFAULT"/>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert results are present" enabled="true">
+            <stringProp name="JSON_PATH">$.total_count</stringProp>
+            <stringProp name="EXPECTED_VALUE">0</stringProp>
+            <boolProp name="JSONVALIDATION">true</boolProp>
+            <boolProp name="EXPECT_NULL">false</boolProp>
+            <boolProp name="INVERT">true</boolProp>
+            <boolProp name="ISREGEX">false</boolProp>
+          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
           <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">1</intProp>
-            <stringProp name="Assertion.scope">variable</stringProp>
-            <stringProp name="Scope.variable">admin_token</stringProp>
-          </ResponseAssertion>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="PostProcessor" enabled="true">
+            <stringProp name="scriptLanguage">javascript</stringProp>
+            <stringProp name="parameters"/>
+            <stringProp name="filename"/>
+            <stringProp name="cacheKey"/>
+            <stringProp name="script">var data = JSON.parse(prev.getResponseDataAsString());
+
+var cmsBlocks = [];
+
+for (var i in data.items) {
+    cmsBlocks.push({"id": data.items[i].id, "identifier": data.items[i].identifier});
+ }
+
+props.put("cms_blocks", cmsBlocks);
+</stringProp>
+          </JSR223PostProcessor>
           <hashTree/>
         </hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Authorization</stringProp>
-              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
+    </hashTree>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract configurable products" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_configurable_products.jmx</stringProp>
+</TestFragmentController>
+    <hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get configurable products" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
@@ -1437,83 +1592,11 @@ productList.add(productMap);</stringProp>
         </BeanShellSampler>
         <hashTree/>
       </hashTree>
-    </hashTree>
   
     <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract configurable products for edit" enabled="true">
   <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_configurable_products_for_edit.jmx</stringProp>
 </TestFragmentController>
     <hashTree>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve configurable products for edit" enabled="true"/>
-      <hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Content-Type</stringProp>
-              <stringProp name="Header.value">application/json</stringProp>
-            </elementProp>
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Accept</stringProp>
-              <stringProp name="Header.value">*/*</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-            <stringProp name="VAR">admin_token</stringProp>
-            <stringProp name="JSONPATH">$</stringProp>
-            <stringProp name="DEFAULT"/>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">1</intProp>
-            <stringProp name="Assertion.scope">variable</stringProp>
-            <stringProp name="Scope.variable">admin_token</stringProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Authorization</stringProp>
-              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get configurable products for edit" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
@@ -1645,36 +1728,49 @@ editProductList.add(editProductMap);</stringProp>
           <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
         </BeanShellSampler>
         <hashTree/>
-      </hashTree>
     </hashTree>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products for edit" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products_for_edit.jmx</stringProp>
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products.jmx</stringProp>
 </TestFragmentController>
     <hashTree>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve simple products for edit" enabled="true"/>
-      <hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Content-Type</stringProp>
-              <stringProp name="Header.value">application/json</stringProp>
-            </elementProp>
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Accept</stringProp>
-              <stringProp name="Header.value">*/*</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+              <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">type_id</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">simple</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">${simple_products_count}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][0][filters][1][field]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">attribute_set_id</stringProp>
+                <stringProp name="Argument.metadata">!=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][field]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[filterGroups][0][filters][1][value]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">4</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][value]</stringProp>
               </elementProp>
             </collectionProp>
           </elementProp>
@@ -1684,8 +1780,8 @@ editProductList.add(editProductMap);</stringProp>
           <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <stringProp name="HTTPSampler.path">${base_path}rest/V1/products</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
           <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
@@ -1694,35 +1790,94 @@ editProductList.add(editProductMap);</stringProp>
           <stringProp name="HTTPSampler.embedded_url_re"/>
         </HTTPSamplerProxy>
         <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-            <stringProp name="VAR">admin_token</stringProp>
-            <stringProp name="JSONPATH">$</stringProp>
-            <stringProp name="DEFAULT"/>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_products_url_keys</stringProp>
+            <stringProp name="RegexExtractor.regex">url_key\",\"value\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
           <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">1</intProp>
-            <stringProp name="Assertion.scope">variable</stringProp>
-            <stringProp name="Scope.variable">admin_token</stringProp>
-          </ResponseAssertion>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_product_ids</stringProp>
+            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product titles" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_product_names</stringProp>
+            <stringProp name="RegexExtractor.regex">name\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product skus" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
+            <stringProp name="RegexExtractor.refname">simple_product_skus</stringProp>
+            <stringProp name="RegexExtractor.regex">sku\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">-1</stringProp>
+          </RegexExtractor>
           <hashTree/>
         </hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Authorization</stringProp>
-              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
-            </elementProp>
-          </collectionProp>
-        </HeaderManager>
+      </hashTree>
+      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare simple products" enabled="true">
+        <stringProp name="ForeachController.inputVal">simple_product_ids</stringProp>
+        <stringProp name="ForeachController.returnVal">simple_product_id</stringProp>
+        <boolProp name="ForeachController.useSeparator">true</boolProp>
+      </ForeachController>
+      <hashTree>
+        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
+          <stringProp name="CounterConfig.start">1</stringProp>
+          <stringProp name="CounterConfig.end"/>
+          <stringProp name="CounterConfig.incr">1</stringProp>
+          <stringProp name="CounterConfig.name">simple_products_counter</stringProp>
+          <stringProp name="CounterConfig.format"/>
+          <boolProp name="CounterConfig.per_user">false</boolProp>
+        </CounterConfig>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect simple product" enabled="true">
+          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
+import java.util.HashMap;
+import org.apache.commons.codec.binary.Base64;
+
+// If it is first iteration of cycle then recreate productList
+if (1 == Integer.parseInt(vars.get("simple_products_counter"))) {
+    productList = new ArrayList();
+    props.put("simple_products_list", productList);
+} else {
+    productList = props.get("simple_products_list");
+}
+String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_url_keys_" + vars.get("simple_products_counter"))+ vars.get("url_suffix");
+encodedUrl = Base64.encodeBase64(productUrl.getBytes());
+// Create product map
+Map productMap = new HashMap();
+productMap.put("id", vars.get("simple_product_id"));
+productMap.put("title", vars.get("simple_product_names_" + vars.get("simple_products_counter")));
+productMap.put("sku", vars.get("simple_product_skus_" + vars.get("simple_products_counter")));
+productMap.put("url_key", vars.get("simple_products_url_keys_" + vars.get("simple_products_counter")));
+productMap.put("uenc", new String(encodedUrl));
+
+// Collect products map in products list
+productList.add(productMap);</stringProp>
+          <stringProp name="BeanShellSampler.filename"/>
+          <stringProp name="BeanShellSampler.parameters"/>
+          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+        </BeanShellSampler>
         <hashTree/>
+      </hashTree>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products for edit" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products_for_edit.jmx</stringProp>
+</TestFragmentController>
+    <hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products for edit" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
@@ -1869,120 +2024,162 @@ editProductList.add(editProductMap);</stringProp>
         </BeanShellSampler>
         <hashTree/>
       </hashTree>
-    </hashTree>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract simple products" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_simple_products.jmx</stringProp>
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract categories (First Level)" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_categories.jmx</stringProp>
 </TestFragmentController>
     <hashTree>
-      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="SetUp - Retrieve simple products" enabled="true"/>
-      <hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Content-Type</stringProp>
-              <stringProp name="Header.value">application/json</stringProp>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get Categories Names and skus" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">path</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
             </elementProp>
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Accept</stringProp>
-              <stringProp name="Header.value">*/*</stringProp>
+            <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">1/2/%</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
             </elementProp>
-          </collectionProp>
-        </HeaderManager>
-        <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
-          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
-          <stringProp name="HTTPSampler.method">POST</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-            <stringProp name="VAR">admin_token</stringProp>
-            <stringProp name="JSONPATH">$</stringProp>
-            <stringProp name="DEFAULT"/>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-          <hashTree/>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
-            <collectionProp name="Asserion.test_strings">
-              <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
-            </collectionProp>
-            <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-            <boolProp name="Assertion.assume_success">false</boolProp>
-            <intProp name="Assertion.test_type">1</intProp>
-            <stringProp name="Assertion.scope">variable</stringProp>
-            <stringProp name="Scope.variable">admin_token</stringProp>
-          </ResponseAssertion>
-          <hashTree/>
-        </hashTree>
-        <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-          <collectionProp name="HeaderManager.headers">
-            <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">Authorization</stringProp>
-              <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+            <elementProp name="searchCriteria[filterGroups][0][filters][0][conditionType]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">like</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][conditionType]</stringProp>
+            </elementProp>
+            <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">level</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
+            </elementProp>
+            <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">2</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
+            </elementProp>
+            <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${categories_count}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
             </elementProp>
           </collectionProp>
-        </HeaderManager>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}rest/V1/categories/list</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">false</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="PostProcessor" enabled="true">
+          <stringProp name="scriptLanguage">javascript</stringProp>
+          <stringProp name="parameters"/>
+          <stringProp name="filename"/>
+          <stringProp name="cacheKey"/>
+          <stringProp name="script">var data = JSON.parse(prev.getResponseDataAsString());
+
+var categoryData = [], categoryNames = [], categoryUrls = [];
+
+for (var i in data.items) {
+	var cat = data.items[i], urlKey = getUrlKey(cat);
+     categoryData.push({"id": cat.id, "name": cat.name, "url_key": urlKey, "children": cat.children.split(",")});
+     categoryNames.push(cat.name);
+     categoryUrls.push(urlKey);
+ }
+
+function getUrlKey(cat) {
+    for (var i in cat.custom_attributes) {
+        if (cat.custom_attributes[i].attribute_code == "url_key") {
+            return cat.custom_attributes[i].value;	
+          }
+    }
+    return "";
+}
+
+props.put("categories", categoryData);
+props.put("category_url_keys_list", categoryUrls);
+props.put("category_names_list",categoryNames);</stringProp>
+        </JSR223PostProcessor>
         <hashTree/>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get simple products" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+      </hashTree>
+    </hashTree>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract categories id of last level" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_categories_id_of_last_level.jmx</stringProp>
+</TestFragmentController>
+    <hashTree>
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Clear Admin Category Management properties" enabled="true">
+        <stringProp name="BeanShellSampler.query">props.remove("admin_category_ids_list");</stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - API Get categories" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="searchCriteria[filterGroups][0][filters][0][field]" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">type_id</stringProp>
+                <stringProp name="Argument.value">children_count</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
                 <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][field]</stringProp>
               </elementProp>
               <elementProp name="searchCriteria[filterGroups][0][filters][0][value]" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">simple</stringProp>
+                <stringProp name="Argument.value">0</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
                 <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][0][value]</stringProp>
               </elementProp>
-              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
+              <elementProp name="searchCriteria[filterGroups][1][filters][0][field]" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">${simple_products_count}</stringProp>
+                <stringProp name="Argument.value">level</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][field]</stringProp>
               </elementProp>
-              <elementProp name="searchCriteria[filterGroups][0][filters][1][field]" elementType="HTTPArgument">
+              <elementProp name="searchCriteria[filterGroups][1][filters][0][value]" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">attribute_set_id</stringProp>
-                <stringProp name="Argument.metadata">!=</stringProp>
+                <stringProp name="Argument.value">2</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][field]</stringProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][value]</stringProp>
               </elementProp>
-              <elementProp name="searchCriteria[filterGroups][0][filters][1][value]" elementType="HTTPArgument">
+              <elementProp name="searchCriteria[filterGroups][1][filters][0][conditionType]" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">4</stringProp>
+                <stringProp name="Argument.value">gt</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[filterGroups][0][filters][1][value]</stringProp>
+                <stringProp name="Argument.name">searchCriteria[filterGroups][1][filters][0][conditionType]</stringProp>
+              </elementProp>
+              <elementProp name="searchCriteria[pageSize]" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">${adminCategoryCount}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">searchCriteria[pageSize]</stringProp>
               </elementProp>
             </collectionProp>
           </elementProp>
@@ -1992,7 +2189,7 @@ editProductList.add(editProductMap);</stringProp>
           <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
           <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/V1/products</stringProp>
+          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/categories/list</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -2002,655 +2199,248 @@ editProductList.add(editProductMap);</stringProp>
           <stringProp name="HTTPSampler.embedded_url_re"/>
         </HTTPSamplerProxy>
         <hashTree>
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product url keys" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">simple_products_url_keys</stringProp>
-            <stringProp name="RegexExtractor.regex">url_key\",\"value\":\"(.*?)\"</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">-1</stringProp>
-          </RegexExtractor>
-          <hashTree/>
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product ids" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">simple_product_ids</stringProp>
-            <stringProp name="RegexExtractor.regex">\"id\":(\d+),\"sku\"</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">-1</stringProp>
-          </RegexExtractor>
-          <hashTree/>
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product titles" enabled="true">
-            <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">simple_product_names</stringProp>
-            <stringProp name="RegexExtractor.regex">name\":\"(.*?)\"</stringProp>
-            <stringProp name="RegexExtractor.template">$1$</stringProp>
-            <stringProp name="RegexExtractor.default"/>
-            <stringProp name="RegexExtractor.match_number">-1</stringProp>
-          </RegexExtractor>
-          <hashTree/>
-          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor: Extract product skus" enabled="true">
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
             <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-            <stringProp name="RegexExtractor.refname">simple_product_skus</stringProp>
-            <stringProp name="RegexExtractor.regex">sku\":\"(.*?)\"</stringProp>
+            <stringProp name="RegexExtractor.refname">category_list_id</stringProp>
+            <stringProp name="RegexExtractor.regex">\{\"id\":(\d+),</stringProp>
             <stringProp name="RegexExtractor.template">$1$</stringProp>
             <stringProp name="RegexExtractor.default"/>
             <stringProp name="RegexExtractor.match_number">-1</stringProp>
           </RegexExtractor>
           <hashTree/>
         </hashTree>
-      </hashTree>
-      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: Prepare simple products" enabled="true">
-        <stringProp name="ForeachController.inputVal">simple_product_ids</stringProp>
-        <stringProp name="ForeachController.returnVal">simple_product_id</stringProp>
-        <boolProp name="ForeachController.useSeparator">true</boolProp>
-      </ForeachController>
-      <hashTree>
-        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-          <stringProp name="CounterConfig.start">1</stringProp>
-          <stringProp name="CounterConfig.end"/>
-          <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">simple_products_counter</stringProp>
-          <stringProp name="CounterConfig.format"/>
-          <boolProp name="CounterConfig.per_user">false</boolProp>
-        </CounterConfig>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect simple product" enabled="true">
-          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
-import java.util.HashMap;
-import org.apache.commons.codec.binary.Base64;
+        <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Category Id" enabled="true">
+          <stringProp name="ForeachController.inputVal">category_list_id</stringProp>
+          <stringProp name="ForeachController.returnVal">category_id</stringProp>
+          <boolProp name="ForeachController.useSeparator">true</boolProp>
+        </ForeachController>
+        <hashTree>
+          <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="Process categories ids" enabled="true">
+            <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
 
-// If it is first iteration of cycle then recreate productList
-if (1 == Integer.parseInt(vars.get("simple_products_counter"))) {
-    productList = new ArrayList();
-    props.put("simple_products_list", productList);
-} else {
-    productList = props.get("simple_products_list");
+adminCategoryIdsList = props.get("admin_category_ids_list");
+// If it is first iteration of cycle then recreate categories ids list
+if (adminCategoryIdsList == null) {
+    adminCategoryIdsList = new ArrayList();
+    props.put("admin_category_ids_list", adminCategoryIdsList);
 }
-String productUrl = vars.get("request_protocol") + "://" + vars.get("host") + vars.get("base_path") + vars.get("simple_products_url_keys_" + vars.get("simple_products_counter"))+ vars.get("url_suffix");
-encodedUrl = Base64.encodeBase64(productUrl.getBytes());
-// Create product map
-Map productMap = new HashMap();
-productMap.put("id", vars.get("simple_product_id"));
-productMap.put("title", vars.get("simple_product_names_" + vars.get("simple_products_counter")));
-productMap.put("sku", vars.get("simple_product_skus_" + vars.get("simple_products_counter")));
-productMap.put("url_key", vars.get("simple_products_url_keys_" + vars.get("simple_products_counter")));
-productMap.put("uenc", new String(encodedUrl));
-
-// Collect products map in products list
-productList.add(productMap);</stringProp>
-          <stringProp name="BeanShellSampler.filename"/>
-          <stringProp name="BeanShellSampler.parameters"/>
-          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-      </hashTree>
+adminCategoryIdsList.add(vars.get("category_id"));</stringProp>
+            <stringProp name="BeanShellSampler.filename"/>
+            <stringProp name="BeanShellSampler.parameters"/>
+            <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+          </BeanShellSampler>
+          <hashTree/>
+        </hashTree>
     </hashTree>
+  </hashTree>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract admin users" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_admin_users.jmx</stringProp>
-</TestFragmentController>
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Validate properties and count users" enabled="true">
+      <stringProp name="BeanShellSampler.query">Boolean stopTestOnError (String error) {
+    log.error(error);
+    System.out.println(error);
+    SampleResult.setStopTest(true);
+    return false;
+}
+
+if (props.get("simple_products_list") == null) {
+    return stopTestOnError("Cannot find simple products. Test stopped.");
+}
+if (props.get("simple_products_list_for_edit") == null) {
+    return stopTestOnError("Cannot find simple products for edit. Test stopped.");
+}
+if (props.get("configurable_products_list") == null) {
+    return stopTestOnError("Cannot find configurable products. Test stopped.");
+}
+if (props.get("configurable_products_list_for_edit") == null) {
+    return stopTestOnError("Cannot find configurable products for edit. Test stopped.");
+}
+if (props.get("customer_emails_list") == null) {
+    return stopTestOnError("Cannot find customer emails. Test stopped.");
+}
+if (props.get("category_url_keys_list") == null) {
+    return stopTestOnError("Cannot find category url keys. Test stopped.");
+}
+if (props.get("category_names_list") == null) {
+    return stopTestOnError("Cannot find category names. Test stopped.");
+}
+if (props.get("cms_pages") == null) {
+    return stopTestOnError("Cannot find cms pages. Test stopped.");
+}
+if (props.get("cms_blocks") == null) {
+    return stopTestOnError("Cannot find cms blocks. Test stopped.");
+}
+</stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/validate_properties.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - WarmUp Add To Cart" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="product" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">1</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">product</stringProp>
+          </elementProp>
+          <elementProp name="related_product" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value"/>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">related_product</stringProp>
+          </elementProp>
+          <elementProp name="qty" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">1</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">qty</stringProp>
+          </elementProp>
+          <elementProp name="form_key" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">${form_key}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">form_key</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/warmup_add_to_cart.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Ajax Load Login Form" enabled="true">
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="blocks" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">["customer_form_login"]</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">blocks</stringProp>
+          </elementProp>
+          <elementProp name="handles" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">["default","customer_account_login"]</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">handles</stringProp>
+          </elementProp>
+          <elementProp name="originalRequest" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">{"route":"customer","controller":"account","action":"login","uri":"/customer/account/login/"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">originalRequest</stringProp>
+          </elementProp>
+          <elementProp name="ajax" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">ajax</stringProp>
+          </elementProp>
+          <elementProp name="isAjax" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">true</boolProp>
+            <stringProp name="Argument.value">true</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+            <boolProp name="HTTPArgument.use_equals">true</boolProp>
+            <stringProp name="Argument.name">isAjax</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}page_cache/block/render/</stringProp>
+      <stringProp name="HTTPSampler.method">GET</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/ajax_load_login_form.jmx</stringProp></HTTPSamplerProxy>
     <hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Admin Users" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="form_key" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              <stringProp name="Argument.value">${admin_form_key}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">form_key</stringProp>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="940598773">"customer_form_login"</stringProp>
+          <stringProp name="1951684663">Registered Customers</stringProp>
+          <stringProp name="474011748">form_key</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+  
+        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Frontend Pool" enabled="true">
+            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+                <boolProp name="LoopController.continue_forever">false</boolProp>
+                <stringProp name="LoopController.loops">${loops}</stringProp>
             </elementProp>
-          </collectionProp>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/admin/user/roleGrid/limit/200/?ajax=true&amp;isAjax=true</stringProp>
-        <stringProp name="HTTPSampler.method">POST</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="BeanShell PostProcessor" enabled="true">
-          <stringProp name="filename"/>
-          <stringProp name="parameters"/>
-          <boolProp name="resetInterpreter">false</boolProp>
-          <stringProp name="script">import java.util.regex.Pattern;
-                    import java.util.regex.Matcher;
-                    import java.util.LinkedList;
-
-                    LinkedList adminUserList = new LinkedList();
-                    String response = new String(data);
-                    Pattern pattern = Pattern.compile("&lt;td\\W*?data-column=.username[^&gt;]*?&gt;\\W*?(\\w+)\\W*?&lt;");
-                    Matcher matcher = pattern.matcher(response);
+            <stringProp name="ThreadGroup.num_threads">${frontendPoolUsers}</stringProp>
+            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
+            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
+            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
+            <boolProp name="ThreadGroup.scheduler">false</boolProp>
+            <stringProp name="ThreadGroup.duration"/>
+            <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
+        <hashTree>
+    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Cache hit miss" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">var cacheHitPercent = vars.get("cache_hits_percentage");
 
-                    while (matcher.find()) {
-                    adminUserList.add(matcher.group(1));
-                    }
+if (
+	cacheHitPercent &lt; 100 &amp;&amp;
+	sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+	doCache();
+}
 
-                    adminUserList.poll();
-                    props.put("adminUserList", adminUserList);
-                    props.put("adminUserListIterator", adminUserList.descendingIterator());
-                </stringProp>
-        </BeanShellPostProcessor>
-        <hashTree/>
-      </hashTree>
-    </hashTree>
+function doCache(){
+	var random = Math.random() * 100;
+	if (cacheHitPercent &lt; random) {
+		sampler.setPath(sampler.getPath() + "?cacheModifier=" + Math.random().toString(36).substring(2, 13));
+	}
+}
+</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/cache_hit_miss.jmx</stringProp></JSR223PreProcessor>
+    <hashTree/>
   
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract customers" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_customers.jmx</stringProp>
-</TestFragmentController>
-    <hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Open Customer Grid" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments"/>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/customer/index/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="BeanShell PreProcessor" enabled="true">
-          <stringProp name="filename"/>
-          <stringProp name="parameters"/>
-          <boolProp name="resetInterpreter">true</boolProp>
-          <stringProp name="script">import org.apache.jmeter.protocol.http.control.CookieManager;
-import org.apache.jmeter.protocol.http.control.Cookie;
-CookieManager manager = sampler.getCookieManager();
-Cookie cookie = new Cookie("adminhtml",vars.get("COOKIE_adminhtml"),vars.get("host"),"/",false,0);
-manager.add(cookie); </stringProp>
-        </BeanShellPreProcessor>
-        <hashTree/>
-        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Customer Grid" enabled="true">
-          <collectionProp name="Asserion.test_strings">
-            <stringProp name="-679437259">Customers</stringProp>
-            <stringProp name="495525733">&lt;title&gt;Customers / Customers / Magento Admin&lt;/title&gt;</stringProp>
-          </collectionProp>
-          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-          <boolProp name="Assertion.assume_success">false</boolProp>
-          <intProp name="Assertion.test_type">2</intProp>
-        </ResponseAssertion>
-        <hashTree/>
-      </hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Search Customers" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="namespace" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">customer_listing</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">namespace</stringProp>
-            </elementProp>
-            <elementProp name="sorting[field]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">entity_id</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">sorting[field]</stringProp>
-            </elementProp>
-            <elementProp name="sorting[direction]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">asc</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">sorting[direction]</stringProp>
-            </elementProp>
-            <elementProp name="isAjax" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">true</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">isAjax</stringProp>
-            </elementProp>
-            <elementProp name="filters[placeholder]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">customer_since[locale]=en_US</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">filters[placeholder]</stringProp>
-            </elementProp>
-            <elementProp name="filters[group_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">filters[group_id]</stringProp>
-            </elementProp>
-            <elementProp name="filters[website_id]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">filters[website_id]</stringProp>
-            </elementProp>
-            <elementProp name="paging[pageSize]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">${customers_page_size}</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">paging[pageSize]</stringProp>
-            </elementProp>
-            <elementProp name="paging[current]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">1</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">paging[current]</stringProp>
-            </elementProp>
-            <elementProp name="sorting[field]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">entity_id</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">sorting[field]</stringProp>
-            </elementProp>
-            <elementProp name="sorting[direction]" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">asc</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">sorting[direction]</stringProp>
-            </elementProp>
-            <elementProp name="isAjax" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">true</boolProp>
-              <stringProp name="Argument.value">true</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">isAjax</stringProp>
-            </elementProp>
-          </collectionProp>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/mui/index/render/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert total records is not 0" enabled="true">
-          <stringProp name="JSON_PATH">$.totalRecords</stringProp>
-          <stringProp name="EXPECTED_VALUE">0</stringProp>
-          <boolProp name="JSONVALIDATION">true</boolProp>
-          <boolProp name="EXPECT_NULL">false</boolProp>
-          <boolProp name="INVERT">true</boolProp>
-          <boolProp name="ISREGEX">true</boolProp>
-        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-        <hashTree/>
-        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer emails" enabled="true">
-          <stringProp name="VAR">customer_emails</stringProp>
-          <stringProp name="JSONPATH">$.items[*].email</stringProp>
-          <stringProp name="DEFAULT"/>
-          <stringProp name="VARIABLE"/>
-          <stringProp name="SUBJECT">BODY</stringProp>
-        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-        <hashTree/>
-        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer ids" enabled="true">
-          <stringProp name="VAR">customer_ids</stringProp>
-          <stringProp name="JSONPATH">$.items[*].entity_id</stringProp>
-          <stringProp name="DEFAULT"/>
-          <stringProp name="VARIABLE"/>
-          <stringProp name="SUBJECT">BODY</stringProp>
-        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-        <hashTree/>
-        <BeanShellPostProcessor guiclass="TestBeanGUI" testclass="BeanShellPostProcessor" testname="Make email list" enabled="true">
-          <boolProp name="resetInterpreter">false</boolProp>
-          <stringProp name="parameters"/>
-          <stringProp name="filename"/>
-          <stringProp name="script">import java.util.LinkedList;
-LinkedList emailsList = new LinkedList();
-props.put("customer_emails_list", emailsList);</stringProp>
-        </BeanShellPostProcessor>
-        <hashTree/>
-      </hashTree>
-      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: customer emails loop (search result)" enabled="true">
-        <stringProp name="ForeachController.inputVal">customer_emails</stringProp>
-        <stringProp name="ForeachController.returnVal">customer_email</stringProp>
-        <boolProp name="ForeachController.useSeparator">true</boolProp>
-      </ForeachController>
-      <hashTree>
-        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-          <stringProp name="CounterConfig.start">1</stringProp>
-          <stringProp name="CounterConfig.end"/>
-          <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">email_counter</stringProp>
-          <stringProp name="CounterConfig.format"/>
-          <boolProp name="CounterConfig.per_user">false</boolProp>
-        </CounterConfig>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect customer emails" enabled="true">
-          <stringProp name="BeanShellSampler.query">
-try {
-
-props.get("customer_emails_list").add(vars.get("customer_email"));
-
-} catch (java.lang.Exception e) {
-	log.error("error&#x2026;", e);
-	SampleResult.setStopThread(true);
-}
-          </stringProp>
-          <stringProp name="BeanShellSampler.filename"/>
-          <stringProp name="BeanShellSampler.parameters"/>
-          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-      </hashTree>
-      <ForeachController guiclass="ForeachControlPanel" testclass="ForeachController" testname="ForEach Controller: customer ids loop (search result)" enabled="true">
-        <stringProp name="ForeachController.inputVal">customer_ids</stringProp>
-        <stringProp name="ForeachController.returnVal">customer_id</stringProp>
-        <boolProp name="ForeachController.useSeparator">true</boolProp>
-      </ForeachController>
-      <hashTree>
-        <CounterConfig guiclass="CounterConfigGui" testclass="CounterConfig" testname="Counter" enabled="true">
-          <stringProp name="CounterConfig.start">1</stringProp>
-          <stringProp name="CounterConfig.end"/>
-          <stringProp name="CounterConfig.incr">1</stringProp>
-          <stringProp name="CounterConfig.name">id_counter</stringProp>
-          <stringProp name="CounterConfig.format"/>
-          <boolProp name="CounterConfig.per_user">false</boolProp>
-        </CounterConfig>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Collect customer ids" enabled="true">
-          <stringProp name="BeanShellSampler.query">import java.util.ArrayList;
-
-// If it is first iteration of cycle then recreate idsList
-if (1 == Integer.parseInt(vars.get("id_counter"))) {
-    idsList = new ArrayList();
-    props.put("customer_ids_list", idsList);
-} else {
-    idsList = props.get("customer_ids_list");
-}
-idsList.add(vars.get("customer_id"));</stringProp>
-          <stringProp name="BeanShellSampler.filename"/>
-          <stringProp name="BeanShellSampler.parameters"/>
-          <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-      </hashTree>
-    </hashTree>
-  
-    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Extract region ids" enabled="true">
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/extract_region_ids.jmx</stringProp>
-    </TestFragmentController>
-    <hashTree>
-      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Extract Region ids" enabled="true">
-        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments">
-            <elementProp name="parent" elementType="HTTPArgument">
-              <boolProp name="HTTPArgument.always_encode">false</boolProp>
-              <stringProp name="Argument.value">US</stringProp>
-              <stringProp name="Argument.metadata">=</stringProp>
-              <boolProp name="HTTPArgument.use_equals">true</boolProp>
-              <stringProp name="Argument.name">parent</stringProp>
-            </elementProp>
-          </collectionProp>
-        </elementProp>
-        <stringProp name="HTTPSampler.domain"/>
-        <stringProp name="HTTPSampler.port"/>
-        <stringProp name="HTTPSampler.connect_timeout"/>
-        <stringProp name="HTTPSampler.response_timeout"/>
-        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-        <stringProp name="HTTPSampler.contentEncoding"/>
-        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/directory/json/countryRegion/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
-        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-        <boolProp name="HTTPSampler.monitor">false</boolProp>
-        <stringProp name="HTTPSampler.embedded_url_re"/>
-      </HTTPSamplerProxy>
-      <hashTree>
-        <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="Parse and put region id into variables" enabled="true">
-          <stringProp name="scriptLanguage">groovy</stringProp>
-          <stringProp name="parameters"/>
-          <stringProp name="filename"/>
-          <stringProp name="cacheKey"/>
-          <stringProp name="script">import groovy.json.JsonSlurper
-def jsonSlurper = new JsonSlurper();
-def regionResponse = jsonSlurper.parseText(prev.getResponseDataAsString());
-
-regionResponse.each { region -&gt;
-	if (region.label.toString() == "Alabama") {
-		props.put("alabama_region_id", region.value.toString());
-	} else if (region.label.toString() == 'California') {
-		props.put("california_region_id", region.value.toString());
-	}
-}</stringProp>
-        </JSR223PostProcessor>
-        <hashTree/>
-      </hashTree>
-    </hashTree>
-  
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - BeanShell Sampler: Validate properties and count users" enabled="true">
-      <stringProp name="BeanShellSampler.query">Boolean stopTestOnError (String error) {
-    log.error(error);
-    System.out.println(error);
-    SampleResult.setStopTest(true);
-    return false;
-}
-
-if (props.get("simple_products_list") == null) {
-    return stopTestOnError("Cannot find simple products. Test stopped.");
-}
-if (props.get("simple_products_list_for_edit") == null) {
-    return stopTestOnError("Cannot find simple products for edit. Test stopped.");
-}
-if (props.get("configurable_products_list") == null) {
-    return stopTestOnError("Cannot find configurable products. Test stopped.");
-}
-if (props.get("configurable_products_list_for_edit") == null) {
-    return stopTestOnError("Cannot find configurable products for edit. Test stopped.");
-}
-if (props.get("customer_emails_list") == null) {
-    return stopTestOnError("Cannot find customer emails. Test stopped.");
-}
-if (props.get("category_url_keys_list") == null) {
-	return stopTestOnError("Cannot find category url keys. Test stopped.");
-}
-if (props.get("category_names_list") == null) {
-	return stopTestOnError("Cannot find category names. Test stopped.");
-}
-</stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/validate_properties.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - WarmUp Add To Cart" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="product" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">product</stringProp>
-          </elementProp>
-          <elementProp name="related_product" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value"/>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">related_product</stringProp>
-          </elementProp>
-          <elementProp name="qty" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">1</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">qty</stringProp>
-          </elementProp>
-          <elementProp name="form_key" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">${form_key}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">form_key</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}checkout/cart/add</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/warmup_add_to_cart.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Ajax Load Login Form" enabled="true">
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="blocks" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">["customer_form_login"]</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">blocks</stringProp>
-          </elementProp>
-          <elementProp name="handles" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">["default","customer_account_login"]</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">handles</stringProp>
-          </elementProp>
-          <elementProp name="originalRequest" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"route":"customer","controller":"account","action":"login","uri":"/customer/account/login/"}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">originalRequest</stringProp>
-          </elementProp>
-          <elementProp name="ajax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">ajax</stringProp>
-          </elementProp>
-          <elementProp name="isAjax" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">true</boolProp>
-            <stringProp name="Argument.value">true</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-            <boolProp name="HTTPArgument.use_equals">true</boolProp>
-            <stringProp name="Argument.name">isAjax</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}page_cache/block/render/</stringProp>
-      <stringProp name="HTTPSampler.method">GET</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/ajax_load_login_form.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="940598773">"customer_form_login"</stringProp>
-          <stringProp name="1951684663">Registered Customers</stringProp>
-          <stringProp name="474011748">form_key</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-  
-        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Frontend Pool" enabled="true">
-            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
-            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
-                <boolProp name="LoopController.continue_forever">false</boolProp>
-                <stringProp name="LoopController.loops">${loops}</stringProp>
-            </elementProp>
-            <stringProp name="ThreadGroup.num_threads">${frontendPoolUsers}</stringProp>
-            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
-            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
-            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
-            <boolProp name="ThreadGroup.scheduler">false</boolProp>
-            <stringProp name="ThreadGroup.duration"/>
-            <stringProp name="ThreadGroup.delay"/>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
-        <hashTree>
-    <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Cache hit miss" enabled="true">
-      <stringProp name="scriptLanguage">javascript</stringProp>
-      <stringProp name="parameters"/>
-      <stringProp name="filename"/>
-      <stringProp name="cacheKey"/>
-      <stringProp name="script">var cacheHitPercent = vars.get("cache_hits_percentage");
-
-if (
-	cacheHitPercent &lt; 100 &amp;&amp;
-	sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-	doCache();
-}
-
-function doCache(){
-	var random = Math.random() * 100;
-	if (cacheHitPercent &lt; random) {
-		sampler.setPath(sampler.getPath() + "?cacheModifier=" + Math.random().toString(36).substring(2, 13));
-	}
-}
-</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/cache_hit_miss.jmx</stringProp></JSR223PreProcessor>
-    <hashTree/>
-  
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Catalog Browsing By Customer" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${browseCatalogByCustomerPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Catalog Browsing By Customer" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${browseCatalogByCustomerPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
     <hashTree>
         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
             <stringProp name="script">
@@ -2719,22 +2509,24 @@ vars.putObject("randomIntGenerator", random);
       </BeanShellSampler>
       <hashTree/>
     
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
 
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
 
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
         </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
-      <hashTree/>
-    
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
     <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Get Customer Email" enabled="true">
         <stringProp name="CriticalSectionController.lockName">get-email</stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
@@ -3251,22 +3043,24 @@ vars.putObject("randomIntGenerator", random);
       </BeanShellSampler>
       <hashTree/>
     
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
 
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
 
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
         </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
-      <hashTree/>
-    
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
           <collectionProp name="Arguments.arguments"/>
@@ -4656,22 +4450,24 @@ vars.put("totalProductsAdded", "0");
       </BeanShellSampler>
       <hashTree/>
     
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
 
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
 
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
         </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
-      <hashTree/>
-    
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
           <collectionProp name="Arguments.arguments"/>
@@ -5970,22 +5766,24 @@ vars.put("totalProductsAdded", "0");
       </BeanShellSampler>
       <hashTree/>
     
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
 
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
 
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
         </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
-      <hashTree/>
-    
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Category" enabled="true">
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
         <collectionProp name="Arguments.arguments"/>
@@ -6537,22 +6335,24 @@ vars.put("totalProductsAdded", "0");
       </BeanShellSampler>
       <hashTree/>
     
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
 
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
 
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
         </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
-      <hashTree/>
-    
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Open Home Page" enabled="true">
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
           <collectionProp name="Arguments.arguments"/>
@@ -7676,22 +7476,24 @@ vars.put("totalProductsAdded", "0");
       </BeanShellSampler>
       <hashTree/>
     
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
 
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
 
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
         </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
-      <hashTree/>
-    
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
     <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Get Customer Email" enabled="true">
         <stringProp name="CriticalSectionController.lockName">get-email</stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
@@ -9500,22 +9302,24 @@ vars.put("totalProductsAdded", "0");
       </BeanShellSampler>
       <hashTree/>
     
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Category Data" enabled="true">
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
 
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("category_url_keys_list").size());
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
 
-vars.put("category_url_key", props.get("category_url_keys_list").get(number));
-vars.put("category_name", props.get("category_names_list").get(number));
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
         </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></BeanShellSampler>
-      <hashTree/>
-    
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
     <CriticalSectionController guiclass="CriticalSectionControllerGui" testclass="CriticalSectionController" testname="Get Customer Email" enabled="true">
         <stringProp name="CriticalSectionController.lockName">get-email</stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/lock_controller.jmx</stringProp></CriticalSectionController>
@@ -38420,10 +38224,1423 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
     </hashTree>
   </hashTree>
   
-    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Graphql Query Controller" enabled="true">
-  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
-</GenericController>
+    <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Graphql Query Controller" enabled="true">
+  <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/simple_controller.jmx</stringProp>
+</GenericController>
+    <hashTree>
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
+        <stringProp name="VAR">admin_token</stringProp>
+        <stringProp name="JSONPATH">$</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">1</intProp>
+        <stringProp name="Assertion.scope">variable</stringProp>
+        <stringProp name="Scope.variable">admin_token</stringProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Authorization</stringProp>
+          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query multiple products" enabled="true">
+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                <collectionProp name="Arguments.arguments">
+                    <elementProp name="" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                        <stringProp name="Argument.value">{"query":"{\n  products(\n    filter: {\n         price: {gt: \"10\"}\n         or: {\n            sku:{like:\"%Product%\"}\n            name:{like:\"%Configurable Product%\"}\n          }\n        }\n    pageSize: 20\n    currentPage: 0\n    sort: {\n      price: ASC\n      name:DESC\n    }\n  ) {\n    total_count\n    items {\n        attribute_set_id\n        country_of_manufacture\n        created_at\n        description {\n            html\n        }\n        gift_message_available\n        image\n        {\n            url\n            label\n        }\n        meta_description\n        meta_keyword\n        meta_title\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        short_description {\n            html\n        }\n        sku\n        small_image {\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        type_id\n        updated_at\n        url_key\n        url_path\n        websites { id name code sort_order default_group_id is_default }\n      \t... on PhysicalProductInterface {\n        \tweight\n      \t}\n    }\n    page_info {\n      page_size\n      current_page\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                    </elementProp>
+                </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_filter_only.jmx</stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+                <stringProp name="VAR">graphql_multiple_products_query_total_count</stringProp>
+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 200" enabled="true">
+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_multiple_products_query_total_count");
+                    if (totalCount == null) {
+                    Failure = true;
+                    FailureMessage = "Not Expected \"totalCount\" to be null";
+                    } else {
+                    if (Integer.parseInt(totalCount) &lt; 200) {
+                    Failure = true;
+                    FailureMessage = "Expected \"totalCount\" to be greater than 200, Actual: " + totalCount;
+                    } else {
+                    Failure = false;
+                    }
+                    }
+                </stringProp>
+                <stringProp name="BeanShellAssertion.filename"/>
+                <stringProp name="BeanShellAssertion.parameters"/>
+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+            </BeanShellAssertion>
+            <hashTree/>
+        </hashTree>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query simple product" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${simple_product_sku}\" } })\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        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_simple_product_with_extensible_data_objects.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_simple_products_query_total_count</stringProp>
+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+
+        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract response" enabled="true">
+            <stringProp name="VAR">graphql_multiple_products_query_response</stringProp>
+            <stringProp name="JSONPATH">$</stringProp>
+            <stringProp name="DEFAULT"/>
+            <stringProp name="VARIABLE"/>
+            <stringProp name="SUBJECT">BODY</stringProp>
+        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+        <hashTree/>
+        <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_simple_products_query_total_count");
+
+if (totalCount == null) {
+        Failure = true;
+        FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+	if (Integer.parseInt(totalCount) != 1) {
+   Failure = true;
+   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+	} else {
+		Failure = false;
+	}
+}
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
+        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+        <boolProp name="ISREGEX">true</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query configurable product" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\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 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}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_configurable_product_with_extensible_data_objects.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_configurable_products_query_total_count</stringProp>
+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_configurable_products_query_total_count");
+
+if (totalCount == null) {
+        Failure = true;
+        FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+	if (Integer.parseInt(totalCount) != 1) {
+   Failure = true;
+   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+	} else {
+		Failure = false;
+	}
+}
+
+
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert configurable product sku" enabled="true">
+        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+        <stringProp name="EXPECTED_VALUE">${configurable_product_sku}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+        <boolProp name="ISREGEX">true</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search and filter" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(\n   pageSize:20\n   currentPage:0\n    sort:{price:ASC}\n    search: \"configurable\"\n        filter: {name: {like: \"Configurable Product%\"} }\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        \t\t\tweight\n      \t\t\t}\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}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filter.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_search_products_query_total_count_fulltext_filter</stringProp>
+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count_fulltext_filter");
+
+if (totalCount == null) {
+        Failure = true;
+        FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+	if (Integer.parseInt(totalCount) &lt; 1) {
+   Failure = true;
+   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
+	} else {
+		Failure = false;
+	}
+}
+
+
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search only" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(\n   pageSize:20\n   currentPage:0\n    sort:{price:ASC}\n    search: \"configurable\") {\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        \t\t\tweight\n      \t\t\t}\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                            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}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_only.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
+
+if (totalCount == null) {
+        Failure = true;
+        FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+	if (Integer.parseInt(totalCount) &lt; 1) {
+   Failure = true;
+   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
+	} else {
+		Failure = false;
+	}
+}
+
+
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <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">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(\n   pageSize:20\n   currentPage:0\n    sort:{price:ASC}\n    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>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filters.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
+
+if (totalCount == null) {
+        Failure = true;
+        FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+	if (Integer.parseInt(totalCount) &lt; 1) {
+   Failure = true;
+   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
+	} else {
+		Failure = false;
+	}
+}
+
+
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+    </hashTree>
+  
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query bundle product" enabled="true">
+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                <collectionProp name="Arguments.arguments">
+                    <elementProp name="" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${bundle_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\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                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 BundleProduct {\n                weight\n                price_view\n                dynamic_price\n                dynamic_sku\n                ship_bundle_items\n                dynamic_weight\n                items {\n                  option_id\n                  title\n                  required\n                  type\n                  position\n                  sku\n                  options {\n                        id\n                        qty\n                        position\n                        is_default\n                        price\n                        price_type\n                        can_change_quantity\n                    product {\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                            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            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                    </elementProp>
+                </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_bundle_product_with_extensible_data_objects.jmx</stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+                <stringProp name="VAR">graphql_bundle_products_query_total_count</stringProp>
+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_bundle_products_query_total_count");
+
+                    if (totalCount == null) {
+                    Failure = true;
+                    FailureMessage = "Not Expected \"totalCount\" to be null";
+                    } else {
+                    if (Integer.parseInt(totalCount) != 1) {
+                    Failure = true;
+                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+                    } else {
+                    Failure = false;
+                    }
+                    }
+
+
+                </stringProp>
+                <stringProp name="BeanShellAssertion.filename"/>
+                <stringProp name="BeanShellAssertion.parameters"/>
+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+            </BeanShellAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert bundle product sku" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+                <stringProp name="EXPECTED_VALUE">${bundle_product_sku}</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">false</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+        </hashTree>
+    
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query downloadable product" enabled="true">
+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                <collectionProp name="Arguments.arguments">
+                    <elementProp name="" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                        <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${downloadable_product_sku}\" } })\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        \t\t\tweight\n      \t\t  }\n              ... on DownloadableProduct {\n                links_purchased_separately\n                links_title\n                downloadable_product_samples {\n                  id\n                  title\n                  sort_order\n                  sample_type\n                  sample_file\n                  sample_url\n                }\n                downloadable_product_links {\n                        id\n                        title\n                        sort_order\n                        is_shareable\n                        price\n                        number_of_downloads\n                        link_type\n                        sample_type\n                        sample_file\n                            sample_url\n                }\n              }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                    </elementProp>
+                </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_downloadable_product_with_extensible_data_objects.jmx</stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+                <stringProp name="VAR">graphql_downloadable_products_query_total_count</stringProp>
+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_downloadable_products_query_total_count");
+
+                    if (totalCount == null) {
+                    Failure = true;
+                    FailureMessage = "Not Expected \"totalCount\" to be null";
+                    } else {
+                    if (Integer.parseInt(totalCount) != 1) {
+                    Failure = true;
+                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+                    } else {
+                    Failure = false;
+                    }
+                    }
+
+
+                </stringProp>
+                <stringProp name="BeanShellAssertion.filename"/>
+                <stringProp name="BeanShellAssertion.parameters"/>
+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+            </BeanShellAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert downloadable product sku" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+                <stringProp name="EXPECTED_VALUE">${downloadable_product_sku}</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">true</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert link samples titles" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
+                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">false</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert sample titles" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
+                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">false</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+        </hashTree>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query virtual product" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${virtual_product_sku}\" } })\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        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_virtual_product_with_extensible_data_objects.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_virtual_products_query_total_count</stringProp>
+        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_virtual_products_query_total_count");
+
+if (totalCount == null) {
+        Failure = true;
+        FailureMessage = "Not Expected \"totalCount\" to be null";
+} else {
+	if (Integer.parseInt(totalCount) != 1) {
+   Failure = true;
+   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+	} else {
+		Failure = false;
+	}
+}
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
+        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+        <stringProp name="EXPECTED_VALUE">${virtual_product_sku}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+        <boolProp name="ISREGEX">true</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+      <hashTree/>
+    </hashTree>
+  
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query grouped product" enabled="true">
+            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                <collectionProp name="Arguments.arguments">
+                    <elementProp name="" elementType="HTTPArgument">
+                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${grouped_product_sku}\"} }) {\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 GroupedProduct {\n                weight\n                items {\n                  qty\n                  position\n                  product {\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        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+                        <stringProp name="Argument.metadata">=</stringProp>
+                    </elementProp>
+                </collectionProp>
+            </elementProp>
+            <stringProp name="HTTPSampler.domain"/>
+            <stringProp name="HTTPSampler.port"/>
+            <stringProp name="HTTPSampler.connect_timeout"/>
+            <stringProp name="HTTPSampler.response_timeout"/>
+            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+            <stringProp name="HTTPSampler.contentEncoding"/>
+            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+            <stringProp name="HTTPSampler.method">POST</stringProp>
+            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+            <boolProp name="HTTPSampler.monitor">false</boolProp>
+            <stringProp name="HTTPSampler.embedded_url_re"/>
+            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_grouped_product_with_extensible_data_objects.jmx</stringProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+                <stringProp name="VAR">graphql_grouped_products_query_total_count</stringProp>
+                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
+                <stringProp name="DEFAULT"/>
+                <stringProp name="VARIABLE"/>
+                <stringProp name="SUBJECT">BODY</stringProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+            <hashTree/>
+            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
+                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_grouped_products_query_total_count");
+
+                    if (totalCount == null) {
+                    Failure = true;
+                    FailureMessage = "Not Expected \"totalCount\" to be null";
+                    } else {
+                    if (Integer.parseInt(totalCount) != 1) {
+                    Failure = true;
+                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
+                    } else {
+                    Failure = false;
+                    }
+                    }
+
+
+                </stringProp>
+                <stringProp name="BeanShellAssertion.filename"/>
+                <stringProp name="BeanShellAssertion.parameters"/>
+                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+            </BeanShellAssertion>
+            <hashTree/>
+            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert grouped product sku" enabled="true">
+                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
+                <stringProp name="EXPECTED_VALUE">${grouped_product_sku}</stringProp>
+                <boolProp name="JSONVALIDATION">true</boolProp>
+                <boolProp name="EXPECT_NULL">false</boolProp>
+                <boolProp name="INVERT">false</boolProp>
+                <boolProp name="ISREGEX">true</boolProp>
+            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+            <hashTree/>
+        </hashTree>
+    
+        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Query Customer" enabled="true"/>
+        <hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "customer": {&#xD;
+                                &#xD;
+                                "email": "customer_${__time()}-${__threadNum}-${__Random(1,1000000)}@example.com",&#xD;
+                                "firstname": "test_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
+                                "lastname": "Doe"&#xD;
+                                },&#xD;
+                                "password": "test@123"&#xD;
+                                }</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers</stringProp>
+                <stringProp name="HTTPSampler.method">POST</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx</stringProp>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer id" enabled="true">
+                    <stringProp name="VAR">customer_id</stringProp>
+                    <stringProp name="JSONPATH">$.id</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer id not null" enabled="true">
+                    <collectionProp name="Asserion.test_strings">
+                        <stringProp name="89649215">^\d+$</stringProp>
+                    </collectionProp>
+                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+                    <boolProp name="Assertion.assume_success">false</boolProp>
+                    <intProp name="Assertion.test_type">1</intProp>
+                    <stringProp name="Assertion.scope">variable</stringProp>
+                    <stringProp name="Scope.variable">customer_id</stringProp>
+                </ResponseAssertion>
+                <hashTree/>
+            </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check customer" enabled="true">
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+                    <collectionProp name="Arguments.arguments"/>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers/${customer_id}</stringProp>
+                <stringProp name="HTTPSampler.method">GET</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_customer.jmx</stringProp>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
+                    <stringProp name="JSON_PATH">$.id</stringProp>
+                    <stringProp name="EXPECTED_VALUE">${customer_id}</stringProp>
+                    <boolProp name="JSONVALIDATION">true</boolProp>
+                    <boolProp name="EXPECT_NULL">false</boolProp>
+                    <boolProp name="INVERT">false</boolProp>
+                    <boolProp name="ISREGEX">true</boolProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+                <hashTree/>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer email" enabled="true">
+                    <stringProp name="VAR">customer_email</stringProp>
+                    <stringProp name="JSONPATH">$.email</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+            </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer token" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{&#xD;
+                                "username":"${customer_email}",&#xD;
+                                "password":"test@123"&#xD;
+                                }&#xD;
+                            </stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/integration/customer/token</stringProp>
+                <stringProp name="HTTPSampler.method">POST</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_customer.jmx</stringProp>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer token" enabled="true">
+                    <stringProp name="VAR">customer_token</stringProp>
+                    <stringProp name="JSONPATH">$</stringProp>
+                    <stringProp name="DEFAULT"/>
+                    <stringProp name="VARIABLE"/>
+                    <stringProp name="SUBJECT">BODY</stringProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+                <hashTree/>
+            </hashTree>
+            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query customer with token" enabled="true">
+                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+                    <collectionProp name="Arguments.arguments">
+                        <elementProp name="" elementType="HTTPArgument">
+                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                            <stringProp name="Argument.value">{"query":"{\n  customer {\n    created_at\n    group_id\n\n    prefix\n    firstname\n    middlename\n    lastname\n    suffix\n    email\n    default_billing\n    default_shipping\n\n    dob\n    taxvat\n\n    id\n    addresses {\n        id\n        customer_id\n        region {\n            region_code\n          region\n          region_id\n        }\n        region_id\n        country_id\n        street \n        company\n        telephone\n        fax\n        postcode\n        city\n        firstname\n        lastname\n        middlename\n        prefix\n        suffix\n        vat_id\n        default_shipping\n        default_billing\n    }\n    is_subscribed\n  }\n}","variables":null,"operationName":null}</stringProp>
+                            <stringProp name="Argument.metadata">=</stringProp>
+                        </elementProp>
+                    </collectionProp>
+                </elementProp>
+                <stringProp name="HTTPSampler.domain"/>
+                <stringProp name="HTTPSampler.port"/>
+                <stringProp name="HTTPSampler.connect_timeout"/>
+                <stringProp name="HTTPSampler.response_timeout"/>
+                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+                <stringProp name="HTTPSampler.contentEncoding"/>
+                <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+                <stringProp name="HTTPSampler.method">POST</stringProp>
+                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+                <boolProp name="HTTPSampler.monitor">false</boolProp>
+                <stringProp name="HTTPSampler.embedded_url_re"/>
+                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx</stringProp>
+            </HTTPSamplerProxy>
+            <hashTree>
+                <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Set Customer Token" enabled="true">
+                    <boolProp name="resetInterpreter">false</boolProp>
+                    <stringProp name="parameters"/>
+                    <stringProp name="filename"/>
+                    <stringProp name="script">import org.apache.jmeter.protocol.http.control.Header;
+
+                        sampler.getHeaderManager().removeHeaderNamed("Authorization");
+
+                        sampler.getHeaderManager().add(new Header("Authorization","Bearer " + vars.get("customer_token")));</stringProp>
+                </BeanShellPreProcessor>
+                <hashTree/>
+                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert customer lastname" enabled="true">
+                    <stringProp name="JSON_PATH">$.data.customer.lastname</stringProp>
+                    <stringProp name="EXPECTED_VALUE">Doe</stringProp>
+                    <boolProp name="JSONVALIDATION">true</boolProp>
+                    <boolProp name="EXPECT_NULL">false</boolProp>
+                    <boolProp name="INVERT">false</boolProp>
+                    <boolProp name="ISREGEX">true</boolProp>
+                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+                <hashTree/>
+            </hashTree>
+        </hashTree>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query Category" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  category(id: 1) {\n      name\n      id\n      level\n      description\n      path\n      path_in_store\n      url_key\n      url_path\n      children {\n        id\n        description\n        default_sort_by\n        children {\n          id\n          description\n          level\n          children {\n            level\n            id\n            children {\n              id\n            }\n          }\n        }\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.connect_timeout"/>
+      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_root_category.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
+        <stringProp name="VAR">graphql_category_query_name</stringProp>
+        <stringProp name="JSONPATH">$.data.category.name</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
+        <stringProp name="BeanShellAssertion.query">String name = vars.get("graphql_category_query_name");
+if (name == null) {
+	Failure = true;
+	FailureMessage = "Not Expected \"children\" to be null";
+} else {
+	if (!name.equals("Root Catalog")) {
+		Failure = true;
+		FailureMessage = "Expected \"name\" to equal \"Root Catalog\", Actual: " + name;
+	} else {
+		Failure = false;
+	}
+}
+</stringProp>
+        <stringProp name="BeanShellAssertion.filename"/>
+        <stringProp name="BeanShellAssertion.parameters"/>
+        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
+      </BeanShellAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+  </hashTree>
+
+  </hashTree>
+
+    
+        <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="GraphQL Pool" enabled="true">
+            <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+            <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+                <boolProp name="LoopController.continue_forever">false</boolProp>
+                <stringProp name="LoopController.loops">${loops}</stringProp>
+            </elementProp>
+            <stringProp name="ThreadGroup.num_threads">${graphQLPoolUsers}</stringProp>
+            <stringProp name="ThreadGroup.ramp_time">${ramp_period}</stringProp>
+            <longProp name="ThreadGroup.start_time">1505803944000</longProp>
+            <longProp name="ThreadGroup.end_time">1505803944000</longProp>
+            <boolProp name="ThreadGroup.scheduler">false</boolProp>
+            <stringProp name="ThreadGroup.duration"/>
+            <stringProp name="ThreadGroup.delay"/>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
+        <hashTree>
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get List of Products by category_id" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetListOfProductsByCategoryIdPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get List of Products by category_id");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get List of Products by category_id" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"query category($id: Int!, $currentPage: Int, $pageSize: Int) {\n  category(id: $id) {\n    product_count\n    description\n    url_key\n    name\n    id\n    breadcrumbs {\n      category_name\n      category_url_key\n      __typename\n    }\n    products(pageSize: $pageSize, currentPage: $currentPage) {\n      total_count\n      items {\n        id\n        name\n        # small_image\n        # short_description\n        url_key\n        special_price\n        special_from_date\n        special_to_date\n        price {\n          regularPrice {\n            amount {\n              value\n              currency\n              __typename\n            }\n            __typename\n          }\n          __typename\n        }\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n}\n","variables":{"id":${category_id},"currentPage":1,"pageSize":12},"operationName":"category"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_list_of_products_by_category_id.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1201352014">"name":"${category_name}","id":${category_id},</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Simple Product Details by product_url_key" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetSimpleProductDetailsByProductUrlKeyPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Simple Product Details by product_url_key");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Simple Product Details by product_url_key" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"query productDetail($urlKey: String, $onServer: Boolean!) {\n    productDetail: products(filter: { url_key: { eq: $urlKey } }) {\n        items {\n            sku\n            name\n            price {\n                regularPrice {\n                    amount {\n                        currency\n                        value\n                    }\n                }\n            }\n            description {html}\n            media_gallery_entries {\n                label\n                position\n                disabled\n                file\n            }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            # Yes, Products have `meta_keyword` and\n            # everything else has `meta_keywords`.\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"urlKey":"${product_url_key}","onServer":false},"operationName":"productDetail"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_simple_product_details_by_product_url_key.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Simple Product Details by name" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetSimpleProductDetailsByNamePercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Simple Product Details by name");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Simple Product Details by name" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"query productDetail($name: String, $onServer: Boolean!) {\n    productDetail: products(filter: { name: { eq: $name } }) {\n        items {\n            sku\n            name\n            price {\n                regularPrice {\n                    amount {\n                        currency\n                        value\n                    }\n                }\n            }\n            description {html}\n            media_gallery_entries {\n                label\n                position\n                disabled\n                file\n            }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            # Yes, Products have `meta_keyword` and\n            # everything else has `meta_keywords`.\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetail"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_simple_product_details_by_name.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Configurable Product Detail by product_url_key" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
     <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Configurable Product Detail by product_url_key");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
     <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
       <collectionProp name="HeaderManager.headers">
         <elementProp name="" elementType="Header">
@@ -38438,24 +39655,62 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
     <hashTree/>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Admin Token Retrieval" enabled="true">
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by product_url_key" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"username":"${admin_user}","password":"${admin_password}"}</stringProp>
+            <stringProp name="Argument.value">{"query":"query productDetail($urlKey: String, $onServer: Boolean!) {\n    productDetail: products(filter: { url_key: { eq: $urlKey } }) {\n        items {\n            sku\n            name\n            price {\n                regularPrice {\n                    amount {\n                        currency\n                        value\n                    }\n                }\n            }\n            description {html}\n            media_gallery_entries {\n                label\n                position\n                disabled\n                file\n            }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            # Yes, Products have `meta_keyword` and\n            # everything else has `meta_keywords`.\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"urlKey":"${product_url_key}","onServer":false},"operationName":"productDetail"}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
       <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
       <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}rest/V1/integration/admin/token</stringProp>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
       <stringProp name="HTTPSampler.method">POST</stringProp>
       <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
       <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -38463,111 +39718,120 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/admin_token_retrieval.jmx</stringProp></HTTPSamplerProxy>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_product_url_key.jmx</stringProp>
+    </HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="jp@gc - JSON Path Extractor" enabled="true">
-        <stringProp name="VAR">admin_token</stringProp>
-        <stringProp name="JSONPATH">$</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert token not null" enabled="true">
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="484395188">^[a-z0-9-]+$</stringProp>
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">1</intProp>
-        <stringProp name="Assertion.scope">variable</stringProp>
-        <stringProp name="Scope.variable">admin_token</stringProp>
+        <intProp name="Assertion.test_type">2</intProp>
       </ResponseAssertion>
       <hashTree/>
     </hashTree>
+  </hashTree>
+
   
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Configurable Product Detail by name" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetConfigurableProductDetailsByNamePercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Configurable Product Detail by name");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
     <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
       <collectionProp name="HeaderManager.headers">
         <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Authorization</stringProp>
-          <stringProp name="Header.value">Bearer ${admin_token}</stringProp>
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
         </elementProp>
       </collectionProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager.jmx</stringProp></HeaderManager>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
     <hashTree/>
   
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query multiple products" enabled="true">
-            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-                <collectionProp name="Arguments.arguments">
-                    <elementProp name="" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">{"query":"{\n  products(\n    filter: {\n         price: {gt: \"10\"}\n         or: {\n            sku:{like:\"%Product%\"}\n            name:{like:\"%Configurable Product%\"}\n          }\n        }\n    pageSize: 200\n    currentPage: 1\n    sort: {\n      price: ASC\n      name:DESC\n    }\n  ) {\n    total_count\n    items {\n        attribute_set_id\n        country_of_manufacture\n        created_at\n        description {\n            html\n        }\n        gift_message_available\n        image\n        {\n            url\n            label\n        }\n        meta_description\n        meta_keyword\n        meta_title\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        short_description {\n            html\n        }\n        sku\n        small_image {\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        type_id\n        updated_at\n        url_key\n        url_path\n        websites { id name code sort_order default_group_id is_default }\n      \t... on PhysicalProductInterface {\n        \tweight\n      \t}\n    }\n    page_info {\n      page_size\n      current_page\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                    </elementProp>
-                </collectionProp>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain"/>
-            <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
-            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-            <stringProp name="HTTPSampler.contentEncoding"/>
-            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-            <stringProp name="HTTPSampler.method">POST</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <boolProp name="HTTPSampler.monitor">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"/>
-            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_filter_only.jmx</stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-                <stringProp name="VAR">graphql_multiple_products_query_total_count</stringProp>
-                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-                <stringProp name="DEFAULT"/>
-                <stringProp name="VARIABLE"/>
-                <stringProp name="SUBJECT">BODY</stringProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-            <hashTree/>
-            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 200" enabled="true">
-                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_multiple_products_query_total_count");
-                    if (totalCount == null) {
-                    Failure = true;
-                    FailureMessage = "Not Expected \"totalCount\" to be null";
-                    } else {
-                    if (Integer.parseInt(totalCount) &lt; 200) {
-                    Failure = true;
-                    FailureMessage = "Expected \"totalCount\" to be greater than 200, Actual: " + totalCount;
-                    } else {
-                    Failure = false;
-                    }
-                    }
-                </stringProp>
-                <stringProp name="BeanShellAssertion.filename"/>
-                <stringProp name="BeanShellAssertion.parameters"/>
-                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-            </BeanShellAssertion>
-            <hashTree/>
-        </hashTree>
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
     
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query simple product" enabled="true">
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${simple_product_sku}\" } })\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        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
@@ -38578,72 +39842,120 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_simple_product_with_extensible_data_objects.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_simple_products_query_total_count</stringProp>
-        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
       <hashTree/>
+    </hashTree>
+  </hashTree>
 
-        <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract response" enabled="true">
-            <stringProp name="VAR">graphql_multiple_products_query_response</stringProp>
-            <stringProp name="JSONPATH">$</stringProp>
-            <stringProp name="DEFAULT"/>
-            <stringProp name="VARIABLE"/>
-            <stringProp name="SUBJECT">BODY</stringProp>
-        </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Product Search by product_name" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetProductSearchByProductNamePercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
         <hashTree/>
-        <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_simple_products_query_total_count");
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Product Search by product_name");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
 
-if (totalCount == null) {
-        Failure = true;
-        FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
-	if (Integer.parseInt(totalCount) != 1) {
-   Failure = true;
-   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-	} else {
-		Failure = false;
-	}
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
 }
-</stringProp>
-        <stringProp name="BeanShellAssertion.filename"/>
-        <stringProp name="BeanShellAssertion.parameters"/>
-        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-      </BeanShellAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
-        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">${simple_product_sku}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-        <boolProp name="ISREGEX">true</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
       <hashTree/>
-    </hashTree>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query configurable product" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Search by product_name" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: {eq:\"${configurable_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\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 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}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
@@ -38654,65 +39966,118 @@ if (totalCount == null) {
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_configurable_product_with_extensible_data_objects.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_product_search_by_product_name.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_configurable_products_query_total_count</stringProp>
-        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
       <hashTree/>
-      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_configurable_products_query_total_count");
+    </hashTree>
+  </hashTree>
 
-if (totalCount == null) {
-        Failure = true;
-        FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
-	if (Integer.parseInt(totalCount) != 1) {
-   Failure = true;
-   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-	} else {
-		Failure = false;
-	}
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Product Search by text and category_id" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetProductSearchByTextAndCategoryIdPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
 }
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Product Search by text and category_id");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
 
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
 
-</stringProp>
-        <stringProp name="BeanShellAssertion.filename"/>
-        <stringProp name="BeanShellAssertion.parameters"/>
-        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-      </BeanShellAssertion>
-      <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert configurable product sku" enabled="true">
-        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">${configurable_product_sku}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-        <boolProp name="ISREGEX">true</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
       <hashTree/>
-    </hashTree>
+    
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search and filter" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Search by text and category_id" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(\n        search: \"configurable\"\n        filter: {price: {gteq: \"1\"} }\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        \t\t\tweight\n      \t\t\t}\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}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"query productSearch($inputText: String!, $categoryId: String) {\n    products(search: $inputText, filter: { category_id: { eq: $categoryId } }) {\n        items {\n            id\n            name\n            small_image {\n              label\n              url\n            }\n            url_key\n            price {\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                }\n            }\n        }\n        total_count\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n            }\n        }\n    }\n}","variables":{"inputText":"Product","categoryId":"${category_id}"},"operationName":"productSearch"}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
@@ -38723,11 +40088,11 @@ if (totalCount == null) {
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filter.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_product_search_by_text_and_category_id.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
       <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_search_products_query_total_count_fulltext_filter</stringProp>
+        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
         <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
         <stringProp name="DEFAULT"/>
         <stringProp name="VARIABLE"/>
@@ -38735,7 +40100,7 @@ if (totalCount == null) {
       </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
       <hashTree/>
       <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count_fulltext_filter");
+        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
 
 if (totalCount == null) {
         Failure = true;
@@ -38757,22 +40122,107 @@ if (totalCount == null) {
       </BeanShellAssertion>
       <hashTree/>
     </hashTree>
+  </hashTree>
+
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search only" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Category List by category_id" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetCategoryListByCategoryIdPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Category List by category_id");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Category List by category_id" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(search: \"configurable\") {\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        \t\t\tweight\n      \t\t\t}\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                            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}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">
+            {"query":"query categoryList($id: Int!) {\n    category(id: $id) {\n        id\n        children {\n            id\n            name\n            url_key\n            url_path\n            children_count\n            path\n            image\n            productImagePreview: products(pageSize: 1) {\n                items {\n                    small_image {\n                      label\n                      url\n                    }\n                }\n            }\n        }\n    }\n}","variables":{"id":${category_id}},"operationName":"categoryList"}
+            </stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
@@ -38783,56 +40233,144 @@ if (totalCount == null) {
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_only.jmx</stringProp>
-    </HTTPSamplerProxy>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_category_list_by_category_id.jmx</stringProp></HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
-        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
+      <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="Assert found categories" enabled="true">
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="cacheKey"/>
+        <stringProp name="script">var category = vars.getObject("category");
+var response = JSON.parse(prev.getResponseDataAsString());
 
-if (totalCount == null) {
-        Failure = true;
-        FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
-	if (Integer.parseInt(totalCount) &lt; 1) {
-   Failure = true;
-   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
-	} else {
-		Failure = false;
-	}
+assertCategoryId(category, response);
+assertCategoryChildren(category, response);
+
+function assertCategoryId(category, response) {
+    if (response.data == undefined || response.data.category == undefined || response.data.category.id != category.id) {
+      AssertionResult.setFailureMessage("Cannot find category with id \"" + category.id + "\"");
+      AssertionResult.setFailure(true);
+     }
 }
 
+function assertCategoryChildren(category, response) {
+    foundCategory = response.data &amp;&amp; response.data.category ? response.data.category : null;
+    if (foundCategory) {
+        var childrenFound = foundCategory.children.map(function (c) {return parseInt(c.id)});
+        var children = category.children.map(function (c) {return parseInt(c)});
+        if (JSON.stringify(children.sort()) != JSON.stringify(childrenFound.sort())) {
+           AssertionResult.setFailureMessage("Cannot math children categories \"" + JSON.stringify(children) + "\" for to found one: \"" + JSON.stringify(childrenFound) +  "\"");
+           AssertionResult.setFailure(true);
+        }
+    }
+ 
+}
 
 </stringProp>
-        <stringProp name="BeanShellAssertion.filename"/>
-        <stringProp name="BeanShellAssertion.parameters"/>
-        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-      </BeanShellAssertion>
+      </JSR223Assertion>
       <hashTree/>
     </hashTree>
+  </hashTree>
+
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search and filters" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Url Info by url_key" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlUrlInfoByUrlKeyPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Url Info by url_key");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Url Info by url_key" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <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.value">&#xD;
+            {"query":"query resolveUrl($urlKey: String!) {\n    urlResolver(url: $urlKey) {\n        type\n        id\n    }\n}","variables":{"urlKey":"${category_url_key}${url_suffix}"},"operationName":"resolveUrl"}&#xD;
+            </stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
@@ -38843,212 +40381,116 @@ if (totalCount == null) {
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_multiple_products_with_extensible_data_objects_using_full_text_and_filters.jmx</stringProp>
-    </HTTPSamplerProxy>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_url_info_by_url_key.jmx</stringProp></HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_search_products_query_total_count</stringProp>
-        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count &gt; 0" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_search_products_query_total_count");
-
-if (totalCount == null) {
-        Failure = true;
-        FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
-	if (Integer.parseInt(totalCount) &lt; 1) {
-   Failure = true;
-   FailureMessage = "Expected \"totalCount\" to be greater than zero, Actual: " + totalCount;
-	} else {
-		Failure = false;
-	}
-}
-
-
-</stringProp>
-        <stringProp name="BeanShellAssertion.filename"/>
-        <stringProp name="BeanShellAssertion.parameters"/>
-        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-      </BeanShellAssertion>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1062388959">{"type":"CATEGORY","id":${category_id}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
       <hashTree/>
     </hashTree>
-  
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query bundle product" enabled="true">
-            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-                <collectionProp name="Arguments.arguments">
-                    <elementProp name="" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${bundle_product_sku}\"} }) {\n        total_count\n        items {\n            ... on PhysicalProductInterface {\n                weight\n            }\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                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 BundleProduct {\n                weight\n                price_view\n                dynamic_price\n                dynamic_sku\n                ship_bundle_items\n                dynamic_weight\n                items {\n                  option_id\n                  title\n                  required\n                  type\n                  position\n                  sku\n                  options {\n                        id\n                        qty\n                        position\n                        is_default\n                        price\n                        price_type\n                        can_change_quantity\n                    product {\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                            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            }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                    </elementProp>
-                </collectionProp>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain"/>
-            <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
-            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-            <stringProp name="HTTPSampler.contentEncoding"/>
-            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-            <stringProp name="HTTPSampler.method">POST</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <boolProp name="HTTPSampler.monitor">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"/>
-            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_bundle_product_with_extensible_data_objects.jmx</stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-                <stringProp name="VAR">graphql_bundle_products_query_total_count</stringProp>
-                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-                <stringProp name="DEFAULT"/>
-                <stringProp name="VARIABLE"/>
-                <stringProp name="SUBJECT">BODY</stringProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-            <hashTree/>
-            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_bundle_products_query_total_count");
-
-                    if (totalCount == null) {
-                    Failure = true;
-                    FailureMessage = "Not Expected \"totalCount\" to be null";
-                    } else {
-                    if (Integer.parseInt(totalCount) != 1) {
-                    Failure = true;
-                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-                    } else {
-                    Failure = false;
-                    }
-                    }
-
+  </hashTree>
 
-                </stringProp>
-                <stringProp name="BeanShellAssertion.filename"/>
-                <stringProp name="BeanShellAssertion.parameters"/>
-                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-            </BeanShellAssertion>
-            <hashTree/>
-            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert bundle product sku" enabled="true">
-                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-                <stringProp name="EXPECTED_VALUE">${bundle_product_sku}</stringProp>
-                <boolProp name="JSONVALIDATION">true</boolProp>
-                <boolProp name="EXPECT_NULL">false</boolProp>
-                <boolProp name="INVERT">false</boolProp>
-                <boolProp name="ISREGEX">false</boolProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-            <hashTree/>
-        </hashTree>
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Cms Block by identifier" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetCmsBlockByIdentifierPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Cms Block by identifier");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
     
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query downloadable product" enabled="true">
-            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-                <collectionProp name="Arguments.arguments">
-                    <elementProp name="" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${downloadable_product_sku}\" } })\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        \t\t\tweight\n      \t\t  }\n              ... on DownloadableProduct {\n                links_purchased_separately\n                links_title\n                downloadable_product_samples {\n                  id\n                  title\n                  sort_order\n                  sample_type\n                  sample_file\n                  sample_url\n                }\n                downloadable_product_links {\n                        id\n                        title\n                        sort_order\n                        is_shareable\n                        price\n                        number_of_downloads\n                        link_type\n                        sample_type\n                        sample_file\n                            sample_url\n                }\n              }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                    </elementProp>
-                </collectionProp>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain"/>
-            <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
-            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-            <stringProp name="HTTPSampler.contentEncoding"/>
-            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-            <stringProp name="HTTPSampler.method">POST</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <boolProp name="HTTPSampler.monitor">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"/>
-            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_downloadable_product_with_extensible_data_objects.jmx</stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-                <stringProp name="VAR">graphql_downloadable_products_query_total_count</stringProp>
-                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-                <stringProp name="DEFAULT"/>
-                <stringProp name="VARIABLE"/>
-                <stringProp name="SUBJECT">BODY</stringProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-            <hashTree/>
-            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_downloadable_products_query_total_count");
-
-                    if (totalCount == null) {
-                    Failure = true;
-                    FailureMessage = "Not Expected \"totalCount\" to be null";
-                    } else {
-                    if (Integer.parseInt(totalCount) != 1) {
-                    Failure = true;
-                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-                    } else {
-                    Failure = false;
-                    }
-                    }
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
 
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
 
-                </stringProp>
-                <stringProp name="BeanShellAssertion.filename"/>
-                <stringProp name="BeanShellAssertion.parameters"/>
-                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-            </BeanShellAssertion>
-            <hashTree/>
-            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert downloadable product sku" enabled="true">
-                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-                <stringProp name="EXPECTED_VALUE">${downloadable_product_sku}</stringProp>
-                <boolProp name="JSONVALIDATION">true</boolProp>
-                <boolProp name="EXPECT_NULL">false</boolProp>
-                <boolProp name="INVERT">false</boolProp>
-                <boolProp name="ISREGEX">true</boolProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-            <hashTree/>
-            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert link samples titles" enabled="true">
-                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
-                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
-                <boolProp name="JSONVALIDATION">true</boolProp>
-                <boolProp name="EXPECT_NULL">false</boolProp>
-                <boolProp name="INVERT">false</boolProp>
-                <boolProp name="ISREGEX">false</boolProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-            <hashTree/>
-            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert sample titles" enabled="true">
-                <stringProp name="JSON_PATH">$.data.products.items[0].downloadable_product_samples..title</stringProp>
-                <stringProp name="EXPECTED_VALUE">["sample1","sample2"]</stringProp>
-                <boolProp name="JSONVALIDATION">true</boolProp>
-                <boolProp name="EXPECT_NULL">false</boolProp>
-                <boolProp name="INVERT">false</boolProp>
-                <boolProp name="ISREGEX">false</boolProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-            <hashTree/>
-        </hashTree>
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
     
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query virtual product" enabled="true">
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare CMS Block" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
+
+var cmsBlocks = props.get("cms_blocks");
+var number = random.nextInt(cmsBlocks.length);
+
+vars.put("cms_block_identifier", cmsBlocks[number].identifier);
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/prepare_cms_block.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cms Block by identifier" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(filter: {sku: { eq: \"${virtual_product_sku}\" } })\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        \t\t\tweight\n      \t\t  }\n        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">
+            {"query":"query cmsBlocks($identifiers: [String]!) {\n    cmsBlocks(identifiers: $identifiers) {\n        items {\n            content\n            identifier\n        }\n    }\n}","variables":{"identifiers":"${cms_block_identifier}"},"operationName":"cmsBlocks"}
+            </stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
@@ -39059,321 +40501,237 @@ if (totalCount == null) {
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_virtual_product_with_extensible_data_objects.jmx</stringProp>
-    </HTTPSamplerProxy>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_get_cms_block_by_identifier.jmx</stringProp></HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_virtual_products_query_total_count</stringProp>
-        <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
+        <stringProp name="JSON_PATH">$.data.cmsBlocks.items[0].identifier</stringProp>
+        <stringProp name="EXPECTED_VALUE">${cms_block_identifier}</stringProp>
+        <boolProp name="JSONVALIDATION">true</boolProp>
+        <boolProp name="EXPECT_NULL">false</boolProp>
+        <boolProp name="INVERT">false</boolProp>
+        <boolProp name="ISREGEX">false</boolProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
       <hashTree/>
-      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_virtual_products_query_total_count");
+    </hashTree>
+  </hashTree>
 
-if (totalCount == null) {
-        Failure = true;
-        FailureMessage = "Not Expected \"totalCount\" to be null";
-} else {
-	if (Integer.parseInt(totalCount) != 1) {
-   Failure = true;
-   FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-	} else {
-		Failure = false;
-	}
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Cms Page by id" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetCmsPageByIdPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
 }
-</stringProp>
-        <stringProp name="BeanShellAssertion.filename"/>
-        <stringProp name="BeanShellAssertion.parameters"/>
-        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-      </BeanShellAssertion>
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Cms Page by id");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
       <hashTree/>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert product sku" enabled="true">
-        <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-        <stringProp name="EXPECTED_VALUE">${virtual_product_sku}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
+    
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare CMS Page" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
+
+var cmsPages = props.get("cms_pages");
+var number = random.nextInt(cmsPages.length);
+
+vars.put("cms_page_id", cmsPages[number].id);
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/prepare_cms_page.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cms Page by id" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">
+           {"query":"query getCmsPage($id: Int!, $onServer: Boolean!) {\n  cmsPage(id: $id) {\n    url_key\n    content\n    content_heading\n    title\n    page_layout\n    meta_title @include(if: $onServer)\n    meta_keywords @include(if: $onServer)\n    meta_description @include(if: $onServer)\n  }\n}","variables":{"id":${cms_page_id},"onServer":false},"operationName":"getCmsPage"}
+            </stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_get_cms_page_by_id.jmx</stringProp></HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
+        <stringProp name="JSON_PATH">$.data.cmsPage.url_key</stringProp>
+        <stringProp name="EXPECTED_VALUE">${cms_page_id}</stringProp>
+        <boolProp name="JSONVALIDATION">false</boolProp>
         <boolProp name="EXPECT_NULL">false</boolProp>
         <boolProp name="INVERT">false</boolProp>
-        <boolProp name="ISREGEX">true</boolProp>
+        <boolProp name="ISREGEX">false</boolProp>
       </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
       <hashTree/>
     </hashTree>
-  
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query grouped product" enabled="true">
-            <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-                <collectionProp name="Arguments.arguments">
-                    <elementProp name="" elementType="HTTPArgument">
-                        <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                        <stringProp name="Argument.value">{"query":"{\nproducts(filter: {sku: {eq:\"${grouped_product_sku}\"} }) {\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 GroupedProduct {\n                weight\n                items {\n                  qty\n                  position\n                  product {\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        }\n    }\n}\n","variables":null,"operationName":null}</stringProp>
-                        <stringProp name="Argument.metadata">=</stringProp>
-                    </elementProp>
-                </collectionProp>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain"/>
-            <stringProp name="HTTPSampler.port"/>
-            <stringProp name="HTTPSampler.connect_timeout"/>
-            <stringProp name="HTTPSampler.response_timeout"/>
-            <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-            <stringProp name="HTTPSampler.contentEncoding"/>
-            <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-            <stringProp name="HTTPSampler.method">POST</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <boolProp name="HTTPSampler.monitor">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"/>
-            <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_grouped_product_with_extensible_data_objects.jmx</stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-                <stringProp name="VAR">graphql_grouped_products_query_total_count</stringProp>
-                <stringProp name="JSONPATH">$.data.products.total_count</stringProp>
-                <stringProp name="DEFAULT"/>
-                <stringProp name="VARIABLE"/>
-                <stringProp name="SUBJECT">BODY</stringProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-            <hashTree/>
-            <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="Assert total count = 1" enabled="true">
-                <stringProp name="BeanShellAssertion.query">String totalCount=vars.get("graphql_grouped_products_query_total_count");
+  </hashTree>
 
-                    if (totalCount == null) {
-                    Failure = true;
-                    FailureMessage = "Not Expected \"totalCount\" to be null";
-                    } else {
-                    if (Integer.parseInt(totalCount) != 1) {
-                    Failure = true;
-                    FailureMessage = "Expected \"totalCount\" to be equal to 1, Actual: " + totalCount;
-                    } else {
-                    Failure = false;
-                    }
-                    }
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Navigation Menu by category_id" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetNavigationMenuByCategoryIdPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Navigation Menu by category_id");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
 
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
 
-                </stringProp>
-                <stringProp name="BeanShellAssertion.filename"/>
-                <stringProp name="BeanShellAssertion.parameters"/>
-                <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-            </BeanShellAssertion>
-            <hashTree/>
-            <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert grouped product sku" enabled="true">
-                <stringProp name="JSON_PATH">$.data.products.items[0].sku</stringProp>
-                <stringProp name="EXPECTED_VALUE">${grouped_product_sku}</stringProp>
-                <boolProp name="JSONVALIDATION">true</boolProp>
-                <boolProp name="EXPECT_NULL">false</boolProp>
-                <boolProp name="INVERT">false</boolProp>
-                <boolProp name="ISREGEX">true</boolProp>
-            </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-            <hashTree/>
-        </hashTree>
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
     
-        <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="Query Customer" enabled="true"/>
-        <hashTree>
-            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer" enabled="true">
-                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-                    <collectionProp name="Arguments.arguments">
-                        <elementProp name="" elementType="HTTPArgument">
-                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                            <stringProp name="Argument.value">{&#xD;
-                                "customer": {&#xD;
-                                &#xD;
-                                "email": "customer_${__time()}-${__threadNum}-${__Random(1,1000000)}@example.com",&#xD;
-                                "firstname": "test_${__time()}-${__threadNum}-${__Random(1,1000000)}",&#xD;
-                                "lastname": "Doe"&#xD;
-                                },&#xD;
-                                "password": "test@123"&#xD;
-                                }</stringProp>
-                            <stringProp name="Argument.metadata">=</stringProp>
-                        </elementProp>
-                    </collectionProp>
-                </elementProp>
-                <stringProp name="HTTPSampler.domain"/>
-                <stringProp name="HTTPSampler.port"/>
-                <stringProp name="HTTPSampler.connect_timeout"/>
-                <stringProp name="HTTPSampler.response_timeout"/>
-                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-                <stringProp name="HTTPSampler.contentEncoding"/>
-                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers</stringProp>
-                <stringProp name="HTTPSampler.method">POST</stringProp>
-                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-                <boolProp name="HTTPSampler.monitor">false</boolProp>
-                <stringProp name="HTTPSampler.embedded_url_re"/>
-                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx</stringProp>
-            </HTTPSamplerProxy>
-            <hashTree>
-                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer id" enabled="true">
-                    <stringProp name="VAR">customer_id</stringProp>
-                    <stringProp name="JSONPATH">$.id</stringProp>
-                    <stringProp name="DEFAULT"/>
-                    <stringProp name="VARIABLE"/>
-                    <stringProp name="SUBJECT">BODY</stringProp>
-                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-                <hashTree/>
-                <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert customer id not null" enabled="true">
-                    <collectionProp name="Asserion.test_strings">
-                        <stringProp name="89649215">^\d+$</stringProp>
-                    </collectionProp>
-                    <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-                    <boolProp name="Assertion.assume_success">false</boolProp>
-                    <intProp name="Assertion.test_type">1</intProp>
-                    <stringProp name="Assertion.scope">variable</stringProp>
-                    <stringProp name="Scope.variable">customer_id</stringProp>
-                </ResponseAssertion>
-                <hashTree/>
-            </hashTree>
-            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Check customer" enabled="true">
-                <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-                    <collectionProp name="Arguments.arguments"/>
-                </elementProp>
-                <stringProp name="HTTPSampler.domain"/>
-                <stringProp name="HTTPSampler.port"/>
-                <stringProp name="HTTPSampler.connect_timeout"/>
-                <stringProp name="HTTPSampler.response_timeout"/>
-                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-                <stringProp name="HTTPSampler.contentEncoding"/>
-                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/customers/${customer_id}</stringProp>
-                <stringProp name="HTTPSampler.method">GET</stringProp>
-                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-                <boolProp name="HTTPSampler.monitor">false</boolProp>
-                <stringProp name="HTTPSampler.embedded_url_re"/>
-                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/check_customer.jmx</stringProp>
-            </HTTPSamplerProxy>
-            <hashTree>
-                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-                    <stringProp name="JSON_PATH">$.id</stringProp>
-                    <stringProp name="EXPECTED_VALUE">${customer_id}</stringProp>
-                    <boolProp name="JSONVALIDATION">true</boolProp>
-                    <boolProp name="EXPECT_NULL">false</boolProp>
-                    <boolProp name="INVERT">false</boolProp>
-                    <boolProp name="ISREGEX">true</boolProp>
-                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-                <hashTree/>
-                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer email" enabled="true">
-                    <stringProp name="VAR">customer_email</stringProp>
-                    <stringProp name="JSONPATH">$.email</stringProp>
-                    <stringProp name="DEFAULT"/>
-                    <stringProp name="VARIABLE"/>
-                    <stringProp name="SUBJECT">BODY</stringProp>
-                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-                <hashTree/>
-            </hashTree>
-            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create customer token" enabled="true">
-                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-                    <collectionProp name="Arguments.arguments">
-                        <elementProp name="" elementType="HTTPArgument">
-                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                            <stringProp name="Argument.value">{&#xD;
-                                "username":"${customer_email}",&#xD;
-                                "password":"test@123"&#xD;
-                                }&#xD;
-                            </stringProp>
-                            <stringProp name="Argument.metadata">=</stringProp>
-                        </elementProp>
-                    </collectionProp>
-                </elementProp>
-                <stringProp name="HTTPSampler.domain"/>
-                <stringProp name="HTTPSampler.port"/>
-                <stringProp name="HTTPSampler.connect_timeout"/>
-                <stringProp name="HTTPSampler.response_timeout"/>
-                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-                <stringProp name="HTTPSampler.contentEncoding"/>
-                <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/integration/customer/token</stringProp>
-                <stringProp name="HTTPSampler.method">POST</stringProp>
-                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-                <boolProp name="HTTPSampler.monitor">false</boolProp>
-                <stringProp name="HTTPSampler.embedded_url_re"/>
-                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/create_customer.jmx</stringProp>
-            </HTTPSamplerProxy>
-            <hashTree>
-                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract customer token" enabled="true">
-                    <stringProp name="VAR">customer_token</stringProp>
-                    <stringProp name="JSONPATH">$</stringProp>
-                    <stringProp name="DEFAULT"/>
-                    <stringProp name="VARIABLE"/>
-                    <stringProp name="SUBJECT">BODY</stringProp>
-                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-                <hashTree/>
-            </hashTree>
-            <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query customer with token" enabled="true">
-                <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-                <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-                    <collectionProp name="Arguments.arguments">
-                        <elementProp name="" elementType="HTTPArgument">
-                            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                            <stringProp name="Argument.value">{"query":"{\n  customer {\n    created_at\n    group_id\n\n    prefix\n    firstname\n    middlename\n    lastname\n    suffix\n    email\n    default_billing\n    default_shipping\n\n    dob\n    taxvat\n\n    id\n    addresses {\n        id\n        customer_id\n        region {\n            region_code\n          region\n          region_id\n        }\n        region_id\n        country_id\n        street \n        company\n        telephone\n        fax\n        postcode\n        city\n        firstname\n        lastname\n        middlename\n        prefix\n        suffix\n        vat_id\n        default_shipping\n        default_billing\n    }\n    is_subscribed\n  }\n}","variables":null,"operationName":null}</stringProp>
-                            <stringProp name="Argument.metadata">=</stringProp>
-                        </elementProp>
-                    </collectionProp>
-                </elementProp>
-                <stringProp name="HTTPSampler.domain"/>
-                <stringProp name="HTTPSampler.port"/>
-                <stringProp name="HTTPSampler.connect_timeout"/>
-                <stringProp name="HTTPSampler.response_timeout"/>
-                <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-                <stringProp name="HTTPSampler.contentEncoding"/>
-                <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-                <stringProp name="HTTPSampler.method">POST</stringProp>
-                <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-                <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-                <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-                <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-                <boolProp name="HTTPSampler.monitor">false</boolProp>
-                <stringProp name="HTTPSampler.embedded_url_re"/>
-                <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_frontend_customer.jmx</stringProp>
-            </HTTPSamplerProxy>
-            <hashTree>
-                <BeanShellPreProcessor guiclass="TestBeanGUI" testclass="BeanShellPreProcessor" testname="Set Customer Token" enabled="true">
-                    <boolProp name="resetInterpreter">false</boolProp>
-                    <stringProp name="parameters"/>
-                    <stringProp name="filename"/>
-                    <stringProp name="script">import org.apache.jmeter.protocol.http.control.Header;
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
 
-                        sampler.getHeaderManager().removeHeaderNamed("Authorization");
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
 
-                        sampler.getHeaderManager().add(new Header("Authorization","Bearer " + vars.get("customer_token")));</stringProp>
-                </BeanShellPreProcessor>
-                <hashTree/>
-                <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert customer lastname" enabled="true">
-                    <stringProp name="JSON_PATH">$.data.customer.lastname</stringProp>
-                    <stringProp name="EXPECTED_VALUE">Doe</stringProp>
-                    <boolProp name="JSONVALIDATION">true</boolProp>
-                    <boolProp name="EXPECT_NULL">false</boolProp>
-                    <boolProp name="INVERT">false</boolProp>
-                    <boolProp name="ISREGEX">true</boolProp>
-                </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-                <hashTree/>
-            </hashTree>
-        </hashTree>
-    
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query Category" enabled="true">
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Navigation Menu by category_id" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  category(id: 1) {\n      name\n      id\n      level\n      description\n      path\n      path_in_store\n      url_key\n      url_path\n      children {\n        id\n        description\n        default_sort_by\n        children {\n          id\n          description\n          level\n          children {\n            level\n            id\n            children {\n              id\n            }\n          }\n        }\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"query navigationMenu($id: Int!) {\n  category(id: $id) {\n    id\n    name\n    product_count\n    path\n    children {\n      id\n      name\n      position\n      level\n      url_key\n      url_path\n      product_count\n      children_count\n      path\n      productImagePreview: products(pageSize: 1) {\n        items {\n          small_image {\n            label\n             url\n          }\n        }\n      }\n    }\n  }\n}","variables":{"id":${category_id}},"operationName":"navigationMenu"}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
       </elementProp>
       <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port"/>
-      <stringProp name="HTTPSampler.connect_timeout"/>
-      <stringProp name="HTTPSampler.response_timeout"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
       <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
       <stringProp name="HTTPSampler.contentEncoding"/>
       <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
@@ -39384,39 +40742,20 @@ if (totalCount == null) {
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/query_root_category.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_navigation_menu_by_category_id.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract total_count" enabled="true">
-        <stringProp name="VAR">graphql_category_query_name</stringProp>
-        <stringProp name="JSONPATH">$.data.category.name</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <BeanShellAssertion guiclass="BeanShellAssertionGui" testclass="BeanShellAssertion" testname="BeanShell Assertion" enabled="true">
-        <stringProp name="BeanShellAssertion.query">String name = vars.get("graphql_category_query_name");
-if (name == null) {
-	Failure = true;
-	FailureMessage = "Not Expected \"children\" to be null";
-} else {
-	if (!name.equals("Root Catalog")) {
-		Failure = true;
-		FailureMessage = "Expected \"name\" to equal \"Root Catalog\", Actual: " + name;
-	} else {
-		Failure = false;
-	}
-}
-</stringProp>
-        <stringProp name="BeanShellAssertion.filename"/>
-        <stringProp name="BeanShellAssertion.parameters"/>
-        <boolProp name="BeanShellAssertion.resetInterpreter">false</boolProp>
-      </BeanShellAssertion>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1201352014">"id":${category_id},"name":"${category_name}","product_count"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
       <hashTree/>
     </hashTree>
   </hashTree>
-  </hashTree>
 
   </hashTree>
 
@@ -39552,6 +40891,14 @@ if (name == null) {
       <stringProp name="filename">${response_time_file_name}</stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/aggregate_graph.jmx</stringProp></ResultCollector>
     <hashTree/>
+  
+    <DebugPostProcessor guiclass="TestBeanGUI" testclass="DebugPostProcessor" testname="Debug PostProcessor" enabled="false">
+      <boolProp name="displayJMeterProperties">false</boolProp>
+      <boolProp name="displayJMeterVariables">true</boolProp>
+      <boolProp name="displaySamplerProperties">true</boolProp>
+      <boolProp name="displaySystemProperties">false</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/debug.jmx</stringProp></DebugPostProcessor>
+    <hashTree/>
   </hashTree>
     <WorkBench guiclass="WorkBenchGui" testclass="WorkBench" testname="WorkBench" enabled="true">
       <boolProp name="WorkBench.save">true</boolProp>

From 120a8c06ab4b5d12a0e56ce93590870e1b752fe1 Mon Sep 17 00:00:00 2001
From: Akhilesh Singh Shrinet <alpha007_2008@yahoo.com>
Date: Wed, 27 Mar 2019 01:16:28 +0530
Subject: [PATCH 0807/1055] Fixed WhiteSpace issue in product grid

There are some whitespaces in between li tags, that's why product grid showing 3 products instead of 4. Mention in #20140 and #21244
---
 .../luma/Magento_Catalog/web/css/source/module/_listings.less | 4 ++--
 1 file changed, 2 insertions(+), 2 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 e5915969c91b9..77fb53a2ab02a 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
@@ -34,12 +34,12 @@
 
     .product {
         &-items {
-            font-size: 0;
+            .lib-inline-block-space-container();
             &:extend(.abs-reset-list all);
         }
 
         &-item {
-            font-size: 1.4rem;
+            .lib-inline-block-space-item();
             vertical-align: top;
 
             .products-grid & {

From f817528e8d8d560d73f97e2b1914725e8d916db1 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 26 Mar 2019 15:38:02 -0500
Subject: [PATCH 0808/1055] MC-15466: Migrate PWA GraphQL scenarios

---
 setup/performance-toolkit/benchmark.jmx | 192 +-----------------------
 1 file changed, 1 insertion(+), 191 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index cd014af101d7b..08ce61e9b1a8e 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -1330,7 +1330,7 @@ regionResponse.each { region -&gt;
   
       <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="SetUp - Get CMS pages" enabled="true"/>
       <hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get CMS blocks" enabled="true">
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get CMS pages" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
@@ -1389,73 +1389,6 @@ for (var i in data.items) {
  }
 
 props.put("cms_pages", cmsPages);
-</stringProp>
-          </JSR223PostProcessor>
-          <hashTree/>
-        </hashTree>
-    </hashTree>
-  
-      <OnceOnlyController guiclass="OnceOnlyControllerGui" testclass="OnceOnlyController" testname="SetUp - Get CMS blocks" enabled="true"/>
-      <hashTree>
-        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Get CMS blocks" enabled="true">
-          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-            <collectionProp name="Arguments.arguments">
-              <elementProp name="searchCriteria[current_page]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">1</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[current_page]</stringProp>
-              </elementProp>
-              <elementProp name="searchCriteria[page_size]" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">20</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">searchCriteria[page_size]</stringProp>
-              </elementProp>
-            </collectionProp>
-          </elementProp>
-          <stringProp name="HTTPSampler.domain"/>
-          <stringProp name="HTTPSampler.port"/>
-          <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-          <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-          <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-          <stringProp name="HTTPSampler.contentEncoding"/>
-          <stringProp name="HTTPSampler.path">${base_path}rest/default/V1/cmsBlock/search</stringProp>
-          <stringProp name="HTTPSampler.method">GET</stringProp>
-          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-          <boolProp name="HTTPSampler.monitor">false</boolProp>
-          <stringProp name="HTTPSampler.embedded_url_re"/>
-          <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/get_cms_blocks.jmx</stringProp>
-        </HTTPSamplerProxy>
-        <hashTree>
-          <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="Assert results are present" enabled="true">
-            <stringProp name="JSON_PATH">$.total_count</stringProp>
-            <stringProp name="EXPECTED_VALUE">0</stringProp>
-            <boolProp name="JSONVALIDATION">true</boolProp>
-            <boolProp name="EXPECT_NULL">false</boolProp>
-            <boolProp name="INVERT">true</boolProp>
-            <boolProp name="ISREGEX">false</boolProp>
-          </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-          <hashTree/>
-          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="PostProcessor" enabled="true">
-            <stringProp name="scriptLanguage">javascript</stringProp>
-            <stringProp name="parameters"/>
-            <stringProp name="filename"/>
-            <stringProp name="cacheKey"/>
-            <stringProp name="script">var data = JSON.parse(prev.getResponseDataAsString());
-
-var cmsBlocks = [];
-
-for (var i in data.items) {
-    cmsBlocks.push({"id": data.items[i].id, "identifier": data.items[i].identifier});
- }
-
-props.put("cms_blocks", cmsBlocks);
 </stringProp>
           </JSR223PostProcessor>
           <hashTree/>
@@ -2266,9 +2199,6 @@ if (props.get("category_names_list") == null) {
 if (props.get("cms_pages") == null) {
     return stopTestOnError("Cannot find cms pages. Test stopped.");
 }
-if (props.get("cms_blocks") == null) {
-    return stopTestOnError("Cannot find cms blocks. Test stopped.");
-}
 </stringProp>
       <stringProp name="BeanShellSampler.filename"/>
       <stringProp name="BeanShellSampler.parameters"/>
@@ -40396,126 +40326,6 @@ vars.putObject("category", categories[number]);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Cms Block by identifier" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${graphqlGetCmsBlockByIdentifierPercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Cms Block by identifier");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-      <collectionProp name="HeaderManager.headers">
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Content-Type</stringProp>
-          <stringProp name="Header.value">application/json</stringProp>
-        </elementProp>
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Accept</stringProp>
-          <stringProp name="Header.value">*/*</stringProp>
-        </elementProp>
-      </collectionProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-    <hashTree/>
-  
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-
-Random random = new Random();
-if (${seedForRandom} &gt; 0) {
-    random.setSeed(${seedForRandom} + ${__threadNum});
-}
-
-vars.putObject("randomIntGenerator", random);
-        </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-      </BeanShellSampler>
-      <hashTree/>
-    
-    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare CMS Block" enabled="true">
-      <stringProp name="scriptLanguage">javascript</stringProp>
-      <stringProp name="parameters"/>
-      <stringProp name="filename"/>
-      <stringProp name="cacheKey"/>
-      <stringProp name="script">random = vars.getObject("randomIntGenerator");
-
-var cmsBlocks = props.get("cms_blocks");
-var number = random.nextInt(cmsBlocks.length);
-
-vars.put("cms_block_identifier", cmsBlocks[number].identifier);
-        </stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/prepare_cms_block.jmx</stringProp></JSR223Sampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cms Block by identifier" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">
-            {"query":"query cmsBlocks($identifiers: [String]!) {\n    cmsBlocks(identifiers: $identifiers) {\n        items {\n            content\n            identifier\n        }\n    }\n}","variables":{"identifiers":"${cms_block_identifier}"},"operationName":"cmsBlocks"}
-            </stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_get_cms_block_by_identifier.jmx</stringProp></HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.gui.JSONPathAssertionGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion" testname="jp@gc - JSON Path Assertion" enabled="true">
-        <stringProp name="JSON_PATH">$.data.cmsBlocks.items[0].identifier</stringProp>
-        <stringProp name="EXPECTED_VALUE">${cms_block_identifier}</stringProp>
-        <boolProp name="JSONVALIDATION">true</boolProp>
-        <boolProp name="EXPECT_NULL">false</boolProp>
-        <boolProp name="INVERT">false</boolProp>
-        <boolProp name="ISREGEX">false</boolProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathassertion.JSONPathAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-
-  
     <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Cms Page by id" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>

From 4285ac5799fc8b7a3d9d15571839c5d92583c2f7 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 26 Mar 2019 22:43:29 -0500
Subject: [PATCH 0809/1055] GraphQL-538: Api-functional tests fixture
 refactoring

---
 .../GetAvailablePaymentMethodsTest.php        |  68 ++++---
 .../GraphQl/Quote/Customer/GetCartTest.php    |  80 +++-----
 .../Customer/SetBillingAddressOnCartTest.php  |  86 ++++----
 .../Customer/SetPaymentMethodOnCartTest.php   | 184 +++++++++--------
 .../Customer/SetShippingAddressOnCartTest.php |  64 ++++--
 .../Guest/GetAvailablePaymentMethodsTest.php  |  59 +++---
 .../GraphQl/Quote/Guest/GetCartTest.php       |  91 +++------
 .../Guest/SetBillingAddressOnCartTest.php     | 103 +++++-----
 .../Guest/SetPaymentMethodOnCartTest.php      | 186 ++++++++----------
 .../Guest/SetShippingAddressOnCartTest.php    | 100 ++++------
 .../SetOfflineShippingMethodsOnCartTest.php   |   6 +-
 .../Quote/_files/add_simple_product.php       |  28 +++
 .../Quote/_files/add_virtual_product.php      |  28 +++
 .../_files/customer/create_empty_cart.php     |  29 +++
 .../customer/create_empty_cart_rollback.php   |  28 +++
 .../disable_all_active_payment_methods.php    |   1 +
 ...le_all_active_payment_methods_rollback.php |   1 +
 .../_files/enable_offline_payment_methods.php |  24 +++
 ...nable_offline_payment_methods_rollback.php |  20 ++
 .../enable_offline_shipping_methods.php       |   1 +
 ...able_offline_shipping_methods_rollback.php |   1 +
 .../Quote/_files/guest/create_empty_cart.php  |  24 +++
 .../guest/create_empty_cart_rollback.php      |  28 +++
 .../Quote/_files/make_cart_inactive.php       |  23 +++
 .../_files/set_checkmo_payment_method.php     |  33 ++++
 .../Quote/_files/set_new_shipping_address.php |  43 ++++
 26 files changed, 792 insertions(+), 547 deletions(-)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/{OfflineShipping => Quote}/SetOfflineShippingMethodsOnCartTest.php (96%)
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_virtual_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_rollback.php
 rename dev/tests/integration/testsuite/Magento/{Payment => GraphQl/Quote}/_files/disable_all_active_payment_methods.php (93%)
 rename dev/tests/integration/testsuite/Magento/{Payment => GraphQl/Quote}/_files/disable_all_active_payment_methods_rollback.php (92%)
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php
 rename dev/tests/integration/testsuite/Magento/{OfflineShipping => GraphQl/Quote}/_files/enable_offline_shipping_methods.php (89%)
 rename dev/tests/integration/testsuite/Magento/{OfflineShipping => GraphQl/Quote}/_files/enable_offline_shipping_methods_rollback.php (86%)
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_cart_inactive.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index 74921348f449e..9c988f6bf5f71 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -38,48 +38,56 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testGetCartWithPaymentMethods()
+    public function testGetAvailablePaymentMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('available_payment_methods', $response['cart']);
+        self::assertCount(1, $response['cart']['available_payment_methods']);
+
         self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
         self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);
-        self::assertGreaterThan(
-            0,
-            count($response['cart']['available_payment_methods']),
-            'There are no available payment methods for customer cart!'
-        );
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testGetPaymentMethodsFromGuestCart()
+    public function testGetAvailablePaymentMethodsFromGuestCart()
     {
-        $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_virtual_product_without_address'
-        );
-        $query = $this->getQuery($guestQuoteMaskedId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
-            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testGetPaymentMethodsFromAnotherCustomerCart()
+    public function testGetAvailablePaymentMethodsFromAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -89,24 +97,31 @@ public function testGetPaymentMethodsFromAnotherCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
-     * @magentoApiDataFixture Magento/Payment/_files/disable_all_active_payment_methods.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
      */
-    public function testGetPaymentMethodsIfPaymentsAreNotSet()
+    public function testGetAvailablePaymentMethodsIfPaymentsAreNotPresent()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
-        self::assertEquals(0, count($response['cart']['available_payment_methods']));
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('available_payment_methods', $response['cart']);
+        self::assertEmpty($response['cart']['available_payment_methods']);
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
-    public function testGetPaymentMethodsOfNonExistentCart()
+    public function testGetAvailablePaymentMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
         $query = $this->getQuery($maskedQuoteId);
@@ -118,9 +133,8 @@ public function testGetPaymentMethodsOfNonExistentCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getQuery(
-        string $maskedQuoteId
-    ): string {
+    private function getQuery(string $maskedQuoteId): string
+    {
         return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index cc90f1aa1f219..d2615b4135b01 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -9,9 +9,6 @@
 
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -25,21 +22,6 @@ class GetCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
     /**
      * @var CustomerTokenServiceInterface
      */
@@ -49,19 +31,21 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
      */
     public function testGetCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
@@ -70,24 +54,23 @@ public function testGetCart()
         self::assertCount(2, $response['cart']['items']);
 
         self::assertNotEmpty($response['cart']['items'][0]['id']);
-        self::assertEquals($response['cart']['items'][0]['qty'], 2);
-        self::assertEquals($response['cart']['items'][0]['product']['sku'], 'simple');
+        self::assertEquals(2, $response['cart']['items'][0]['qty']);
+        self::assertEquals('simple', $response['cart']['items'][0]['product']['sku']);
 
         self::assertNotEmpty($response['cart']['items'][1]['id']);
-        self::assertEquals($response['cart']['items'][1]['qty'], 1);
-        self::assertEquals($response['cart']['items'][1]['product']['sku'], 'simple_one');
+        self::assertEquals(2, $response['cart']['items'][1]['qty']);
+        self::assertEquals('virtual-product', $response['cart']['items'][1]['product']['sku']);
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      */
     public function testGetGuestCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
@@ -96,13 +79,14 @@ public function testGetGuestCart()
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      */
     public function testGetAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
@@ -112,33 +96,30 @@ public function testGetAnotherCustomerCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
     public function testGetNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getCartQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Current user does not have an active cart.
      */
     public function testGetInactiveCart()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-        $quote->setCustomerId(1);
-        $quote->setIsActive(false);
-        $this->quoteResource->save($quote);
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
@@ -147,12 +128,11 @@ public function testGetInactiveCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getCartQuery(
-        string $maskedQuoteId
-    ) : string {
+    private function getQuery(string $maskedQuoteId): string
+    {
         return <<<QUERY
 {
-  cart(cart_id: "$maskedQuoteId") {
+  cart(cart_id: "{$maskedQuoteId}") {
     items {
       id
       qty
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index a601f65ef72b7..0099d25ed81f4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -56,12 +56,14 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetNewBillingAddress()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -113,12 +115,14 @@ public function testSetNewBillingAddress()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetNewBillingAddressWithUseForShippingParameter()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -188,13 +192,15 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetBillingAddressFromAddressBook()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -234,14 +240,17 @@ public function testSetBillingAddressFromAddressBook()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a address with ID "100"
      */
     public function testSetNotExistedBillingAddressFromAddressBook()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -265,13 +274,15 @@ public function testSetNotExistedBillingAddressFromAddressBook()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -311,15 +322,16 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetBillingAddressToGuestCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -347,6 +359,7 @@ public function testSetBillingAddressToGuestCart()
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
@@ -381,9 +394,11 @@ public function testSetBillingAddressToAnotherCustomerCart()
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
      */
@@ -433,8 +448,11 @@ public function testSetBillingAddressOnNonExistentCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @dataProvider dataProviderSetWithoutRequiredParameters
      * @param string $input
      * @param string $message
@@ -442,7 +460,7 @@ public function testSetBillingAddressOnNonExistentCart()
      */
     public function testSetBillingAddressWithoutRequiredParameters(string $input, string $message)
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $input = str_replace('cart_id_value', $maskedQuoteId, $input);
 
         $query = <<<QUERY
@@ -465,6 +483,24 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @return array
+     */
+    public function dataProviderSetWithoutRequiredParameters(): array
+    {
+        return [
+            'missed_billing_address' => [
+                'cart_id: "cart_id_value"',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
+                . ' was not provided.',
+            ],
+            'missed_cart_id' => [
+                'billing_address: {}',
+                'Required parameter "cart_id" is missing'
+            ]
+        ];
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
@@ -536,22 +572,4 @@ private function assignQuoteToCustomer(
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
-
-    /**
-     * @return array
-     */
-    public function dataProviderSetWithoutRequiredParameters()
-    {
-        return [
-            'missed_billing_address' => [
-                'cart_id: "cart_id_value"',
-                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
-                    . ' was not provided.',
-            ],
-            'missed_cart_id' => [
-                'billing_address: {}',
-                'Required parameter "cart_id" is missing'
-            ]
-        ];
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index 56a9592cbd4a2..ffc52c753b80a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -9,10 +9,8 @@
 
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\OfflinePayments\Model\Cashondelivery;
 use Magento\OfflinePayments\Model\Checkmo;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -31,21 +29,6 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
     /**
      * @inheritdoc
      */
@@ -53,21 +36,22 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testSetPaymentWithVirtualProduct()
+    public function testSetPaymentOnCartWithSimpleProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_virtual_product');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
@@ -77,14 +61,35 @@ public function testSetPaymentWithVirtualProduct()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
+     */
+    public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
+    {
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
      */
-    public function testSetPaymentWithSimpleProduct()
+    public function testSetPaymentOnCartWithVirtualProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
@@ -95,96 +100,93 @@ public function testSetPaymentWithSimpleProduct()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     *
      * @expectedException \Exception
-     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
+     * @expectedExceptionMessage The requested Payment Method is not available.
      */
-    public function testSetPaymentWithSimpleProductWithoutAddress()
+    public function testSetNonExistentPaymentMethod()
     {
-        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
+        $methodCode = 'noway';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
      * @expectedException \Exception
-     * @expectedExceptionMessage The requested Payment Method is not available.
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
-    public function testSetNonExistingPaymentMethod()
+    public function testSetPaymentOnNonExistentCart()
     {
-        $methodCode = 'noway';
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+    }
+  }
+}
+QUERY;
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetPaymentMethodToGuestCart()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetPaymentMethodToAnotherCustomerCart()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-
         $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-     */
-    public function testPaymentMethodOnNonExistentCart()
-    {
-        $maskedQuoteId = 'non_existent_masked_id';
-        $query = <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    items {
-      id
-    }
-  }
-}
-QUERY;
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @param string $input
      * @param string $message
+     * @throws \Exception
      * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
      */
     public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
@@ -207,6 +209,7 @@ public function testSetPaymentMethodWithoutRequiredParameters(string $input, str
         $this->expectExceptionMessage($message);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
+
     /**
      * @return array
      */
@@ -229,19 +232,26 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_payment_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
      */
     public function testReSetPayment()
     {
-        /** @var \Magento\Quote\Model\Quote  $quote */
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_with_payment');
-        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $methodCode = Cashondelivery::PAYMENT_METHOD_CASHONDELIVERY_CODE;
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
         self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
         self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
+        self::assertArrayHasKey('code', $response['setPaymentMethodOnCart']['cart']['selected_payment_method']);
         self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
     }
 
@@ -250,7 +260,7 @@ public function testReSetPayment()
      * @param string $methodCode
      * @return string
      */
-    private function prepareMutationQuery(
+    private function getQuery(
         string $maskedQuoteId,
         string $methodCode
     ) : string {
@@ -272,22 +282,6 @@ private function prepareMutationQuery(
 QUERY;
     }
 
-    /**
-     * @param string $reversedOrderId
-     * @param int $customerId
-     * @return string
-     */
-    private function assignQuoteToCustomer(
-        string $reversedOrderId,
-        int $customerId
-    ): string {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
-        $quote->setCustomerId($customerId);
-        $this->quoteResource->save($quote);
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $username
      * @param string $password
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 4d4c61b3b4e5b..efd86ca5e56c8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
@@ -34,6 +35,11 @@ class SetShippingAddressOnCartTest extends GraphQlAbstract
      */
     private $quoteIdToMaskedId;
 
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
     /**
      * @var CustomerTokenServiceInterface
      */
@@ -45,16 +51,19 @@ protected function setUp()
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
-    public function testSetNewShippingAddress()
+    public function testSetNewShippingAddressOnCartWithSimpleProduct()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -108,14 +117,17 @@ public function testSetNewShippingAddress()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
      */
-    public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
+    public function testSetNewShippingAddressOnCartWithVirtualProduct()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_virtual_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -152,13 +164,15 @@ public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetShippingAddressFromAddressBook()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -196,14 +210,17 @@ public function testSetShippingAddressFromAddressBook()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a address with ID "100"
      */
     public function testSetNonExistentShippingAddressFromAddressBook()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -229,13 +246,15 @@ public function testSetNonExistentShippingAddressFromAddressBook()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -276,9 +295,11 @@ public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Current customer does not have permission to address with ID "1"
      */
@@ -311,9 +332,11 @@ public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
     }
 
     /**
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     *
      * @expectedException \Exception
      */
     public function testSetShippingAddressToAnotherCustomerCart()
@@ -343,13 +366,15 @@ public function testSetShippingAddressToAnotherCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-
         $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @dataProvider dataProviderUpdateWithMissedRequiredParameters
      * @param string $input
      * @param string $message
@@ -357,7 +382,7 @@ public function testSetShippingAddressToAnotherCustomerCart()
      */
     public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -386,7 +411,7 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
     /**
      * @return array
      */
-    public function dataProviderUpdateWithMissedRequiredParameters()
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
     {
         return [
             'shipping_addresses' => [
@@ -402,13 +427,16 @@ public function dataProviderUpdateWithMissedRequiredParameters()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage You cannot specify multiple shipping addresses.
      */
     public function testSetMultipleNewShippingAddresses()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index 7da7480ca390a..8989b1b2c074e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -31,39 +31,36 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testGetCartWithPaymentMethods()
+    public function testGetAvailablePaymentMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('available_payment_methods', $response['cart']);
+        self::assertCount(1, $response['cart']['available_payment_methods']);
 
         self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
         self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);
-
-        self::assertEquals('free', $response['cart']['available_payment_methods'][1]['code']);
-        self::assertEquals(
-            'No Payment Information Required',
-            $response['cart']['available_payment_methods'][1]['title']
-        );
-        self::assertGreaterThan(
-            0,
-            count($response['cart']['available_payment_methods']),
-            'There are no available payment methods for guest cart!'
-        );
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testGetPaymentMethodsFromCustomerCart()
+    public function testGetAvailablePaymentMethodsFromCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -73,25 +70,28 @@ public function testGetPaymentMethodsFromCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/Payment/_files/disable_all_active_payment_methods.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
      */
-    public function testGetPaymentMethodsIfPaymentsAreNotSet()
+    public function testGetAvailablePaymentMethodsIfPaymentsAreNotPresent()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
-        self::assertEquals(0, count($response['cart']['available_payment_methods']));
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('available_payment_methods', $response['cart']);
+        self::assertEmpty($response['cart']['available_payment_methods']);
     }
 
     /**
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
-    public function testGetPaymentMethodsOfNonExistentCart()
+    public function testGetAvailablePaymentMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
         $query = $this->getQuery($maskedQuoteId);
@@ -102,9 +102,8 @@ public function testGetPaymentMethodsOfNonExistentCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getQuery(
-        string $maskedQuoteId
-    ): string {
+    private function getQuery(string $maskedQuoteId): string
+    {
         return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 847a7129750ff..a7af18a5674ba 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -8,10 +8,6 @@
 namespace Magento\GraphQl\Quote\Guest;
 
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -25,43 +21,23 @@ class GetCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var CustomerTokenServiceInterface
-     */
-    private $customerTokenService;
-
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
      */
     public function testGetCart()
     {
-        $maskedQuoteId = $this->unAssignCustomerFromQuote('test_order_item_with_items');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
         $response = $this->graphQlQuery($query);
 
@@ -70,21 +46,23 @@ public function testGetCart()
         self::assertCount(2, $response['cart']['items']);
 
         self::assertNotEmpty($response['cart']['items'][0]['id']);
-        self::assertEquals($response['cart']['items'][0]['qty'], 2);
-        self::assertEquals($response['cart']['items'][0]['product']['sku'], 'simple');
+        self::assertEquals(2, $response['cart']['items'][0]['qty']);
+        self::assertEquals('simple', $response['cart']['items'][0]['product']['sku']);
 
         self::assertNotEmpty($response['cart']['items'][1]['id']);
-        self::assertEquals($response['cart']['items'][1]['qty'], 1);
-        self::assertEquals($response['cart']['items'][1]['product']['sku'], 'simple_one');
+        self::assertEquals(2, $response['cart']['items'][1]['qty']);
+        self::assertEquals('virtual-product', $response['cart']['items'][1]['product']['sku']);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      */
     public function testGetCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
@@ -99,25 +77,22 @@ public function testGetCustomerCart()
     public function testGetNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getCartQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Current user does not have an active cart.
      */
     public function testGetInactiveCart()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-        $quote->setIsActive(false);
-        $this->quoteResource->save($quote);
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->graphQlQuery($query);
     }
@@ -126,12 +101,11 @@ public function testGetInactiveCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getCartQuery(
-        string $maskedQuoteId
-    ) : string {
+    private function getQuery(string $maskedQuoteId): string
+    {
         return <<<QUERY
 {
-  cart(cart_id: "$maskedQuoteId") {
+  cart(cart_id: "{$maskedQuoteId}") {
     items {
       id
       qty
@@ -143,19 +117,4 @@ private function getCartQuery(
 }
 QUERY;
     }
-
-    /**
-     * @param string $reversedOrderId
-     * @param int $customerId
-     * @return string
-     */
-    private function unAssignCustomerFromQuote(
-        string $reversedOrderId
-    ): string {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
-        $quote->setCustomerId(0);
-        $this->quoteResource->save($quote);
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index a2f092b9e0e1d..f6c38ef43554b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -7,9 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -19,34 +17,24 @@
 class SetBillingAddressOnCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetNewBillingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -98,11 +86,13 @@ public function testSetNewBillingAddress()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testSetNewBillingAddressWithUseForShippingParameter()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -172,11 +162,13 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      */
     public function testSetBillingAddressToCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -215,13 +207,17 @@ public function testSetBillingAddressToCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @security
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage The current customer isn't authorized.
      */
     public function testSetBillingAddressFromAddressBook()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -264,7 +260,10 @@ public function testSetBillingAddressOnNonExistentCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @dataProvider dataProviderSetWithoutRequiredParameters
      * @param string $input
      * @param string $message
@@ -272,7 +271,7 @@ public function testSetBillingAddressOnNonExistentCart()
      */
     public function testSetBillingAddressWithoutRequiredParameters(string $input, string $message)
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $input = str_replace('cart_id_value', $maskedQuoteId, $input);
 
         $query = <<<QUERY
@@ -295,6 +294,24 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @return array
+     */
+    public function dataProviderSetWithoutRequiredParameters(): array
+    {
+        return [
+            'missed_billing_address' => [
+                'cart_id: "cart_id_value"',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
+                . ' was not provided.',
+            ],
+            'missed_cart_id' => [
+                'billing_address: {}',
+                'Required parameter "cart_id" is missing'
+            ]
+        ];
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
@@ -317,34 +334,4 @@ private function assertNewAddressFields(array $addressResponse, string $addressT
 
         $this->assertResponseFields($addressResponse, $assertionMap);
     }
-
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
-    /**
-     * @return array
-     */
-    public function dataProviderSetWithoutRequiredParameters()
-    {
-        return [
-            'missed_billing_address' => [
-                'cart_id: "cart_id_value"',
-                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
-                    . ' was not provided.',
-            ],
-            'missed_cart_id' => [
-                'billing_address: {}',
-                'Required parameter "cart_id" is missing'
-            ]
-        ];
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index a347c99a9220a..b2a8f5078c5e9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -8,10 +8,8 @@
 namespace Magento\GraphQl\Quote\Guest;
 
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\OfflinePayments\Model\Cashondelivery;
 use Magento\OfflinePayments\Model\Checkmo;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -25,21 +23,6 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
     /**
      * @inheritdoc
      */
@@ -47,21 +30,20 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testSetPaymentWithVirtualProduct()
+    public function testSetPaymentOnCartWithSimpleProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_virtual_product');
-        $this->unAssignCustomerFromQuote('test_order_with_virtual_product');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
@@ -71,15 +53,33 @@ public function testSetPaymentWithVirtualProduct()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
+     */
+    public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
+    {
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
      */
-    public function testSetPaymentWithSimpleProduct()
+    public function testSetPaymentOnCartWithVirtualProduct()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-        $this->unAssignCustomerFromQuote('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
@@ -89,45 +89,56 @@ public function testSetPaymentWithSimpleProduct()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     *
      * @expectedException \Exception
-     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
+     * @expectedExceptionMessage The requested Payment Method is not available.
      */
-    public function testSetPaymentWithSimpleProductWithoutAddress()
+    public function testSetNonExistentPaymentMethod()
     {
-        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
+        $methodCode = 'noway';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @expectedException \Exception
-     * @expectedExceptionMessage The requested Payment Method is not available.
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
-    public function testSetNonExistingPaymentMethod()
+    public function testSetPaymentOnNonExistentCart()
     {
-        $methodCode = 'noway';
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-        $this->unAssignCustomerFromQuote('test_order_1');
-
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    items {
+      id
+    }
+  }
+}
+QUERY;
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
     public function testSetPaymentMethodToCustomerCart()
     {
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
@@ -136,10 +147,15 @@ public function testSetPaymentMethodToCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     *
      * @param string $input
      * @param string $message
      * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
+     * @throws \Exception
      */
     public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
     {
@@ -161,6 +177,7 @@ public function testSetPaymentMethodWithoutRequiredParameters(string $input, str
         $this->expectExceptionMessage($message);
         $this->graphQlQuery($query);
     }
+
     /**
      * @return array
      */
@@ -183,39 +200,25 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
     }
 
     /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
-     */
-    public function testSetPaymentOnNonExistentCart()
-    {
-        $maskedQuoteId = 'non_existent_masked_id';
-        $query = <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    items {
-      id
-    }
-  }
-}
-QUERY;
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_payment_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
      */
     public function testReSetPayment()
     {
-        /** @var \Magento\Quote\Model\Quote  $quote */
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_with_payment');
-        $this->unAssignCustomerFromQuote('test_order_1_with_payment');
-        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
-        $query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $methodCode = Cashondelivery::PAYMENT_METHOD_CASHONDELIVERY_CODE;
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
         self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
         self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
+        self::assertArrayHasKey('code', $response['setPaymentMethodOnCart']['cart']['selected_payment_method']);
         self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
     }
 
@@ -224,20 +227,18 @@ public function testReSetPayment()
      * @param string $methodCode
      * @return string
      */
-    private function prepareMutationQuery(
+    private function getQuery(
         string $maskedQuoteId,
         string $methodCode
     ) : string {
         return <<<QUERY
 mutation {
-  setPaymentMethodOnCart(input: 
-    {
-      cart_id: "{$maskedQuoteId}", 
-      payment_method: {
-          code: "{$methodCode}"
-        }
-      }) {
-    
+  setPaymentMethodOnCart(input: {
+    cart_id: "{$maskedQuoteId}", 
+    payment_method: {
+      code: "{$methodCode}"
+    }
+  }) {
     cart {
       selected_payment_method {
         code
@@ -247,19 +248,4 @@ private function prepareMutationQuery(
 }
 QUERY;
     }
-
-    /**
-     * @param string $reversedOrderId
-     * @param int $customerId
-     * @return string
-     */
-    private function unAssignCustomerFromQuote(
-        string $reversedOrderId
-    ): string {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
-        $quote->setCustomerId(0);
-        $this->quoteResource->save($quote);
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index 5c6e0e9cec55e..b6cea68db9b84 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -7,15 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-use Magento\Multishipping\Helper\Data;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\TestFramework\ObjectManager;
 
 /**
  * Test for set shipping addresses on cart mutation
@@ -27,38 +21,20 @@ class SetShippingAddressOnCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
-    public function testSetNewShippingAddress()
+    public function testSetNewShippingAddressOnCartWithSimpleProduct()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -112,15 +88,16 @@ public function testSetNewShippingAddress()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage The Cart includes virtual product(s) only, so a shipping address is not used.
      */
-    public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
+    public function testSetNewShippingAddressOnCartWithVirtualProduct()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_virtual_product_without_address'
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -157,15 +134,17 @@ public function testSetNewShippingAddressOnQuoteWithVirtualProducts()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @security
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage The current customer isn't authorized.
      */
     public function testSetShippingAddressFromAddressBook()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -191,13 +170,17 @@ public function testSetShippingAddressFromAddressBook()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @expectedException \Exception
      */
     public function testSetShippingAddressToCustomerCart()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -222,12 +205,14 @@ public function testSetShippingAddressToCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @dataProvider dataProviderUpdateWithMissedRequiredParameters
      * @param string $input
      * @param string $message
@@ -235,9 +220,7 @@ public function testSetShippingAddressToCustomerCart()
      */
     public function testSetNewShippingAddressWithMissedRequiredParameters(string $input, string $message)
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -266,7 +249,7 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
     /**
      * @return array
      */
-    public function dataProviderUpdateWithMissedRequiredParameters()
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
     {
         return [
             'shipping_addresses' => [
@@ -281,15 +264,16 @@ public function dataProviderUpdateWithMissedRequiredParameters()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage You cannot specify multiple shipping addresses.
      */
     public function testSetMultipleNewShippingAddresses()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_simple_product_without_address'
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = <<<QUERY
 mutation {
@@ -360,20 +344,4 @@ private function assertNewShippingAddressFields(array $shippingAddressResponse):
 
         $this->assertResponseFields($shippingAddressResponse, $assertionMap);
     }
-
-    /**
-     * @param string $reversedOrderId
-     * @param int $customerId
-     * @return string
-     */
-    private function assignQuoteToCustomer(
-        string $reversedOrderId = 'test_order_with_simple_product_without_address',
-        int $customerId = 1
-    ): string {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
-        $quote->setCustomerId($customerId);
-        $this->quoteResource->save($quote);
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php
similarity index 96%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php
index 80acbbdb64230..cf32003340a66 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\OfflineShipping;
+namespace Magento\GraphQl\Quote;
 
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\QuoteFactory;
@@ -53,7 +53,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
      * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
      *
      * @param string $carrierCode
@@ -103,7 +103,7 @@ public function offlineShippingMethodDataProvider()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
      */
     public function testSetShippingMethodTwiceInOneRequest()
     {
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
new file mode 100644
index 0000000000000..d23381e33d436
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var CartRepositoryInterface $cartRepository */
+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+
+$product = $productRepository->get('simple');
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$quote->addProduct($product, 2);
+$cartRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_virtual_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_virtual_product.php
new file mode 100644
index 0000000000000..f597d0bffa7ce
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_virtual_product.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var CartRepositoryInterface $cartRepository */
+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+
+$product = $productRepository->get('virtual-product');
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$quote->addProduct($product, 2);
+$cartRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
new file mode 100644
index 0000000000000..86174a7753f4e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CartManagementInterface $cartManagement */
+$cartManagement = Bootstrap::getObjectManager()->get(CartManagementInterface::class);
+/** @var CartRepositoryInterface $cartRepository */
+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
+$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
+
+$cartId = $cartManagement->createEmptyCartForCustomer(1);
+$cart = $cartRepository->get($cartId);
+$cart->setReservedOrderId('test_quote');
+$cartRepository->save($cart);
+
+/** @var QuoteIdMask $quoteIdMask */
+$quoteIdMask = $quoteIdMaskFactory->create();
+$quoteIdMask->setQuoteId($cartId)
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_rollback.php
new file mode 100644
index 0000000000000..0d5d5f067e35a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
+$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$quoteResource->delete($quote);
+
+/** @var QuoteIdMask $quoteIdMask */
+$quoteIdMask = $quoteIdMaskFactory->create();
+$quoteIdMask->setQuoteId($quote->getId())
+    ->delete();
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
similarity index 93%
rename from dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
rename to dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
index ac811e67c580a..8e6d4b8f74b86 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
 declare(strict_types=1);
 
 use Magento\Config\Model\Config;
diff --git a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods_rollback.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
rename to dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods_rollback.php
index 4a56888058e4d..092826d1fd3f7 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/_files/disable_all_active_payment_methods_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_all_active_payment_methods_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
 declare(strict_types=1);
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
new file mode 100644
index 0000000000000..9c15589ba82e5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+
+$configWriter->save('payment/banktransfer/active', 1);
+$configWriter->save('payment/cashondelivery/active', 1);
+$configWriter->save('payment/checkmo/active', 1);
+$configWriter->save('payment/purchaseorder/active', 1);
+
+$scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+$scopeConfig->clean();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php
new file mode 100644
index 0000000000000..61b7ed9737ff9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_payment_methods_rollback.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
+declare(strict_types=1);
+
+use Magento\Framework\App\Config\Storage\Writer;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Writer  $configWriter */
+$configWriter = $objectManager->create(WriterInterface::class);
+
+$configWriter->delete('payment/banktransfer/active');
+$configWriter->delete('payment/cashondelivery/active');
+$configWriter->delete('payment/checkmo/active');
+$configWriter->delete('payment/purchaseorder/active');
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
similarity index 89%
rename from dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
rename to dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
index 08694bf8c7d0b..ebc41da9b1b3c 100644
--- a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
 declare(strict_types=1);
 
 use Magento\Framework\App\Config\Storage\Writer;
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods_rollback.php
similarity index 86%
rename from dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods_rollback.php
rename to dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods_rollback.php
index 31a16f42adfce..384ffbdf51f3c 100644
--- a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/enable_offline_shipping_methods_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/enable_offline_shipping_methods_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
 declare(strict_types=1);
 
 use Magento\Framework\App\Config\Storage\Writer;
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
new file mode 100644
index 0000000000000..6a9ed898c3161
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\GuestCartManagementInterface;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var GuestCartManagementInterface $guestCartManagement */
+$guestCartManagement = Bootstrap::getObjectManager()->get(GuestCartManagementInterface::class);
+/** @var CartRepositoryInterface $cartRepository */
+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+/** @var MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId */
+$maskedQuoteIdToQuoteId = Bootstrap::getObjectManager()->get(MaskedQuoteIdToQuoteIdInterface::class);
+
+$cartHash = $guestCartManagement->createEmptyCart();
+$cartId = $maskedQuoteIdToQuoteId->execute($cartHash);
+$cart = $cartRepository->get($cartId);
+$cart->setReservedOrderId('test_quote');
+$cartRepository->save($cart);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart_rollback.php
new file mode 100644
index 0000000000000..0d5d5f067e35a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/create_empty_cart_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
+$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$quoteResource->delete($quote);
+
+/** @var QuoteIdMask $quoteIdMask */
+$quoteIdMask = $quoteIdMaskFactory->create();
+$quoteIdMask->setQuoteId($quote->getId())
+    ->delete();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_cart_inactive.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_cart_inactive.php
new file mode 100644
index 0000000000000..b5704f82879b2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_cart_inactive.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var CartRepositoryInterface $cartRepository */
+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$quote->setIsActive(false);
+$cartRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
new file mode 100644
index 0000000000000..a973a982b1150
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\OfflinePayments\Model\Checkmo;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Api\Data\PaymentInterfaceFactory;
+use Magento\Quote\Api\PaymentMethodManagementInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var PaymentInterfaceFactory $paymentFactory */
+$paymentFactory = Bootstrap::getObjectManager()->get(PaymentInterfaceFactory::class);
+/** @var PaymentMethodManagementInterface $paymentMethodManagement */
+$paymentMethodManagement = Bootstrap::getObjectManager()->get(PaymentMethodManagementInterface::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+
+$payment = $paymentFactory->create([
+    'data' => [
+        PaymentInterface::KEY_METHOD => Checkmo::PAYMENT_METHOD_CHECKMO_CODE,
+    ]
+]);
+$paymentMethodManagement->set($quote->getId(), $payment);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php
new file mode 100644
index 0000000000000..e17b9e61f82db
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\ShippingAddressManagementInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var AddressInterfaceFactory $quoteAddressFactory */
+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var ShippingAddressManagementInterface $shippingAddressManagement */
+$shippingAddressManagement = Bootstrap::getObjectManager()->get(ShippingAddressManagementInterface::class);
+
+$quoteAddressData = [
+    AddressInterface::KEY_TELEPHONE => 3468676,
+    AddressInterface::KEY_POSTCODE => 75477,
+    AddressInterface::KEY_COUNTRY_ID => 'US',
+    AddressInterface::KEY_CITY => 'CityM',
+    AddressInterface::KEY_COMPANY => 'CompanyName',
+    AddressInterface::KEY_STREET => 'Green str, 67',
+    AddressInterface::KEY_LASTNAME => 'Smith',
+    AddressInterface::KEY_FIRSTNAME => 'John',
+    AddressInterface::KEY_REGION_ID => 1,
+];
+$quoteAddress = $quoteAddressFactory->create();
+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$shippingAddressManagement->assign($quote->getId(), $quoteAddress);

From 4ce46390de5d1236d5ec38f5912355d3abe9939a Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 26 Mar 2019 23:39:36 -0500
Subject: [PATCH 0810/1055] GraphQL-538: Api-functional tests fixture
 refactoring

---
 .../Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
index 88462b8dbda3b..c5a4e8af02a58 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
@@ -47,6 +47,8 @@ public function __construct(
     }
 
     /**
+     * Get masked quote id by reserved order id
+     *
      * @param string $reversedOrderId
      * @return string
      * @throws \Magento\Framework\Exception\NoSuchEntityException

From 1a0dd445c4a3865a4c41225e827bfaa2feed204d Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 26 Mar 2019 23:47:31 -0500
Subject: [PATCH 0811/1055] GraphQL-538: Api-functional tests fixture
 refactoring

---
 .../Quote/Customer/GetAvailablePaymentMethodsTest.php       | 4 ++--
 .../Magento/GraphQl/Quote/Customer/GetCartTest.php          | 4 ++--
 .../GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php  | 6 +++---
 .../GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php   | 4 ++--
 .../GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php | 4 ++--
 .../GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php  | 2 +-
 .../testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php   | 2 +-
 .../GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php     | 4 ++--
 .../GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php      | 2 +-
 .../GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php    | 4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index 9c988f6bf5f71..f15b275b17f1a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -59,7 +59,7 @@ public function testGetAvailablePaymentMethods()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
@@ -78,7 +78,7 @@ public function testGetAvailablePaymentMethodsFromGuestCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index d2615b4135b01..eb62b8c92f310 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -63,7 +63,7 @@ public function testGetCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      */
@@ -79,7 +79,7 @@ public function testGetGuestCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 0099d25ed81f4..129375debe068 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -322,7 +322,7 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
@@ -359,7 +359,7 @@ public function testSetBillingAddressToGuestCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
@@ -394,7 +394,7 @@ public function testSetBillingAddressToAnotherCustomerCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index ffc52c753b80a..450a22dd6e9c7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -139,7 +139,7 @@ public function testSetPaymentOnNonExistentCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
@@ -159,7 +159,7 @@ public function testSetPaymentMethodToGuestCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index efd86ca5e56c8..5ff29d20b34d7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -295,7 +295,7 @@ public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
@@ -332,7 +332,7 @@ public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index 8989b1b2c074e..95136932e2969 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -51,7 +51,7 @@ public function testGetAvailablePaymentMethods()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index a7af18a5674ba..6b1f540e4d47a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -55,7 +55,7 @@ public function testGetCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index f6c38ef43554b..3808ce38b9d7b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -162,7 +162,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      */
@@ -207,7 +207,7 @@ public function testSetBillingAddressToCustomerCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index b2a8f5078c5e9..8f37f00c3db7f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -126,7 +126,7 @@ public function testSetPaymentOnNonExistentCart()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index b6cea68db9b84..e21d9ed64d491 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -134,7 +134,7 @@ public function testSetNewShippingAddressOnCartWithVirtualProduct()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -170,7 +170,7 @@ public function testSetShippingAddressFromAddressBook()
     }
 
     /**
-     * @security
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php

From 88fa9d62c1c1318a5ec58897c305904d41b1a8b9 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 27 Mar 2019 00:52:09 -0500
Subject: [PATCH 0812/1055] GraphQL-538: Api-functional tests fixture
 refactoring

---
 .../GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php    | 1 -
 .../GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index f15b275b17f1a..ba640bc3402ba 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -52,7 +52,6 @@ public function testGetAvailablePaymentMethods()
 
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('available_payment_methods', $response['cart']);
-        self::assertCount(1, $response['cart']['available_payment_methods']);
 
         self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
         self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index 95136932e2969..8271a76d88f12 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -44,7 +44,6 @@ public function testGetAvailablePaymentMethods()
 
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('available_payment_methods', $response['cart']);
-        self::assertCount(1, $response['cart']['available_payment_methods']);
 
         self::assertEquals('checkmo', $response['cart']['available_payment_methods'][0]['code']);
         self::assertEquals('Check / Money order', $response['cart']['available_payment_methods'][0]['title']);

From 01e7e08bf92afb696105fdfd3957c97fa316198b Mon Sep 17 00:00:00 2001
From: Roman Zhupanyn <roma.dj.elf@gmail.com>
Date: Wed, 27 Mar 2019 09:52:34 +0200
Subject: [PATCH 0813/1055] MAGETWO-98680: Cart Price Rule code is absent on
 "view Order/Invoice" Admin page if had been used for Free Shipping

---
 app/code/Magento/Sales/Block/Adminhtml/Totals.php           | 5 +++++
 .../testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php  | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
index 3f08dc48d38d1..f26df0946168a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -7,6 +7,11 @@
 
 use Magento\Sales\Model\Order;
 
+/**
+ * Adminhtml sales totals block
+ *
+ * @package Magento\Sales\Block\Adminhtml
+ */
 class Totals extends \Magento\Sales\Block\Order\Totals
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
index a77676e64a331..091b8e3f2b72c 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
@@ -48,6 +48,10 @@ public function testShowShippingCoupon()
 
         $shippingTotal = $this->_block->getTotal('shipping');
         $this->assertNotFalse($shippingTotal, 'Shipping method is absent on the total\'s block.');
-        $this->assertContains('1234567890', $shippingTotal->getLabel(), 'Coupon code is absent in the shipping method label name.');
+        $this->assertContains(
+            '1234567890',
+            $shippingTotal->getLabel(),
+            'Coupon code is absent in the shipping method label name.'
+        );
     }
 }

From 749551f939430907a95f0d72ac49ea20ad9a781f Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 27 Mar 2019 10:06:35 +0200
Subject: [PATCH 0814/1055] Fix static tests.

---
 .../Annotation/DataFixtureBeforeTransaction.php           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
index 0d4f652823c45..ba23ecd13b6a7 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Implementation of the @magentoDataFixtureBeforeTransaction DocBlock annotation
- */
 namespace Magento\TestFramework\Annotation;
 
 use Magento\Framework\Component\ComponentRegistrar;
 use PHPUnit\Framework\Exception;
 
+/**
+ * Implementation of the @magentoDataFixtureBeforeTransaction DocBlock annotation
+ */
 class DataFixtureBeforeTransaction
 {
     /**
@@ -139,6 +139,8 @@ private function getModulePath(string $fixture)
     }
 
     /**
+     * Get annotations for test.
+     *
      * @param \PHPUnit\Framework\TestCase $test
      * @return array
      */

From ed989a0c8843986ad29117915a5a74cb2523f166 Mon Sep 17 00:00:00 2001
From: Aliaksei Yakimovich2 <aliaksei_yakimovich2@epam.com>
Date: Wed, 27 Mar 2019 12:58:37 +0300
Subject: [PATCH 0815/1055] MAGETWO-70232: Import customizable options adds it
 to another product if same SKU is filled

- Fixed unit test;
---
 app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index 6b2f3aba12e7a..9cb6cda4d0a09 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -60,7 +60,7 @@ public function execute($entity, $arguments = [])
             }
         }
         if ($options) {
-            $this->processOptionsSaving($options, $entity->dataHasChangedFor('sku'), $entity->getSku());
+            $this->processOptionsSaving($options, (bool)$entity->dataHasChangedFor('sku'), (string)$entity->getSku());
         }
 
         return $entity;

From bbd127fe5629fc318d0a4c99c5e92302aa9e8754 Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Wed, 27 Mar 2019 13:03:49 +0200
Subject: [PATCH 0816/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 .../Product/View/Type/Bundle/Option.php       | 25 --------
 .../DataProviders/OptionPriceRenderer.php     | 63 +++++++++++++++++++
 .../catalog_product_view_type_bundle.xml      | 18 +++++-
 .../view/type/bundle/option/checkbox.phtml    |  4 +-
 .../view/type/bundle/option/radio.phtml       |  4 +-
 .../view/type/bundle/option/select.phtml      |  4 +-
 6 files changed, 84 insertions(+), 34 deletions(-)
 create mode 100644 app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index e169efb0c40a3..6a60854f80e64 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -7,7 +7,6 @@
 namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
 
 use Magento\Catalog\Model\Product;
-use Magento\Framework\Pricing\Render;
 
 /**
  * Bundle option renderer
@@ -342,28 +341,4 @@ public function renderPriceString($selection, $includeContainer = true)
 
         return $priceHtml;
     }
-
-    /**
-     * Format tier price string
-     *
-     * @param Product $selection
-     * @param array $arguments
-     * @return string
-     */
-    public function renderTierPriceString(Product $selection, array $arguments = []): string
-    {
-        if (!array_key_exists('zone', $arguments)) {
-            $arguments['zone'] = Render::ZONE_ITEM_OPTION;
-        }
-
-        /** @var Render $priceRender */
-        $priceRender = $this->getLayout()->getBlock('product.price.render.default');
-        $priceHtml = $priceRender->render(
-            'tier_price',
-            $selection,
-            $arguments
-        );
-
-        return $priceHtml;
-    }
 }
diff --git a/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php b/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php
new file mode 100644
index 0000000000000..058b3a981b52f
--- /dev/null
+++ b/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Block\DataProviders;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\TierPrice;
+use Magento\Framework\Pricing\Render;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\View\LayoutInterface;
+
+/**
+ * Provides additional data for bundle options
+ */
+class OptionPriceRenderer implements ArgumentInterface
+{
+    /**
+     * Parent layout of the block
+     *
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @param LayoutInterface $layout
+     */
+    public function __construct(LayoutInterface $layout)
+    {
+        $this->layout = $layout;
+    }
+
+    /**
+     * Format tier price string
+     *
+     * @param Product $selection
+     * @param array $arguments
+     * @return string
+     */
+    public function renderTierPrice(Product $selection, array $arguments = []): string
+    {
+        if (!array_key_exists('zone', $arguments)) {
+            $arguments['zone'] = Render::ZONE_ITEM_OPTION;
+        }
+
+        $priceHtml = '';
+
+        /** @var Render $priceRender */
+        $priceRender = $this->layout->getBlock('product.price.render.default');
+        if ($priceRender !== false) {
+            $priceHtml = $priceRender->render(
+                TierPrice::PRICE_CODE,
+                $selection,
+                $arguments
+            );
+        }
+
+        return $priceHtml;
+    }
+}
diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
index 5b8c050e5af54..d12f2e8f6a952 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
+++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
@@ -29,10 +29,22 @@
                 <container name="product.info.bundle.options.top" as="product_info_bundle_options_top">
                     <block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" before="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/>
                 </container>
-                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
+                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select">
+                    <arguments>
+                        <argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
+                    </arguments>
+                </block>
                 <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
-                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
-                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
+                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio">
+                    <arguments>
+                        <argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox">
+                    <arguments>
+                        <argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
+                    </arguments>
+                </block>
             </block>
         </referenceBlock>
         <referenceBlock name="product.info.form.options">
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
index 231fd3c9e5ab7..ad1843890eb4a 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -19,7 +19,7 @@
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
                 <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-                <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selections[0]) ?>
+                <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
                 <input type="hidden"
                        class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
                        name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
@@ -40,7 +40,7 @@
                                for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
                             <span><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
                             <br/>
-                            <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selection) ?>
+                            <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
                         </label>
                     </div>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
index e08c52def52cb..cd4af99cbc60f 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
@@ -21,7 +21,7 @@
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
                 <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
-                <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selections[0]) ?>
+                <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
                 <input type="hidden"
                     class="bundle-option-<?= (int)$_option->getId() ?>  product bundle option"
                     name="bundle_option[<?= (int)$_option->getId() ?>]"
@@ -59,7 +59,7 @@
                                for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
                             <span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span>
                             <br/>
-                            <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selection) ?>
+                            <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
                         </label>
                     </div>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
index 73c9db32eb91e..4f718278971ae 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
@@ -20,7 +20,7 @@
     <div class="control">
         <?php if ($block->showSingle()): ?>
             <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
-            <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selections[0]) ?>
+            <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
             <input type="hidden"
                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
@@ -44,7 +44,7 @@
                 <?php foreach ($_selections as $_selection): ?>
                     <div data-role="selection-tier-prices"
                          data-selection-id="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
-                        <?= /* @escapeNotVerified */ $block->renderTierPriceString($_selection) ?>
+                        <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
                     </div>
                 <?php endforeach; ?>
             </div>

From c2fa0154abfa9a549b22280e4d1662de5e932c68 Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen@reachdigital.nl>
Date: Wed, 27 Mar 2019 12:24:10 +0100
Subject: [PATCH 0817/1055] Remove timestap from current date when saving
 product special price from date

---
 .../Observer/SetSpecialPriceStartDate.php        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
index a597b8fddda9f..ed9f89efc6891 100644
--- a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
+++ b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  *  Set value for Special Price start date
@@ -13,21 +16,20 @@
 class SetSpecialPriceStartDate implements ObserverInterface
 {
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     * @var TimezoneInterface
      */
     private $localeDate;
 
     /**
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @codeCoverageIgnore
+     * @param TimezoneInterface $localeDate
      */
-    public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate)
+    public function __construct(TimezoneInterface $localeDate)
     {
         $this->localeDate = $localeDate;
     }
 
     /**
-     * Set the current date to Special Price From attribute if it empty
+     * Set the current date to Special Price From attribute if it's empty.
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
@@ -36,8 +38,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var  $product \Magento\Catalog\Model\Product */
         $product = $observer->getEvent()->getProduct();
-        if ($product->getSpecialPrice() && !$product->getSpecialFromDate()) {
-            $product->setData('special_from_date', $this->localeDate->date());
+        if ($product->getSpecialPrice() && ! $product->getSpecialFromDate()) {
+            $product->setData('special_from_date', $this->localeDate->date()->setTime(0, 0));
         }
 
         return $this;

From 0d58dec4219792b6c5919ca9a445ae4cf5c06755 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Wed, 27 Mar 2019 14:49:06 +0300
Subject: [PATCH 0818/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Updated automated test script.
---
 .../Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index 47fad10977b7c..76893f1c7deb3 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -52,7 +52,7 @@
         <waitForPageLoad stepKey="waitForInvoicePageLoad"/>
     </actionGroup>
 
-    <actionGroup name="clearInvoicesGridFilers">
+    <actionGroup name="clearInvoicesGridFilters">
         <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
         <waitForPageLoad stepKey="waitInvoicesGridToLoad"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters" />

From 37b48554ede24355e91785c288f3e0a4fb8f94bc Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 27 Mar 2019 14:08:59 +0200
Subject: [PATCH 0819/1055] magento/graphql-ce#540: Replace deprecated
 Magento/Checkout/_files/quote_with_address_saved.php fixture in
 SetUpsShippingMethodsOnCartTest

---
 .../GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index 463f2c4af101f..33f0d4c406020 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -62,13 +62,17 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
      */
     public function testSetUpsShippingMethod()
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
         $shippingAddressId = (int)$quote->getShippingAddress()->getId();
 

From 7b80d6174247ee275f4d9d0259d9949f7f21286a Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 27 Mar 2019 14:30:26 +0200
Subject: [PATCH 0820/1055] magento/graphql-ce#542: Replace deprecated
 Magento/Checkout/_files/quote_with_address_saved.php fixture in
 SetOfflineShippingMethodsOnCartTest

---
 .../SetOfflineShippingMethodsOnCartTest.php      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php
index cf32003340a66..a88f31f6ca884 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php
@@ -52,7 +52,11 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
      * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
      *
@@ -67,7 +71,7 @@ public function testSetOfflineShippingMethod(string $carrierCode, string $method
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load(
             $quote,
-            'test_order_1',
+            'test_quote',
             'reserved_order_id'
         );
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
@@ -102,7 +106,11 @@ public function offlineShippingMethodDataProvider()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
      */
     public function testSetShippingMethodTwiceInOneRequest()
@@ -110,7 +118,7 @@ public function testSetShippingMethodTwiceInOneRequest()
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load(
             $quote,
-            'test_order_1',
+            'test_quote',
             'reserved_order_id'
         );
         $shippingAddress = $quote->getShippingAddress();

From c2c04e9fa9eb6c6f7e1a7923da3dc89ca39894de Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 27 Mar 2019 15:52:25 +0200
Subject: [PATCH 0821/1055] magento/graphql-ce#544: Replace deprecated fixtures
 in RemoveItemFromCartTest

---
 .../Quote/Customer/RemoveItemFromCartTest.php | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
index e80a2127ad420..5f023086e89e1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -56,12 +56,15 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveItemFromCart()
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
         $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
 
@@ -85,12 +88,15 @@ public function testRemoveItemFromNonExistentCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveNonExistentItem()
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
         $notExistentItemId = 999;
 
@@ -101,13 +107,16 @@ public function testRemoveNonExistentItem()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      */
     public function testRemoveItemIfItemIsNotBelongToCart()
     {
         $firstQuote = $this->quoteFactory->create();
-        $this->quoteResource->load($firstQuote, 'test_order_1', 'reserved_order_id');
+        $this->quoteResource->load($firstQuote, 'test_quote', 'reserved_order_id');
         $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
 
         $secondQuote = $this->quoteFactory->create();
@@ -130,14 +139,16 @@ public function testRemoveItemIfItemIsNotBelongToCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
      */
     public function testRemoveItemFromGuestCart()
     {
         $guestQuote = $this->quoteFactory->create();
         $this->quoteResource->load(
             $guestQuote,
-            'test_order_with_virtual_product_without_address',
+            'test_quote',
             'reserved_order_id'
         );
         $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
@@ -154,8 +165,11 @@ public function testRemoveItemFromGuestCart()
     }
 
     /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      */
     public function testRemoveItemFromAnotherCustomerCart()

From 48ea21df20d5edf1e460b7443b8f17dd0f0df2ba Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 27 Mar 2019 16:21:11 +0200
Subject: [PATCH 0822/1055] Fix static tests.

---
 .../Shipping/Model/Carrier/AbstractCarrier.php      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index 628bc9c4295b0..76555ce8a6d8c 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -160,7 +160,8 @@ public function getConfigFlag($field)
     }
 
     /**
-     * Do request to shipment
+     * Do request to shipment.
+     *
      * Implementation must be in overridden method
      *
      * @param Request $request
@@ -173,7 +174,8 @@ public function requestToShipment($request)
     }
 
     /**
-     * Do return of shipment
+     * Do return of shipment.
+     *
      * Implementation must be in overridden method
      *
      * @param Request $request
@@ -275,6 +277,8 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
     }
 
     /**
+     * Validate request for available ship countries.
+     *
      * @param \Magento\Framework\DataObject $request
      * @return $this|bool|false|\Magento\Framework\Model\AbstractModel
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -400,6 +404,8 @@ public function getSortOrder()
     }
 
     /**
+     * Allows free shipping when all product items have free shipping.
+     *
      * @param \Magento\Quote\Model\Quote\Address\RateRequest $request
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -671,7 +677,8 @@ protected function filterDebugData($data)
     }
 
     /**
-     * Recursive replace sensitive xml nodes values by specified mask
+     * Recursive replace sensitive xml nodes values by specified mask.
+     *
      * @param \SimpleXMLElement $xml
      * @return void
      */

From b07d12e9562c7769c25e4e2a2ff21501f312c506 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 26 Mar 2019 12:50:22 -0500
Subject: [PATCH 0823/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

---
 .../Magento/GraphQl/Controller/GraphQl.php    | 85 +++++++++++++------
 .../ContentTypeProcessor.php                  |  4 +-
 .../HttpHeaderProcessor/StoreProcessor.php    |  5 +-
 3 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index 3009b7948e2cc..abbe0e093c79c 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -11,7 +11,6 @@
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\ExceptionFormatter;
 use Magento\Framework\GraphQl\Query\QueryProcessor;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -108,36 +107,29 @@ public function dispatch(RequestInterface $request) : ResponseInterface
         $statusCode = 200;
         try {
             /** @var Http $request */
-            $this->requestProcessor->processHeaders($request);
-            if ($request->isPost()) {
-                $data = $this->jsonSerializer->unserialize($request->getContent());
+            if ($this->isHttpVerbValid($request)) {
+                $this->requestProcessor->processHeaders($request);
+                $data = $this->getDataFromRequest($request);
+                $query = isset($data['query']) ? $data['query'] : '';
+                $variables = isset($data['variables']) ? $data['variables'] : null;
+
+                // We must extract queried field names to avoid instantiation of unnecessary fields in webonyx schema
+                // Temporal coupling is required for performance optimization
+                $this->queryFields->setQuery($query, $variables);
+                $schema = $this->schemaGenerator->generate();
+
+                $result = $this->queryProcessor->process(
+                    $schema,
+                    $query,
+                    $this->resolverContext,
+                    isset($data['variables']) ? $data['variables'] : []
+                );
             } else {
-                $data = $request->getParams();
-                $data['variables'] = isset($data['variables']) ?
-                    $this->jsonSerializer->unserialize($data['variables']) : null;
-            }
-
-            $query = isset($data['query']) ? $data['query'] : '';
-            $variables = isset($data['variables']) ? $data['variables'] : null;
-
-            // The easiest way to determine mutations without additional parsing
-            if ($request->isSafeMethod() && strpos(trim($query), 'mutation') === 0) {
-                throw new LocalizedException(
+                $result['errors'] = [
                     __('Mutation requests allowed only for POST requests')
-                );
+                ];
+                $statusCode = ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS;
             }
-
-            // 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, $variables);
-            $schema = $this->schemaGenerator->generate();
-
-            $result = $this->queryProcessor->process(
-                $schema,
-                $query,
-                $this->resolverContext,
-                isset($data['variables']) ? $data['variables'] : []
-            );
         } catch (\Exception $error) {
             $result['errors'] = isset($result) && isset($result['errors']) ? $result['errors'] : [];
             $result['errors'][] = $this->graphQlError->create($error);
@@ -149,4 +141,41 @@ public function dispatch(RequestInterface $request) : ResponseInterface
         )->setHttpResponseCode($statusCode);
         return $this->response;
     }
+
+    /**
+     * Get data from request body or query string
+     *
+     * @param Http $request
+     * @return array
+     */
+    private function getDataFromRequest(Http $request) : array
+    {
+        if ($request->isPost()) {
+            $data = $this->jsonSerializer->unserialize($request->getContent());
+        } else {
+            $data = $request->getParams();
+            $data['variables'] = isset($data['variables']) ?
+                $this->jsonSerializer->unserialize($data['variables']) : null;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Check if request is using correct verb for query or mutation
+     *
+     * @param Http $request
+     * @return boolean
+     */
+    private function isHttpVerbValid(Http $request)
+    {
+        $requestData = $this->getDataFromRequest($request);
+        $query = $requestData['query'] ?? '';
+
+        // The easiest way to determine mutations without additional parsing
+        if ($request->isSafeMethod() && strpos(trim($query), 'mutation') === 0) {
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
index 02cd5761834a2..54d75eeae906a 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
@@ -19,7 +19,9 @@ class ContentTypeProcessor implements HttpHeaderProcessorInterface
     /**
      * Handle the mandatory application/json header
      *
-     * {@inheritDoc}
+     * @param string $headerValue
+     * @param HttpRequestInterface $request
+     * @return void
      * @throws LocalizedException
      */
     public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
index cd8f954a4edbc..c6121ac4b290f 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
@@ -35,8 +35,11 @@ public function __construct(StoreManagerInterface $storeManager)
     /**
      * Handle the value of the store and set the scope
      *
-     * {@inheritDoc}
+     * @param string $headerValue
+     * @param HttpRequestInterface $request
+     * @return void
      * @throws GraphQlInputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void
     {

From 40683deb8285bc61de61dd475dd7a539eb1078ee Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 27 Mar 2019 17:27:42 +0200
Subject: [PATCH 0824/1055] magento/magento2#20526: Absent ObjectManager fix.

---
 app/code/Magento/Eav/Setup/EavSetup.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 6a8f6ef36bfdb..ecb085453bb6c 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -11,6 +11,7 @@
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Eav\Model\Validator\Attribute\Code;
 use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 

From e9aaac8b0ceefe0e8138e5f4c395b8265d3707fe Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Wed, 27 Mar 2019 10:48:37 -0500
Subject: [PATCH 0825/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

---
 .../Controller/GraphQlControllerTest.php      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index 0e05a8260a24f..32dfa63b7ab70 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -153,6 +153,33 @@ public function testDispatchWithGet() : void
         $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
     }
 
+    /**
+     * Test mutation over GET returns error
+     */
+    public function testMutationWithHttpGet()
+    {
+        $mutation = <<<MUTATION
+mutation {
+  testItem(id: 3) {
+    item_id,
+    name,
+    integer_list
+  }
+}
+MUTATION;
+
+        $request = $this->objectManager->get(Http::class);
+        $request->setPathInfo('/graphql');
+        $request->setMethod('GET');
+        //Http::isSafeMethod() checks $_SERVER which will be set on real HTTP request
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $request->setQueryValue('query', $mutation);
+        $response = $this->graphql->dispatch($request);
+        $output = $this->jsonSerializer->unserialize($response->getContent());
+        $this->assertArrayHasKey('errors', $output);
+        $this->assertEquals('Mutation requests allowed only for POST requests', $output['errors'][0]);
+    }
+
     /**
      * Test the errors on graphql output
      *

From 7421dfb0a263e1f0b92af77e21051c7ffa44cbba Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Wed, 27 Mar 2019 09:37:34 -0500
Subject: [PATCH 0826/1055] REPO-66: [EQP][Sniffs Consolidation] Deliver
 Magento Coding Standard to magento2ce

---
 .../Admin/AfterCustomUrlChangedObserver.php   |   5 +-
 .../Controller/Adminhtml/Index/Viewfile.php   |   5 +-
 app/code/Magento/Deploy/Process/Queue.php     |  30 +-
 .../Downloadable/Controller/Download/Link.php |   6 +-
 .../Controller/Download/LinkSample.php        |   6 +-
 .../Controller/Download/Sample.php            |   6 +-
 .../Magento/Indexer/Model/ProcessManager.php  |  11 +-
 .../MessageQueue/Model/CallbackInvoker.php    |   3 +-
 .../Magento/Paypal/Controller/Ipn/Index.php   |   2 +-
 .../Download/DownloadCustomOption.php         |   2 +-
 .../Controller/Index/DownloadCustomOption.php |   1 -
 composer.json                                 |   5 +-
 composer.lock                                 |  32 +-
 .../lib/Magento/Mtf/EntryPoint/EntryPoint.php |   5 +-
 .../ParentClassWithNamespace.php              |   8 +-
 .../SourceClassWithNamespace.php              |   3 +-
 .../Interception/Fixture/Intercepted.php      |   3 +-
 .../Rule/Design/FinalImplementation.php       |  29 --
 .../Rule/Design/FinalImplementationTest.php   | 128 -----
 .../resources/rulesets/design.xml             |  23 -
 .../Sniffs/Arrays/ShortArraySyntaxSniff.php   |  35 --
 .../Sniffs/EchoTags/ShortEchoSyntaxSniff.php  |  47 --
 .../Magento/Sniffs/Files/LineLengthSniff.php  |  36 --
 .../Sniffs/Functions/OutputBufferingSniff.php |  31 --
 .../LanguageConstructsSniff.php               |  77 ---
 .../LiteralNamespacesSniff.php                |  75 ---
 .../Sniffs/MicroOptimizations/IsNullSniff.php |  40 --
 .../NamingConventions/InterfaceNameSniff.php  |  49 --
 .../NamingConventions/ReservedWordsSniff.php  | 116 -----
 .../Sniffs/Security/ExecutableRegExSniff.php  |  87 ----
 .../Sniffs/Strings/StringPositionSniff.php    | 168 -------
 .../Sniffs/Translation/ConstantUsageSniff.php |  99 ----
 .../Sniffs/Variables/GlobalVariablesSniff.php |  40 --
 .../Whitespace/EmptyLineMissedSniff.php       |  68 ---
 .../Whitespace/MultipleEmptyLinesSniff.php    |  49 --
 .../CodingStandard/Tool/CodeSniffer.php       |   7 +-
 .../Utility/XssOutputValidator.php            | 441 ------------------
 .../static/framework/Magento/ruleset.xml      |  77 +--
 .../EchoTags/ShortEchoSyntaxSniffTest.php     |  82 ----
 .../EchoTags/_files/correct_echotag.txt       |   6 -
 .../Sniffs/EchoTags/_files/correct_noecho.txt |   6 -
 .../EchoTags/_files/incorrect_echotag.txt     |   6 -
 .../Translation/ConstantUsageSniffTest.php    |  98 ----
 .../Translation/_files/correct_arguments.txt  |  29 --
 .../_files/incorrect_arguments.txt            |  27 --
 .../CodingStandard/Tool/CodeSnifferTest.php   |   4 +-
 .../Utility/XssOutputValidatorTest.php        |  33 --
 .../Utility/_files/xss_safe.phtml             |  48 --
 .../Utility/_files/xss_unsafe.phtml           |  29 --
 dev/tests/static/phpunit.xml.dist             |   3 -
 .../Legacy/UnsecureFunctionsUsageTest.php     |   1 -
 .../security/unsecure_php_functions.php       |  87 ----
 .../Magento/Test/Php/LiveCodeTest.php         |   8 +-
 .../Magento/Test/Php/XssPhtmlTemplateTest.php |  89 ----
 .../Magento/Test/Php/_files/phpmd/ruleset.xml |   4 -
 .../Magento/Framework/App/Bootstrap.php       |  16 +-
 .../Framework/App/Console/Response.php        |   4 +-
 .../App/Response/Http/FileFactory.php         |   8 +-
 .../Magento/Framework/App/Router/Base.php     |   2 +-
 .../Unit/Generator/TestAsset/ParentClass.php  |   8 +-
 .../Unit/Generator/TestAsset/SourceClass.php  |  10 +-
 .../Magento/Framework/Console/Cli.php         |  14 +-
 lib/internal/Magento/Framework/DB/Tree.php    |   5 +-
 .../Framework/Data/Collection/Filesystem.php  |  94 ++--
 .../Framework/Webapi/ErrorProcessor.php       |   3 +-
 pub/errors/processor.php                      |   2 +-
 66 files changed, 206 insertions(+), 2375 deletions(-)
 delete mode 100644 dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php
 delete mode 100644 dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/Functions/OutputBufferingSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/Variables/GlobalVariablesSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
 delete mode 100644 dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/correct_arguments.txt
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/incorrect_arguments.txt
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/XssOutputValidatorTest.php
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php

diff --git a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
index bf414890d0ed4..6b4e435c3e743 100644
--- a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
+++ b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class AfterCustomUrlChangedObserver
+ */
 class AfterCustomUrlChangedObserver implements ObserverInterface
 {
     /**
@@ -56,7 +59,6 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
@@ -68,6 +70,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $this->_authSession->destroy();
         $adminUrl = $this->_backendData->getHomePageUrl();
         $this->_response->setRedirect($adminUrl)->sendResponse();
+        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
         exit(0);
     }
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 20d330354bce4..6b17abb840f76 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -17,6 +17,7 @@
 use Magento\Framework\DataObjectFactory;
 
 /**
+ * Class Viewfile
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
@@ -127,8 +128,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\ResultInterface|void
      * @throws NotFoundException
-     *
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function execute()
     {
@@ -146,6 +145,7 @@ public function execute()
         }
 
         if ($plain) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $extension = pathinfo($path, PATHINFO_EXTENSION);
             switch (strtolower($extension)) {
                 case 'gif':
@@ -175,6 +175,7 @@ public function execute()
             $resultRaw->setContents($directory->readFile($fileName));
             return $resultRaw;
         } else {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $name = pathinfo($path, PATHINFO_BASENAME);
             $this->_fileFactory->create(
                 $name,
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
index c4c31b8ff77bf..8bc33c36d8bf1 100644
--- a/app/code/Magento/Deploy/Process/Queue.php
+++ b/app/code/Magento/Deploy/Process/Queue.php
@@ -125,6 +125,8 @@ public function __construct(
     }
 
     /**
+     * Adds deployment package.
+     *
      * @param Package $package
      * @param Package[] $dependencies
      * @return bool true on success
@@ -140,6 +142,8 @@ public function add(Package $package, array $dependencies = [])
     }
 
     /**
+     * Returns packages array.
+     *
      * @return Package[]
      */
     public function getPackages()
@@ -162,6 +166,7 @@ public function process()
                 $this->assertAndExecute($name, $packages, $packageJob);
             }
             $this->logger->info('.');
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             sleep(3);
             foreach ($this->inProgress as $name => $package) {
                 if ($this->isDeployed($package)) {
@@ -209,6 +214,8 @@ private function assertAndExecute($name, array & $packages, array $packageJob)
     }
 
     /**
+     * Executes deployment package.
+     *
      * @param Package $package
      * @param string $name
      * @param array $packages
@@ -244,6 +251,7 @@ private function awaitForAllProcesses()
                 }
             }
             $this->logger->info('.');
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             sleep(5);
         }
         if ($this->isCanBeParalleled()) {
@@ -253,6 +261,8 @@ private function awaitForAllProcesses()
     }
 
     /**
+     * Checks if can be parallel.
+     *
      * @return bool
      */
     private function isCanBeParalleled()
@@ -261,9 +271,11 @@ private function isCanBeParalleled()
     }
 
     /**
+     * Executes the process.
+     *
      * @param Package $package
      * @return bool true on success for main process and exit for child process
-     * @SuppressWarnings(PHPMD.ExitExpression)
+     * @throws \RuntimeException
      */
     private function execute(Package $package)
     {
@@ -291,6 +303,7 @@ function () use ($package) {
         );
 
         if ($this->isCanBeParalleled()) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $pid = pcntl_fork();
             if ($pid === -1) {
                 throw new \RuntimeException('Unable to fork a new process');
@@ -305,6 +318,7 @@ function () use ($package) {
             // process child process
             $this->inProgress = [];
             $this->deployPackageService->deploy($package, $this->options, true);
+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
             exit(0);
         } else {
             $this->deployPackageService->deploy($package, $this->options);
@@ -313,6 +327,8 @@ function () use ($package) {
     }
 
     /**
+     * Checks if package is deployed.
+     *
      * @param Package $package
      * @return bool
      */
@@ -320,11 +336,13 @@ private function isDeployed(Package $package)
     {
         if ($this->isCanBeParalleled()) {
             if ($package->getState() === null) {
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 $pid = pcntl_waitpid($this->getPid($package), $status, WNOHANG);
                 if ($pid === $this->getPid($package)) {
                     $package->setState(Package::STATE_COMPLETED);
 
                     unset($this->inProgress[$package->getPath()]);
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
                     return pcntl_wexitstatus($status) === 0;
                 }
                 return false;
@@ -334,17 +352,19 @@ private function isDeployed(Package $package)
     }
 
     /**
+     * Returns process ID or null if not found.
+     *
      * @param Package $package
      * @return int|null
      */
     private function getPid(Package $package)
     {
-        return isset($this->processIds[$package->getPath()])
-            ? $this->processIds[$package->getPath()]
-            : null;
+        return isset($this->processIds[$package->getPath()]) ?? null;
     }
 
     /**
+     * Checks timeout.
+     *
      * @return bool
      */
     private function checkTimeout()
@@ -357,11 +377,13 @@ private function checkTimeout()
      *
      * Protect against zombie process
      *
+     * @throws \RuntimeException
      * @return void
      */
     public function __destruct()
     {
         foreach ($this->inProgress as $package) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             if (pcntl_waitpid($this->getPid($package), $status) === -1) {
                 throw new \RuntimeException(
                     'Error while waiting for package deployed: ' . $this->getPid($package) . '; Status: ' . $status
diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php
index 765546d080e5d..446b262972f63 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Link.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,6 +9,9 @@
 use Magento\Downloadable\Model\Link\Purchased\Item as PurchasedLink;
 use Magento\Framework\App\ResponseInterface;
 
+/**
+ * Class Link
+ */
 class Link extends \Magento\Downloadable\Controller\Download
 {
     /**
@@ -29,7 +31,6 @@ protected function _getCustomerSession()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function execute()
     {
@@ -117,6 +118,7 @@ public function execute()
                     $linkPurchasedItem->setStatus(PurchasedLink::LINK_STATUS_EXPIRED);
                 }
                 $linkPurchasedItem->save();
+                // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
                 exit(0);
             } catch (\Exception $e) {
                 $this->messageManager->addError(__('Something went wrong while getting the requested content.'));
diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
index 76ec791611c9c..b09aa18d15c2d 100644
--- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,13 +8,15 @@
 use Magento\Downloadable\Helper\Download as DownloadHelper;
 use Magento\Framework\App\ResponseInterface;
 
+/**
+ * Class LinkSample
+ */
 class LinkSample extends \Magento\Downloadable\Controller\Download
 {
     /**
      * Download link's sample action
      *
      * @return ResponseInterface
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function execute()
     {
@@ -39,6 +40,7 @@ public function execute()
             }
             try {
                 $this->_processDownload($resource, $resourceType);
+                // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
                 exit(0);
             } catch (\Exception $e) {
                 $this->messageManager->addError(
diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
index 4a4f88d81b37a..d303fd612bba3 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,13 +8,15 @@
 use Magento\Downloadable\Helper\Download as DownloadHelper;
 use Magento\Framework\App\ResponseInterface;
 
+/**
+ * Class Sample
+ */
 class Sample extends \Magento\Downloadable\Controller\Download
 {
     /**
      * Download sample action
      *
      * @return ResponseInterface
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function execute()
     {
@@ -36,6 +37,7 @@ public function execute()
             }
             try {
                 $this->_processDownload($resource, $resourceType);
+                // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
                 exit(0);
             } catch (\Exception $e) {
                 $this->messageManager->addError(
diff --git a/app/code/Magento/Indexer/Model/ProcessManager.php b/app/code/Magento/Indexer/Model/ProcessManager.php
index 04cd713fffb11..2f2c500e028cf 100644
--- a/app/code/Magento/Indexer/Model/ProcessManager.php
+++ b/app/code/Magento/Indexer/Model/ProcessManager.php
@@ -71,6 +71,7 @@ public function execute($userFunctions)
     private function simpleThreadExecute($userFunctions)
     {
         foreach ($userFunctions as $userFunction) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             call_user_func($userFunction);
         }
     }
@@ -79,6 +80,7 @@ private function simpleThreadExecute($userFunctions)
      * Execute user functions in multiThreads mode
      *
      * @param \Traversable $userFunctions
+     * @throws \RuntimeException
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     private function multiThreadsExecute($userFunctions)
@@ -86,6 +88,7 @@ private function multiThreadsExecute($userFunctions)
         $this->resource->closeConnection(null);
         $threadNumber = 0;
         foreach ($userFunctions as $userFunction) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $pid = pcntl_fork();
             if ($pid == -1) {
                 throw new \RuntimeException('Unable to fork a new process');
@@ -95,6 +98,7 @@ private function multiThreadsExecute($userFunctions)
                 $this->startChildProcess($userFunction);
             }
         }
+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock,Magento2.Functions.DiscouragedFunction
         while (pcntl_waitpid(0, $status) != -1) {
             //Waiting for the completion of child processes
         }
@@ -128,12 +132,13 @@ private function isSetupMode(): bool
      * Start child process
      *
      * @param callable $userFunction
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     private function startChildProcess(callable $userFunction)
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $status = call_user_func($userFunction);
-        $status = is_integer($status) ? $status : 0;
+        $status = is_int($status) ? $status : 0;
+        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
         exit($status);
     }
 
@@ -146,8 +151,10 @@ private function executeParentProcess(int &$threadNumber)
     {
         $threadNumber++;
         if ($threadNumber >= $this->threadsCount) {
+            // phpcs:disable Magento2.Functions.DiscouragedFunction
             pcntl_wait($status);
             if (pcntl_wexitstatus($status) !== 0) {
+                // phpcs:enable
                 $this->failInChildProcess = true;
             }
             $threadNumber--;
diff --git a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
index f37f2157c3575..f6305363fc1a6 100644
--- a/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
+++ b/app/code/Magento/MessageQueue/Model/CallbackInvoker.php
@@ -46,7 +46,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
     {
@@ -54,9 +53,11 @@ public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
         for ($i = $maxNumberOfMessages; $i > 0; $i--) {
             do {
                 $message = $queue->dequeue();
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
             } while ($message === null && (sleep(1) === 0));
             if (false === $this->poisonPillCompare->isLatestVersion($this->poisonPillVersion)) {
                 $queue->reject($message);
+                // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
                 exit(0);
             }
             $callback($message);
diff --git a/app/code/Magento/Paypal/Controller/Ipn/Index.php b/app/code/Magento/Paypal/Controller/Ipn/Index.php
index 4bcc3a9b3606c..e1f7bd12b1d81 100644
--- a/app/code/Magento/Paypal/Controller/Ipn/Index.php
+++ b/app/code/Magento/Paypal/Controller/Ipn/Index.php
@@ -73,7 +73,6 @@ public function validateForCsrf(RequestInterface $request): ?bool
      * Instantiate IPN model and pass IPN request to it
      *
      * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function execute()
     {
@@ -95,6 +94,7 @@ public function execute()
             $this->_logger->critical($e);
             $this->getResponse()->setStatusHeader(503, '1.1', 'Service Unavailable')->sendResponse();
             /** @todo eliminate usage of exit statement */
+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
             exit;
         } catch (\Exception $e) {
             $this->_logger->critical($e);
diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
index d30839e96dccb..19d1566d9f739 100644
--- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -121,10 +121,10 @@ public function execute()
      * Ends execution process
      *
      * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     protected function endExecute()
     {
+        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
         exit(0);
     }
 }
diff --git a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
index b87afa8e5d0c4..fe18b3483bd29 100644
--- a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
+++ b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
@@ -51,7 +51,6 @@ public function __construct(
      *
      * @return \Magento\Framework\Controller\Result\Forward
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function execute()
     {
diff --git a/composer.json b/composer.json
index 50b22238e0d01..aa4976aa50a99 100644
--- a/composer.json
+++ b/composer.json
@@ -82,15 +82,16 @@
         "zendframework/zend-view": "~2.10.0"
     },
     "require-dev": {
+        "allure-framework/allure-phpunit": "~1.2.0",
         "friendsofphp/php-cs-fixer": "~2.13.0",
         "lusitanian/oauth": "~0.8.10",
+        "magento/magento-coding-standard": "~1.0.0",
         "magento/magento2-functional-testing-framework": "~2.3.14",
         "pdepend/pdepend": "2.5.2",
         "phpmd/phpmd": "@stable",
         "phpunit/phpunit": "~6.5.0",
         "sebastian/phpcpd": "~3.0.0",
-        "squizlabs/php_codesniffer": "3.3.1",
-        "allure-framework/allure-phpunit": "~1.2.0"
+        "squizlabs/php_codesniffer": "3.3.1"
     },
     "suggest": {
         "ext-pcntl": "Need for run processes in parallel mode"
diff --git a/composer.lock b/composer.lock
index a7131f4a16eec..e2d00ad07c79a 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": "60007664938710edf52eadddd7551867",
+    "content-hash": "825a03a040f3eff4ea6ea537b7530f15",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -6618,6 +6618,36 @@
             ],
             "time": "2018-02-14T22:37:14+00:00"
         },
+        {
+            "name": "magento/magento-coding-standard",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/magento/magento-coding-standard.git",
+                "reference": "b79055fdd16e0657c95ee214ebb81466c5f08745"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/b79055fdd16e0657c95ee214ebb81466c5f08745",
+                "reference": "b79055fdd16e0657c95ee214ebb81466c5f08745",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0",
+                "squizlabs/php_codesniffer": "~3.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "OSL-3.0",
+                "AFL-3.0"
+            ],
+            "description": "A set of Magento specific PHP CodeSniffer rules.",
+            "time": "2019-03-27T14:17:16+00:00"
+        },
         {
             "name": "magento/magento2-functional-testing-framework",
             "version": "2.3.14",
diff --git a/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
index 745f97b9b43ff..553d4a5aa80c0 100644
--- a/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
+++ b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
@@ -10,8 +10,8 @@
 
 /**
  * Class EntryPoint
- * Application entry point, used to bootstrap and run application
  *
+ * Application entry point, used to bootstrap and run application
  */
 class EntryPoint
 {
@@ -36,7 +36,6 @@ class EntryPoint
      * @param string $rootDir
      * @param array $parameters
      * @param ObjectManager $objectManager
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function __construct(
         $rootDir,
@@ -51,7 +50,7 @@ public function __construct(
     /**
      * Run a Mtf application
      *
-     * @param $applicationName
+     * @param string $applicationName
      * @param array $arguments
      * @return mixed
      * @throws \DomainException
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php
index e42a79aa52596..6662c20e5576c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php
@@ -7,6 +7,11 @@
 
 use Zend\Code\Generator\DocBlockGenerator;
 
+/**
+ * Class ParentClassWithNamespace
+ *
+ * phpcs:ignoreFile
+ */
 class ParentClassWithNamespace
 {
     /**
@@ -78,9 +83,6 @@ public static function publicParentStatic()
     {
     }
 
-    /**
-     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
-     */
     final public function publicParentFinal()
     {
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
index e5bce7c52db7a..4025a82abdf29 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
@@ -9,6 +9,7 @@
 
 /**
  * Class  SourceClassWithNamespace
+ * phpcs:ignoreFile
  */
 class SourceClassWithNamespace extends ParentClassWithNamespace
 {
@@ -115,8 +116,6 @@ public static function publicChildStatic()
 
     /**
      * Test method
-     *
-     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
      */
     final public function publicChildFinal()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
index 0a75aba5c9c48..a35596cf0f907 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/Fixture/Intercepted.php
@@ -8,7 +8,7 @@
 namespace Magento\Framework\Interception\Fixture;
 
 /**
- * @codingStandardsIgnoreStart
+ * phpcs:ignoreFile
  */
 class Intercepted extends InterceptedParent implements InterceptedInterface
 {
@@ -49,7 +49,6 @@ public function D($param1)
 
     /**
      * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
      */
     final public function E($param1)
     {
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php
deleted file mode 100644
index 22c008b058067..0000000000000
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CodeMessDetector\Rule\Design;
-
-use PHPMD\AbstractNode;
-use PHPMD\AbstractRule;
-use PHPMD\Rule\ClassAware;
-use PHPMD\Rule\MethodAware;
-
-/**
- * Magento is a highly extensible and customizable platform.
- * Usage of final classes and methods is prohibited.
- */
-class FinalImplementation extends AbstractRule implements ClassAware, MethodAware
-{
-    /**
-     * @inheritdoc
-     */
-    public function apply(AbstractNode $node)
-    {
-        if ($node->isFinal()) {
-            $this->addViolation($node, [$node->getType(), $node->getFullQualifiedName()]);
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
deleted file mode 100644
index ca944b5c60e11..0000000000000
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\CodeMessDetector\Test\Unit\Rule\Design;
-
-use PHPUnit\Framework\TestCase as TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder as InvokedRecorder;
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker;
-use Magento\CodeMessDetector\Rule\Design\FinalImplementation;
-use PHPMD\Report;
-use PHPMD\AbstractNode;
-use PHPMD\Node\ClassNode;
-use PHPMD\Node\MethodNode;
-use BadMethodCallException;
-
-class FinalImplementationTest extends TestCase
-{
-    /**
-     * @param string $nodeType
-     *
-     * @dataProvider finalizableNodeTypesProvider
-     */
-    public function testRuleNotAppliesToNotFinalFinalizable($nodeType)
-    {
-        $finalizableNode = $this->createFinalizableNodeMock($nodeType);
-        $finalizableNode->method('isFinal')->willReturn(false);
-
-        $rule = new FinalImplementation();
-        $this->expectsRuleViolation($rule, $this->never());
-        $rule->apply($finalizableNode);
-    }
-
-    /**
-     * @param string $nodeType
-     *
-     * @dataProvider finalizableNodeTypesProvider
-     */
-    public function testRuleAppliesToFinalFinalizable($nodeType)
-    {
-        $finalizableNode = $this->createFinalizableNodeMock($nodeType);
-        $finalizableNode->method('isFinal')->willReturn(true);
-
-        $rule = new FinalImplementation();
-        $this->expectsRuleViolation($rule, $this->once());
-        $rule->apply($finalizableNode);
-    }
-
-    /**
-     * @param string $nodeType
-     *
-     * @dataProvider finalizableNodeTypesProvider
-     */
-    public function testRuleVerifiesFinalizableNodes($nodeType)
-    {
-        $finalizableNode = $this->createFinalizableNodeMock($nodeType);
-
-        $finalizableNode->expects($this->atLeastOnce())
-            ->method('isFinal');
-
-        $rule = new FinalImplementation();
-        $rule->apply($finalizableNode);
-    }
-
-    /**
-     * @expectedException BadMethodCallException
-     */
-    public function testRuleFailsOnNotFinalizableNodes()
-    {
-        $someNode = $this->getMockBuilder(AbstractNode::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $rule = new FinalImplementation();
-        $rule->apply($someNode);
-    }
-
-    /**
-     * "final" keyword may be applied only to classes and methods
-     *
-     * @return array
-     */
-    public function finalizableNodeTypesProvider()
-    {
-        return [
-            [ClassNode::class],
-            [MethodNode::class],
-        ];
-    }
-
-    /**
-     * If node is finalizable it has "isFinal" magic PHP method
-     *
-     * @param string $nodeType
-     * @return ClassNode|MethodNode|MockObject
-     */
-    private function createFinalizableNodeMock($nodeType)
-    {
-        $finalizableNode = $this->getMockBuilder($nodeType)
-            ->disableOriginalConstructor()
-            ->disableProxyingToOriginalMethods()
-            ->setMethods([
-                'isFinal',
-                // disable name lookup from AST artifact
-                'getNamespaceName',
-                'getParentName',
-                'getName',
-            ])
-            ->getMock();
-        return $finalizableNode;
-    }
-
-    /**
-     * @param FinalImplementation $rule
-     * @param InvokedRecorder $violationExpectation
-     * @return InvocationMocker
-     */
-    private function expectsRuleViolation(FinalImplementation $rule, InvokedRecorder $violationExpectation)
-    {
-        $report = $this->getMockBuilder(Report::class)->getMock();
-        $invokation = $report->expects($violationExpectation)->method('addRuleViolation');
-        $rule->setReport($report);
-        return $invokation;
-    }
-}
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 73354c46d76b2..53f2fe4a0084e 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
@@ -10,29 +10,6 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
          xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-    <rule name="FinalImplementation"
-          class="Magento\CodeMessDetector\Rule\Design\FinalImplementation"
-          message= "The {0} {1} declared as final.">
-        <description>
-            <![CDATA[
-Final keyword is prohibited in Magento as this decreases extensibility and customizability.
-Final classes and method are not compatible with plugins and proxies.
-            ]]>
-        </description>
-        <priority>1</priority>
-        <properties />
-        <example>
-            <![CDATA[
-final class Foo
-{
-    public function bar() {}
-}
-class Baz {
-    final public function bad() {}
-}
-            ]]>
-        </example>
-    </rule>
     <rule name="AllPurposeAction"
           class="Magento\CodeMessDetector\Rule\Design\AllPurposeAction"
           message= "The class {0} does not restrict processed HTTP methods by implementing a Http*Method name*ActionInterface">
diff --git a/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
deleted file mode 100644
index 5ce1ac333cc11..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\Arrays;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
- * Validate short array syntax is used.
- */
-class ShortArraySyntaxSniff implements Sniff
-{
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_ARRAY];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $sourceFile, $stackPtr)
-    {
-        $sourceFile->addError(
-            'Short array syntax must be used; expected "[]" but found "array()"',
-            $stackPtr,
-            'ShortArraySyntax'
-        );
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
deleted file mode 100644
index 9d0d58950c4f8..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\EchoTags;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-
-/**
- * Validate short echo syntax is used.
- */
-class ShortEchoSyntaxSniff implements Sniff
-{
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_OPEN_TAG];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens  = $phpcsFile->getTokens();
-        $openTag = $tokens[$stackPtr];
-
-        // HHVM Will classify <?= as a T_OPEN_TAG
-        if ($openTag['content'] === '<?=') {
-            return;
-        }
-
-        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($tokens[$nextToken]['code'] == T_ECHO) {
-            $phpcsFile->addError(
-                'Short echo tag syntax must be used; expected "<?=" but found "<?php echo"',
-                $stackPtr,
-                'ShortEchoTag'
-            );
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php b/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
deleted file mode 100644
index 528baeedf0476..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\Files;
-
-use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff as FilesLineLengthSniff;
-
-/**
- * Line length sniff which ignores long lines in case they contain strings intended for translation.
- */
-class LineLengthSniff extends FilesLineLengthSniff
-{
-    /**
-     * Having previous line content allows to ignore long lines in case of multi-line declaration.
-     *
-     * @var string
-     */
-    protected $previousLineContent = '';
-
-    /**
-     * @inheritdoc
-     */
-    protected function checkLineLength($phpcsFile, $stackPtr, $lineContent)
-    {
-        $previousLineRegexp = '~__\($|\bPhrase\($~';
-        $currentLineRegexp = '~__\(.+\)|\bPhrase\(.+\)~';
-        $currentLineMatch = preg_match($currentLineRegexp, $lineContent) !== 0;
-        $previousLineMatch = preg_match($previousLineRegexp, $this->previousLineContent) !== 0;
-        $this->previousLineContent = $lineContent;
-        if (! $currentLineMatch && !$previousLineMatch) {
-            parent::checkLineLength($phpcsFile, $stackPtr, $lineContent);
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Functions/OutputBufferingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Functions/OutputBufferingSniff.php
deleted file mode 100644
index d2bf2de418c27..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Functions/OutputBufferingSniff.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sniffs\Functions;
-
-/**
- * Sniff prohibiting usage of output buffering functions.
- */
-class OutputBufferingSniff extends \PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\ForbiddenFunctionsSniff
-{
-    public $forbiddenFunctions = ['ob_start' => null];
-
-    /**
-     * @inheritdoc
-     */
-    protected function addError($phpcsFile, $stackPtr, $function, $pattern = null)
-    {
-        $data = [$function];
-        $error = 'The usage of %s() is forbidden';
-        $type = 'Found';
-
-        if ($this->error === true) {
-            $phpcsFile->addError($error, $stackPtr, $type, $data);
-        } else {
-            $phpcsFile->addWarning($error, $stackPtr, $type, $data);
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php b/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php
deleted file mode 100644
index 575b39542311a..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\LanguageConstructs;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Detects possible usage of discouraged language constructs. Is not applicable to *.phtml files.
- *
- * Examples:
- * echo 'echo text';
- * print('print text');
- * $string = `back quotes`;
- */
-class LanguageConstructsSniff implements Sniff
-{
-    /**
-     * String representation of error.
-     *
-     * @var string
-     */
-    protected $errorMessage = 'Use of %s language construct is discouraged.';
-
-    /**
-     * String representation of backtick error.
-     *
-     * @var string
-     */
-    // @codingStandardsIgnoreLine
-    protected $errorMessageBacktick = 'Incorrect usage of back quote string constant. Back quotes should be always inside strings.';
-
-    /**
-     * Backtick violation code.
-     *
-     * @var string
-     */
-    protected $backtickCode = 'WrongBackQuotesUsage';
-
-    /**
-     * Direct output code.
-     *
-     * @var string
-     */
-    protected $directOutput = 'DirectOutput';
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [
-            T_ECHO,
-            T_PRINT,
-            T_BACKTICK,
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        if ($tokens[$stackPtr]['code'] === T_BACKTICK) {
-            if ($phpcsFile->findNext(T_BACKTICK, $stackPtr + 1)) {
-                return;
-            }
-            $phpcsFile->addError($this->errorMessageBacktick, $stackPtr, $this->backtickCode);
-            return;
-        }
-        $phpcsFile->addError($this->errorMessage, $stackPtr, $this->directOutput, [$tokens[$stackPtr]['content']]);
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php b/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php
deleted file mode 100644
index b6af3f37cf114..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\LiteralNamespaces;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Custom phpcs sniff to detect usages of literal class and interface names.
- */
-class LiteralNamespacesSniff implements Sniff
-{
-    /**
-     * @var string
-     */
-    private $literalNamespacePattern = '/^[\\\]{0,2}[A-Z][A-Za-z]+([\\\]{1,2}[A-Z][A-Za-z]+){2,}(?!\\\+)$/';
-
-    /**
-     * @var array
-     */
-    private $classNames = [];
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [
-            T_CONSTANT_ENCAPSED_STRING,
-            T_DOUBLE_QUOTED_STRING,
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $sourceFile, $stackPtr)
-    {
-        $tokens = $sourceFile->getTokens();
-        if ($sourceFile->findPrevious(T_STRING_CONCAT, $stackPtr, $stackPtr - 3) ||
-            $sourceFile->findNext(T_STRING_CONCAT, $stackPtr, $stackPtr + 3)
-        ) {
-            return;
-        }
-
-        $content = trim($tokens[$stackPtr]['content'], "\"'");
-        // replace double slashes from class name for avoiding problems with class autoload
-        if (strpos($content, '\\') !== false) {
-            $content = preg_replace('|\\\{2,}|', '\\', $content);
-        }
-
-        if (preg_match($this->literalNamespacePattern, $content) === 1 && $this->classExists($content)) {
-            $sourceFile->addError(
-                "Use ::class notation instead.",
-                $stackPtr,
-                'LiteralClassUsage'
-            );
-        }
-    }
-
-    /**
-     * @param string $className
-     * @return bool
-     */
-    private function classExists($className)
-    {
-        if (!isset($this->classNames[$className])) {
-            $this->classNames[$className] = class_exists($className) || interface_exists($className);
-        }
-        return $this->classNames[$className];
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php b/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php
deleted file mode 100644
index 928fc3a0defdc..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\MicroOptimizations;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-class IsNullSniff implements Sniff
-{
-    /**
-     * @var string
-     */
-    protected $blacklist = 'is_null';
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_STRING];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $sourceFile, $stackPtr)
-    {
-        $tokens = $sourceFile->getTokens();
-        if ($tokens[$stackPtr]['content'] === $this->blacklist) {
-            $sourceFile->addError(
-                "is_null must be avoided. Use strict comparison instead.",
-                $stackPtr,
-                'IsNullUsage'
-            );
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
deleted file mode 100644
index 6a7a0d2b1432c..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\NamingConventions;
-
-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
-     */
-    public function register()
-    {
-        return [T_INTERFACE];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $sourceFile, $stackPtr)
-    {
-        $tokens = $sourceFile->getTokens();
-        $declarationLine = $tokens[$stackPtr]['line'];
-        $suffixLength = strlen(self::INTERFACE_SUFFIX);
-        // Find first T_STRING after 'interface' keyword in the line and verify it
-        while ($tokens[$stackPtr]['line'] == $declarationLine) {
-            if ($tokens[$stackPtr]['type'] == 'T_STRING') {
-                if (substr($tokens[$stackPtr]['content'], 0 - $suffixLength) != self::INTERFACE_SUFFIX) {
-                    $sourceFile->addError(
-                        'Interface should have name that ends with "Interface" suffix.',
-                        $stackPtr,
-                        'WrongInterfaceName'
-                    );
-                }
-                break;
-            }
-            $stackPtr++;
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
deleted file mode 100644
index b81c250338e1d..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\NamingConventions;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Validates that class name is not reserved word.
- */
-class ReservedWordsSniff implements Sniff
-{
-    /**
-     * The following words cannot be used to name a class, interface or trait,
-     * and they are also prohibited from being used in namespaces.
-     *
-     * @link http://php.net/manual/en/reserved.other-reserved-words.php
-     *
-     * @var string[]
-     */
-    protected $reservedWords = [
-        'int' => '7',
-        'float' => '7',
-        'bool' => '7',
-        'string' => '7',
-        'true' => '7',
-        'false' => '7',
-        'null' => '7',
-        'void' => '7.1',
-        'iterable' => '7.1',
-        'resource' => '7',
-        'object' => '7',
-        'mixed' => '7',
-        'numeric' => '7',
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_CLASS, T_INTERFACE, T_TRAIT, T_NAMESPACE];
-    }
-
-    /**
-     * Check all namespace parts
-     *
-     * @param File $sourceFile
-     * @param int $stackPtr
-     * @return void
-     */
-    protected function validateNamespace(File $sourceFile, $stackPtr)
-    {
-        $stackPtr += 2;
-        $tokens = $sourceFile->getTokens();
-        while ($stackPtr < $sourceFile->numTokens && $tokens[$stackPtr]['code'] !== T_SEMICOLON) {
-            if ($tokens[$stackPtr]['code'] === T_WHITESPACE || $tokens[$stackPtr]['code'] === T_NS_SEPARATOR) {
-                $stackPtr++; //skip "namespace" and whitespace
-                continue;
-            }
-            $namespacePart = $tokens[$stackPtr]['content'];
-            if (isset($this->reservedWords[strtolower($namespacePart)])) {
-                $sourceFile->addError(
-                    'Cannot use "%s" in namespace as it is reserved since PHP %s',
-                    $stackPtr,
-                    'Namespace',
-                    [$namespacePart, $this->reservedWords[strtolower($namespacePart)]]
-                );
-            }
-            $stackPtr++;
-        }
-    }
-
-    /**
-     * Check class name not having reserved words
-     *
-     * @param File $sourceFile
-     * @param int $stackPtr
-     * @return void
-     */
-    protected function validateClass(File $sourceFile, $stackPtr)
-    {
-        $tokens = $sourceFile->getTokens();
-        $stackPtr += 2; //skip "class" and whitespace
-        $className = strtolower($tokens[$stackPtr]['content']);
-        if (isset($this->reservedWords[$className])) {
-            $sourceFile->addError(
-                'Cannot use "%s" as class name as it is reserved since PHP %s',
-                $stackPtr,
-                'Class',
-                [$className, $this->reservedWords[$className]]
-            );
-        }
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $sourceFile, $stackPtr)
-    {
-        $tokens = $sourceFile->getTokens();
-        switch ($tokens[$stackPtr]['code']) {
-            case T_CLASS:
-            case T_INTERFACE:
-            case T_TRAIT:
-                $this->validateClass($sourceFile, $stackPtr);
-                break;
-            case T_NAMESPACE:
-                $this->validateNamespace($sourceFile, $stackPtr);
-                break;
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php b/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php
deleted file mode 100644
index 54cf1d462c300..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\Security;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
-
-/**
- * Detects executable regular expressions.
- *
- * Example: echo preg_replace('|^(.*)$|ei', '"\1"', 'get_input');
- */
-class ExecutableRegExSniff implements Sniff
-{
-    /**
-     * String representation of error.
-     *
-     * @var string
-     */
-    // @codingStandardsIgnoreLine
-    protected $errorMessage = "Possible executable regular expression in %s. Make sure that the pattern doesn't contain 'e' modifier";
-
-    /**
-     * Error violation code.
-     *
-     * @var string
-     */
-    protected $errorCode = 'PossibleExecutableRegEx';
-
-    /**
-     * Observed function.
-     *
-     * @var array
-     */
-    protected $function = 'preg_replace';
-
-    /**
-     * List of ignored tokens.
-     *
-     * @var array
-     */
-    protected $ignoreTokens = [
-        T_DOUBLE_COLON,
-        T_OBJECT_OPERATOR,
-        T_FUNCTION,
-        T_CONST,
-        T_CLASS,
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_STRING];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        if ($tokens[$stackPtr]['content'] !== $this->function) {
-            return;
-        }
-        $prevToken = $phpcsFile->findPrevious(T_WHITESPACE, $stackPtr - 1, null, true);
-        if (in_array($tokens[$prevToken]['code'], $this->ignoreTokens)) {
-            return;
-        }
-        $nextToken = $phpcsFile->findNext([T_WHITESPACE, T_OPEN_PARENTHESIS], $stackPtr + 1, null, true);
-        if (in_array($tokens[$nextToken]['code'], Tokens::$stringTokens)
-            && preg_match('/[#\/|~\}\)][imsxADSUXJu]*e[imsxADSUXJu]*.$/', $tokens[$nextToken]['content'])
-        ) {
-            $phpcsFile->addError(
-                $this->errorMessage,
-                $stackPtr,
-                $this->errorCode,
-                [$tokens[$stackPtr]['content']]
-            );
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php b/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php
deleted file mode 100644
index aea1ddc1efa91..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\Strings;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Detects misusing of IS_IDENTICAL operators when `strpos` and `stripos` functions are used in a condition.
- *
- * Examples:
- * if (!strpos($haystack, $needle)) {}
- * if (stripos($haystack, $needle) == false) {}
- */
-class StringPositionSniff implements Sniff
-{
-    /**
-     * String representation of error.
-     *
-     * @var string
-     */
-    protected $errorMessage = 'Identical operator === is not used for testing the return value of %s function';
-
-    /**
-     * Error violation code.
-     *
-     * @var string
-     */
-    protected $errorCode = 'ImproperValueTesting';
-
-    /**
-     * Searched functions.
-     *
-     * @var array
-     */
-    protected $functions = [
-        'strpos',
-        'stripos',
-    ];
-
-    /**
-     * All tokens from current file.
-     *
-     * @var array
-     */
-    protected $tokens = [];
-
-    /**
-     * PHP_CodeSniffer file.
-     *
-     * @var File
-     */
-    protected $file;
-
-    /**
-     * Left limit for search of identical operators.
-     *
-     * @var int
-     */
-    protected $leftLimit;
-
-    /**
-     * Right limit for search of identical operators.
-     *
-     * @var int
-     */
-    protected $rightLimit;
-
-    /**
-     * List of tokens which declares left bound of current scope.
-     *
-     * @var array
-     */
-    protected $leftRangeTokens = [
-        T_IS_IDENTICAL,
-        T_IS_NOT_IDENTICAL,
-        T_OPEN_PARENTHESIS,
-        T_BOOLEAN_AND,
-        T_BOOLEAN_OR,
-    ];
-
-    /**
-     * List of tokens which declares right bound of current scope.
-     *
-     * @var array
-     */
-    protected $rightRangeTokens = [
-        T_IS_IDENTICAL,
-        T_IS_NOT_IDENTICAL,
-        T_CLOSE_PARENTHESIS,
-        T_BOOLEAN_AND,
-        T_BOOLEAN_OR,
-    ];
-
-    /**
-     * List of tokens which declares identical operators.
-     *
-     * @var array
-     */
-    protected $identical = [
-        T_IS_IDENTICAL,
-        T_IS_NOT_IDENTICAL,
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_IF, T_ELSEIF];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $this->tokens = $phpcsFile->getTokens();
-        $this->file = $phpcsFile;
-        $this->leftLimit = $open = $this->tokens[$stackPtr]['parenthesis_opener'];
-        $this->rightLimit = $close = $this->tokens[$stackPtr]['parenthesis_closer'];
-        for ($i = ($open + 1); $i < $close; $i++) {
-            if (($this->tokens[$i]['code'] === T_STRING && in_array($this->tokens[$i]['content'], $this->functions))
-                && (!$this->findIdentical($i - 1, $this->findFunctionParenthesisCloser($i) + 1))
-            ) {
-                $foundFunctionName = $this->tokens[$i]['content'];
-                $phpcsFile->addError($this->errorMessage, $i, $this->errorCode, [$foundFunctionName]);
-            }
-        }
-    }
-
-    /**
-     * Recursively finds identical operators in current scope.
-     *
-     * @param int $leftCurrentPosition
-     * @param int $rightCurrentPosition
-     * @return bool
-     */
-    protected function findIdentical($leftCurrentPosition, $rightCurrentPosition)
-    {
-        $leftBound = $this->file->findPrevious($this->leftRangeTokens, $leftCurrentPosition, $this->leftLimit - 1);
-        $rightBound = $this->file->findNext($this->rightRangeTokens, $rightCurrentPosition, $this->rightLimit + 1);
-        $leftToken = $this->tokens[$leftBound];
-        $rightToken = $this->tokens[$rightBound];
-        if ($leftToken['code'] === T_OPEN_PARENTHESIS && $rightToken['code'] === T_CLOSE_PARENTHESIS) {
-            return $this->findIdentical($leftBound - 1, $rightBound + 1);
-        } else {
-            return (
-                in_array($leftToken['code'], $this->identical) || in_array($rightToken['code'], $this->identical)
-            ) ?: false;
-        }
-    }
-
-    /**
-     * Finds the position of close parenthesis of detected function.
-     *
-     * @param int $currentPosition
-     * @return mixed
-     */
-    protected function findFunctionParenthesisCloser($currentPosition)
-    {
-        $nextOpenParenthesis = $this->file->findNext(T_OPEN_PARENTHESIS, $currentPosition, $this->rightLimit);
-        return $nextOpenParenthesis ? $this->tokens[$nextOpenParenthesis]['parenthesis_closer'] : false;
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
deleted file mode 100644
index 50fddb240b30b..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\Translation;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
- * Make sure that constants are not used as the first argument of translation function.
- */
-class ConstantUsageSniff implements Sniff
-{
-    /**
-     * Having previous line content allows to process multi-line declaration.
-     *
-     * @var string
-     */
-    protected $previousLineContent = '';
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_OPEN_TAG];
-    }
-
-    /**
-     * Copied from \Generic_Sniffs_Files_LineLengthSniff, minor changes made
-     *
-     * {@inheritdoc}
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile
-     * @param int $stackPtr
-     * @return void|int
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Make sure this is the first open tag
-        $previousOpenTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
-        if ($previousOpenTag !== false) {
-            return;
-        }
-
-        $tokenCount = 0;
-        $currentLineContent = '';
-        $currentLine = 1;
-
-        for (; $tokenCount < $phpcsFile->numTokens; $tokenCount++) {
-            if ($tokens[$tokenCount]['line'] === $currentLine) {
-                $currentLineContent .= $tokens[$tokenCount]['content'];
-            } else {
-                $this->checkIfFirstArgumentConstant($phpcsFile, ($tokenCount - 1), $currentLineContent);
-                $currentLineContent = $tokens[$tokenCount]['content'];
-                $currentLine++;
-            }
-        }
-
-        $this->checkIfFirstArgumentConstant($phpcsFile, ($tokenCount - 1), $currentLineContent);
-    }
-
-    /**
-     * Checks if first argument of \Magento\Framework\Phrase or translation function is a constant
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @param string $lineContent
-     * @return void
-     */
-    private function checkIfFirstArgumentConstant(
-        File $phpcsFile,
-        $stackPtr,
-        $lineContent
-    ) {
-        $previousLineRegexp = '/(__|Phrase)\($/im';
-        $currentLineRegexp = '/(__|Phrase)\(.+\)/';
-        $currentLineMatch = preg_match($currentLineRegexp, $lineContent) !== 0;
-        $previousLineMatch = preg_match($previousLineRegexp, $this->previousLineContent) !== 0;
-        $this->previousLineContent = $lineContent;
-        $error = 'Constants are not allowed as the first argument of translation function, use string literal instead';
-        $constantRegexp = '[^\$\'"]+::[A-Z_0-9]+.*';
-        if ($currentLineMatch) {
-            $variableRegexp = "/(__|Phrase)\({$constantRegexp}\)/";
-            if (preg_match($variableRegexp, $lineContent) !== 0) {
-                $phpcsFile->addError($error, $stackPtr, 'VariableTranslation');
-            }
-        } elseif ($previousLineMatch) {
-            $variableRegexp = "/^{$constantRegexp}/";
-            if (preg_match($variableRegexp, $lineContent) !== 0) {
-                $phpcsFile->addError($error, $stackPtr, 'VariableTranslation');
-            }
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Variables/GlobalVariablesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Variables/GlobalVariablesSniff.php
deleted file mode 100644
index 2c4ce8f94af41..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Variables/GlobalVariablesSniff.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sniffs\Variables;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Sniff prohibiting usage of global variables.
- */
-class GlobalVariablesSniff implements Sniff
-{
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_VARIABLE];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        if (preg_match('/^\$[_A-Z0-9]+$/', $tokens[$stackPtr]['content'])) {
-            $phpcsFile->addError(
-                'Usage of global variables is not allowed: ' . $tokens[$stackPtr]['content'],
-                $stackPtr,
-                'ERROR'
-            );
-            return;
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php b/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
deleted file mode 100644
index 8e34727533bdd..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\Whitespace;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Class EmptyLineMissedSniff
- */
-class EmptyLineMissedSniff implements Sniff
-{
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_DOC_COMMENT];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        if ($this->doCheck($phpcsFile, $stackPtr, $tokens)) {
-            $previous = $phpcsFile->findPrevious(T_WHITESPACE, $stackPtr - 1, null, true);
-            if ($tokens[$stackPtr]['line'] - $tokens[$previous]['line'] < 2) {
-                $error = 'Empty line missed';
-                $phpcsFile->addError($error, $stackPtr, '', null);
-            }
-        }
-    }
-
-    /**
-     * Execute empty line missed check.
-     *
-     * @param File $phpcsFile
-     * @param int $stackPtr
-     * @param array $tokens
-     * @return bool
-     */
-    private function doCheck(File $phpcsFile, $stackPtr, $tokens)
-    {
-        $result = false;
-        if ($phpcsFile->hasCondition($stackPtr, T_CLASS) || $phpcsFile->hasCondition($stackPtr, T_INTERFACE)) {
-            $result = true;
-        }
-
-        if ($phpcsFile->hasCondition($stackPtr, T_FUNCTION)) {
-            $result = false;
-        }
-        $previous = $phpcsFile->findPrevious(T_WHITESPACE, $stackPtr - 1, null, true);
-        if ($tokens[$previous]['type'] === 'T_OPEN_CURLY_BRACKET') {
-            $result = false;
-        }
-
-        if (strpos($tokens[$stackPtr]['content'], '/**') === false) {
-            $result = false;
-        }
-
-        return $result;
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
deleted file mode 100644
index c862b019ae10d..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\Whitespace;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Class MultipleEmptyLinesSniff
- */
-class MultipleEmptyLinesSniff implements Sniff
-{
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_WHITESPACE];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        if ($phpcsFile->hasCondition($stackPtr, T_FUNCTION)
-            || $phpcsFile->hasCondition($stackPtr, T_CLASS)
-            || $phpcsFile->hasCondition($stackPtr, T_INTERFACE)
-        ) {
-            if ($tokens[($stackPtr - 1)]['line'] < $tokens[$stackPtr]['line']
-                && $tokens[($stackPtr - 2)]['line'] === $tokens[($stackPtr - 1)]['line']
-            ) {
-                // This is an empty line and the line before this one is not
-                // empty, so this could be the start of a multiple empty line block
-                $next  = $phpcsFile->findNext(T_WHITESPACE, $stackPtr, null, true);
-                $lines = $tokens[$next]['line'] - $tokens[$stackPtr]['line'];
-                if ($lines > 1) {
-                    $error = 'Code must not contain multiple empty lines in a row; found %s empty lines';
-                    $data  = [$lines];
-                    $phpcsFile->addError($error, $stackPtr, 'MultipleEmptyLines', $data);
-                }
-            }
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
index 225be94958d0b..2cd1d0969c4b2 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
@@ -54,6 +54,7 @@ class CodeSniffer implements ToolInterface, ExtensionInterface
     public function __construct($rulesetDir, $reportFile, Wrapper $wrapper)
     {
         $this->rulesetDir = $rulesetDir;
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         if (!file_exists($rulesetDir) && file_exists($fullPath = realpath(__DIR__ . '/../../../../' . $rulesetDir))) {
             $this->rulesetDir = $fullPath;
         }
@@ -62,7 +63,7 @@ public function __construct($rulesetDir, $reportFile, Wrapper $wrapper)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setExtensions(array $extensions)
     {
@@ -80,7 +81,7 @@ public function canRun()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function run(array $whiteList)
     {
@@ -97,10 +98,10 @@ public function run(array $whiteList)
         $settings['files'] = $whiteList;
         $settings['standards'] = [$this->rulesetDir];
         $settings['extensions'] = $this->extensions;
-        $settings['warningSeverity'] = 0;
         $settings['reports']['full'] = $this->reportFile;
         $this->wrapper->setSettings($settings);
 
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         ob_start();
         $result = $this->wrapper->runPHPCS();
         ob_end_clean();
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php b/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
deleted file mode 100644
index 516f169227a9f..0000000000000
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
+++ /dev/null
@@ -1,441 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\TestFramework\Utility;
-
-/**
- * A helper find not escaped output in phtml templates
- */
-class XssOutputValidator
-{
-    const ESCAPE_NOT_VERIFIED_PATTERN = '/\* @escapeNotVerified \*/';
-
-    const ESCAPED_PATTERN = '/\* @noEscape \*/';
-
-    /**
-     * Store origin for replacements
-     *
-     * @var array
-     */
-    private $origins = [];
-
-    /**
-     * Store replacements
-     *
-     * @var array
-     */
-    private $replacements = [];
-
-    /**
-     * Array of escape functions
-     *
-     * @var string[]
-     */
-    private $escapeFunctions = ['escapeHtml', 'escapeHtmlAttr', 'escapeUrl', 'escapeJs', 'escapeCss'];
-
-    /**
-     *
-     * @param string $file
-     * @return string
-     */
-    public function getLinesWithXssSensitiveOutput($file)
-    {
-        $fileContent = file_get_contents($file);
-        $xssUnsafeBlocks = $this->getXssUnsafeBlocks($fileContent);
-
-        $lines = [];
-        foreach ($xssUnsafeBlocks as $block) {
-            $lines = array_merge($lines, $this->findBlockLineNumbers($block, $fileContent));
-        }
-
-        if (count($lines)) {
-            $lines = array_unique($lines);
-            sort($lines);
-            return implode(',', $lines);
-        }
-
-        return '';
-    }
-
-    /**
-     * Find block line numbers
-     *
-     * @param string $block
-     * @param string $content
-     * @return array
-     */
-    private function findBlockLineNumbers($block, $content)
-    {
-        $results = [];
-        $pos = strpos($content, $block, 0);
-        while ($pos !== false) {
-            $contentBeforeString = substr($content, 0, $pos);
-            if ($this->isNotEscapeMarkedBlock($contentBeforeString)
-                && $this->isNotInCommentBlock($contentBeforeString)
-            ) {
-                $results[] = count(explode(PHP_EOL, $contentBeforeString));
-            }
-            $pos = strpos($content, $block, $pos + 1);
-        }
-
-        return $results;
-    }
-
-    /**
-     * Get XSS unsafe output blocks
-     *
-     * @param string $fileContent
-     * @return array
-     */
-    public function getXssUnsafeBlocks($fileContent)
-    {
-        $results = [];
-
-        $fileContent = $this->replacePhpQuoteWithPlaceholders($fileContent);
-        $fileContent = $this->replacePhpCommentsWithPlaceholders($fileContent);
-
-        $this->addOriginReplacement('\'\'', "'-*=single=*-'");
-        $this->addOriginReplacement('""', '"-*=double=*-"');
-
-        if (preg_match_all('/<[?](php|=)(.*?)[?]>/sm', $fileContent, $phpBlockMatches)) {
-            foreach ($phpBlockMatches[2] as $index => $phpBlock) {
-                $phpCommands = explode(';', $phpBlock);
-                if ($phpBlockMatches[1][$index] == 'php') {
-                    $echoCommands = preg_grep('#( |^|/\*.*?\*/)echo[\s(]+.*#sm', $phpCommands);
-                } else {
-                    $echoCommands[] = $phpBlockMatches[0][$index];
-                }
-                $results = array_merge(
-                    $results,
-                    $this->getEchoUnsafeCommands($echoCommands)
-                );
-            }
-        }
-
-        $this->clearOriginReplacements();
-        $results = array_unique($results);
-
-        return $results;
-    }
-
-    /**
-     * @param array $echoCommands
-     * @return array
-     */
-    private function getEchoUnsafeCommands(array $echoCommands)
-    {
-        $results = [];
-        foreach ($echoCommands as $echoCommand) {
-            if ($this->isNotEscapeMarkedCommand($echoCommand)) {
-                $echoCommand = preg_replace('/^(.*?)echo/sim', 'echo', $echoCommand);
-                $preparedEchoCommand = $this->prepareEchoCommand($echoCommand);
-                $isEscapeFunctionArgument = preg_match(
-                    '/->(' . implode('|', $this->escapeFunctions) . ')\(.*?\)$/sim',
-                    $preparedEchoCommand
-                );
-                $xssUnsafeCommands = array_filter(
-                    $isEscapeFunctionArgument ? [$preparedEchoCommand] : explode('.', $preparedEchoCommand),
-                    [$this, 'isXssUnsafeCommand']
-                );
-                if (count($xssUnsafeCommands)) {
-                    $results[] = str_replace(
-                        $this->getReplacements(),
-                        $this->getOrigins(),
-                        $echoCommand
-                    );
-                }
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * @param string $command
-     * @return string
-     */
-    private function prepareEchoCommand($command)
-    {
-        $command = preg_replace('/<[?]=(.*?)[?]>/sim', '\1', $command);
-        return trim(ltrim(explode(';', $command)[0], 'echo'));
-    }
-
-    /**
-     * @param string $contentBeforeString
-     * @return bool
-     */
-    private function isNotEscapeMarkedBlock($contentBeforeString)
-    {
-        return !preg_match(
-            '%(' . self::ESCAPE_NOT_VERIFIED_PATTERN . '|' . self::ESCAPED_PATTERN . ')$%sim',
-            trim($contentBeforeString)
-        );
-    }
-
-    /**
-     * @param string $contentBeforeString
-     * @return bool
-     */
-    private function isNotInCommentBlock($contentBeforeString)
-    {
-        $contentBeforeString = explode('<?php', $contentBeforeString);
-        $contentBeforeString = preg_replace(
-            '%/\*.*?\*/%si',
-            '',
-            end($contentBeforeString)
-        );
-
-        return (strpos($contentBeforeString, '/*') === false);
-    }
-
-    /**
-     * @param string $command
-     * @return bool
-     */
-    private function isNotEscapeMarkedCommand($command)
-    {
-        return !preg_match(
-            '%' . self::ESCAPE_NOT_VERIFIED_PATTERN . '|' . self::ESCAPED_PATTERN . '%sim',
-            $command
-        );
-    }
-
-    /**
-     * Check if command is xss unsafe
-     *
-     * @param string $command
-     * @return bool
-     */
-    public function isXssUnsafeCommand($command)
-    {
-        $command = trim($command);
-
-        switch (true) {
-            case preg_match(
-                '/->(' . implode('|', $this->escapeFunctions) . '|.*html.*)\(/simU',
-                $this->getLastMethod($command)
-            ):
-                return false;
-            case preg_match('/^\((int|bool|float)\)/sim', $command):
-                return false;
-            case preg_match('/^count\(/sim', $command):
-                return false;
-            case preg_match("/^'.*'$/sim", $command):
-                return false;
-            case preg_match('/^".*?"$/sim', $command, $matches):
-                return $this->isContainPhpVariables($this->getOrigin($matches[0]));
-            default:
-                return true;
-        }
-    }
-
-    /**
-     * @param string $command
-     * @return string
-     */
-    private function getLastMethod($command)
-    {
-        if (preg_match_all(
-            '/->.*?\(.*?\)/sim',
-            $this->clearMethodBracketContent($command),
-            $matches
-        )) {
-            $command = end($matches[0]);
-            $command = substr($command, 0, strpos($command, '(') + 1);
-        }
-
-        return $command;
-    }
-
-    /**
-     * @param string $command
-     * @return string
-     */
-    private function clearMethodBracketContent($command)
-    {
-        $bracketInterval = [];
-        $bracketOpenPos = [];
-        $command = str_split($command);
-        foreach ($command as $index => $character) {
-            if ($character == '(') {
-                array_push($bracketOpenPos, $index);
-            }
-            if (count($bracketOpenPos)) {
-                if ($character == ')') {
-                    $lastOpenPos = array_pop($bracketOpenPos);
-                    if (count($bracketOpenPos) == 0) {
-                        $bracketInterval[] = [$lastOpenPos, $index];
-                    }
-                }
-            }
-        }
-        foreach ($bracketInterval as $interval) {
-            for ($i = $interval[0] + 1; $i < $interval[1]; $i++) {
-                unset($command[$i]);
-            }
-        }
-        $command = implode('', $command);
-
-        return $command;
-    }
-
-    /**
-     * @param string $content
-     * @return int
-     */
-    private function isContainPhpVariables($content)
-    {
-        return preg_match('/[^\\\\]\$[a-z_\x7f-\xff]/sim', $content);
-    }
-
-    /**
-     * @param string $fileContent
-     * @return string
-     */
-    private function replacePhpQuoteWithPlaceholders($fileContent)
-    {
-        $origins = [];
-        $replacements = [];
-        if (preg_match_all('/<[?](php|=)(.*?)[?]>/sm', $fileContent, $phpBlockMatches)) {
-            foreach ($phpBlockMatches[2] as $phpBlock) {
-                $phpBlockQuoteReplaced = preg_replace(
-                    ['/([^\\\\])\'\'/si', '/([^\\\\])""/si'],
-                    ["\1'-*=single=*-'", '\1"-*=double=*-"'],
-                    $phpBlock
-                );
-
-                $this->addQuoteOriginsReplacements(
-                    $phpBlockQuoteReplaced,
-                    [
-                        '/([^\\\\])([\'])(.*?)([^\\\\])([\'])/sim'
-                    ]
-                );
-                $this->addQuoteOriginsReplacements(
-                    $phpBlockQuoteReplaced,
-                    [
-                        '/([^\\\\])(["])(.*?)([^\\\\])(["])/sim',
-                    ]
-                );
-
-                $origins[] = $phpBlock;
-                $replacements[]  = str_replace(
-                    $this->getOrigins(),
-                    $this->getReplacements(),
-                    $phpBlockQuoteReplaced
-                );
-            }
-        }
-
-        return str_replace($origins, $replacements, $fileContent);
-    }
-
-    /**
-     * @param string $fileContent
-     * @return string
-     */
-    private function replacePhpCommentsWithPlaceholders($fileContent)
-    {
-        $origins= [];
-        $replacements = [];
-        if (preg_match_all('%/\*.*?\*/%simu', $fileContent, $docCommentMatches, PREG_SET_ORDER)) {
-            foreach ($docCommentMatches as $docCommentMatch) {
-                if ($this->isNotEscapeMarkedCommand($docCommentMatch[0])
-                    && !$this->issetOrigin($docCommentMatch[0])) {
-                    $origin = $docCommentMatch[0];
-                    $replacement = '-*!' . count($this->getOrigins()) . '!*-';
-                    $origins[] = $origin;
-                    $replacements[] = $replacement;
-                    $this->addOriginReplacement(
-                        $origin,
-                        $replacement
-                    );
-                }
-            }
-        }
-
-        return str_replace($origins, $replacements, $fileContent);
-    }
-
-    /**
-     * Add replacements for expressions in single and double quotes
-     *
-     * @param string $phpBlock
-     * @param array $patterns
-     * @return void
-     */
-    private function addQuoteOriginsReplacements($phpBlock, array $patterns)
-    {
-        foreach ($patterns as $pattern) {
-            if (preg_match_all($pattern, $phpBlock, $quoteMatches, PREG_SET_ORDER)) {
-                foreach ($quoteMatches as $quoteMatch) {
-                    $origin = $quoteMatch[2] . $quoteMatch[3] . $quoteMatch[4] . $quoteMatch[5];
-                    if (!$this->issetOrigin($origin)) {
-                        $this->addOriginReplacement(
-                            $origin,
-                            $quoteMatch[2] . '-*=' . count($this->getOrigins()) . '=*-' . $quoteMatch[5]
-                        );
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string $origin
-     * @param string $replacement
-     * @return void
-     */
-    private function addOriginReplacement($origin, $replacement)
-    {
-        $this->origins[$replacement] = $origin;
-        $this->replacements[$replacement] = $replacement;
-    }
-
-    /**
-     * Clear origins and replacements
-     *
-     * @return void
-     */
-    private function clearOriginReplacements()
-    {
-        $this->origins = [];
-        $this->replacements = [];
-    }
-
-    /**
-     * @return array
-     */
-    private function getOrigins()
-    {
-        return $this->origins;
-    }
-
-    /**
-     * @param string $key
-     * @return string|null
-     */
-    private function getOrigin($key)
-    {
-        return array_key_exists($key, $this->origins) ? $this->origins[$key] : null;
-    }
-
-    /**
-     * @param string $origin
-     * @return bool
-     */
-    private function issetOrigin($origin)
-    {
-        return in_array($origin, $this->origins);
-    }
-
-    /**
-     * @return array
-     */
-    private function getReplacements()
-    {
-        return $this->replacements;
-    }
-}
diff --git a/dev/tests/static/framework/Magento/ruleset.xml b/dev/tests/static/framework/Magento/ruleset.xml
index 9dde4b7bd7d32..70d1810d1eb2f 100644
--- a/dev/tests/static/framework/Magento/ruleset.xml
+++ b/dev/tests/static/framework/Magento/ruleset.xml
@@ -7,83 +7,12 @@
 -->
 <ruleset name="Magento">
     <description>Custom Magento coding standard.</description>
+    <rule ref="./../../../../../vendor/magento/magento-coding-standard/Magento2"/>
 
-    <rule ref="PSR2"/>
-
-    <rule ref="PSR2.Files.ClosingTag">
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
-
-    <rule ref="Magento.Files.LineLength">
-        <properties>
-            <property name="lineLimit" value="120"/>
-            <property name="absoluteLineLimit" value="120"/>
-        </properties>
-    </rule>
-    <rule ref="Magento.LanguageConstructs.LanguageConstructs">
-        <include-pattern>*/app/code/*\.(?!phtml)</include-pattern>
-    </rule>
-    <rule ref="Magento.LiteralNamespaces.LiteralNamespaces">
-        <exclude-pattern>*/_files/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento.Annotation.MethodArguments">
+    <!-- ToDo: Improve Annotation sniffs in magento/magento-coding-standard and remove from here. -->
+    <rule ref="Magento.Annotation">
         <exclude-pattern>*/_files/*</exclude-pattern>
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/Magento/Inventory*/*</exclude-pattern>
     </rule>
-    <rule ref="Magento.Annotation.MethodAnnotationStructure">
-        <include-pattern>*\.(php)</include-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Magento/Inventory*/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento.Annotation.ClassAnnotationStructure">
-        <include-pattern>*\.(php)</include-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-        <exclude-pattern>*Test.php</exclude-pattern>
-        <exclude-pattern>*/_files/*</exclude-pattern>
-        <exclude-pattern>*/Magento/Inventory*/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento.Functions.OutputBuffering">
-        <include-pattern>*/(app/code|vendor|setup/src|lib/internal/Magento)/*</include-pattern>
-        <exclude-pattern>*/lib/internal/Magento/Framework/Image/Adapter/Gd2.php</exclude-pattern>
-        <exclude-pattern>*/lib/internal/Magento/Framework/View/Result/Page.php</exclude-pattern>
-        <exclude-pattern>*/lib/internal/Magento/Framework/View/TemplateEngine/Php.php</exclude-pattern>
-        <exclude-pattern>*/Test/Unit/*</exclude-pattern>
-    </rule>
-    <rule ref="Magento.Variables.GlobalVariables">
-        <include-pattern>*/(app/code|vendor|setup/src)/*</include-pattern>
-        <exclude-pattern>*/setup/src/Magento/Setup/Controller/WebConfiguration.php</exclude-pattern>
-        <exclude-pattern>*/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Eav/Model/Attribute/Data/File.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Backend/App/Area/FrontNameResolver.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Cron/Console/Command/CronCommand.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Store/Model/Store.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Config/Model/Config/Processor/EnvironmentPlaceholder.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Config/Model/Config/Backend/Email/Logo.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Config/Model/Config/Backend/File/RequestData.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/FileUploader/Save.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Customer/Model/Metadata/Form/File.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Customer/Model/FileUploader.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php</exclude-pattern>
-        <exclude-pattern>*/app/code/Magento/Customer/Controller/Adminhtml/File/Customer/Upload.php</exclude-pattern>
-        <exclude-pattern>*/Test/Unit/*</exclude-pattern>
-    </rule>
-
-    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag"/>
-    <rule ref="Generic.Functions.CallTimePassByReference"/>
-    <rule ref="Generic.PHP.DeprecatedFunctions"/>
-
-    <rule ref="Squiz.Commenting.DocCommentAlignment"/>
-    <rule ref="Squiz.Functions.GlobalFunction"/>
-    <rule ref="Squiz.Operators.ValidLogicalOperators"/>
-    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
 </ruleset>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php
deleted file mode 100644
index 0601c3eb26698..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\EchoTags;
-
-class ShortEchoSyntaxSniffTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \PHP_CodeSniffer_File|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $fileMock;
-
-    /**
-     * @var ShortEchoSyntaxSniff
-     */
-    private $shortEchoUsageSniff;
-
-    protected function setUp()
-    {
-        $this->fileMock = $this->getMock(\PHP_CodeSniffer_File::class, [], [], '', false);
-        $this->shortEchoUsageSniff = new ShortEchoSyntaxSniff();
-    }
-
-    /**
-     * @param string $file
-     * @param int $incorrectUsages
-     * @dataProvider processDataProvider
-     */
-    public function testEchoTagSniff($file, $stackPtr, $incorrectUsages)
-    {
-        $fileContent = file_get_contents(__DIR__ . '/_files/' . $file);
-        $tokens = $this->tokenizeString($fileContent);
-
-        $this->fileMock->expects($this->any())
-            ->method('findNext')
-            ->with([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT], $stackPtr + 1, null, true)
-            ->willReturn($stackPtr + 1);
-
-        $this->fileMock->expects($this->once())
-            ->method('getTokens')
-            ->willReturn($tokens);
-
-        $this->fileMock->expects($this->exactly($incorrectUsages))
-            ->method('addError')
-            ->with('Short echo tag syntax must be used; expected "<?=" but found "<?php echo"');
-
-        $this->shortEchoUsageSniff->process($this->fileMock, $stackPtr);
-    }
-
-    /**
-     * Get tokens for a string
-     *
-     * @param string $fileContent
-     * @return array
-     */
-    private function tokenizeString($fileContent)
-    {
-        $tokens = token_get_all($fileContent);
-        $snifferTokens = [];
-        for ($i = 0; $i < count($tokens); $i++) {
-            $code = is_array($tokens[$i]) ? $tokens[$i][0] : $tokens[$i];
-            $content = is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i];
-            $snifferTokens[$i]['code'] = $code;
-            $snifferTokens[$i]['content'] = $content;
-        }
-        return $snifferTokens;
-    }
-
-    /**
-     * @return array
-     */
-    public function processDataProvider()
-    {
-        return [
-            ['incorrect_echotag.txt', 1, 1],
-            ['correct_noecho.txt', 1, 0],
-            ['correct_echotag.txt', 1, 0]
-        ];
-    }
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt
deleted file mode 100644
index fd8027e1e23e6..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-<?= "foo" ?>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt
deleted file mode 100644
index 5b003e1e5cfba..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-<?php $foo = bar; ?>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt
deleted file mode 100644
index 84d72334bf850..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-<?php echo "foo" ?>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
deleted file mode 100644
index 65512653ce3fa..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Sniffs\Translation;
-
-use PHP_CodeSniffer\Files\File;
-
-class ConstantUsageSniffTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var File|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $fileMock;
-
-    /**
-     * @var ConstantUsageSniff
-     */
-    private $constantUsageSniff;
-
-    protected function setUp()
-    {
-        $this->fileMock = $this->createMock(File::class);
-        $this->constantUsageSniff = new ConstantUsageSniff();
-    }
-
-    /**
-     * @param string $file
-     * @param int $numIncorrectUsages
-     * @dataProvider processDataProvider
-     */
-    public function testProcessIncorrectArguments($file, $numIncorrectUsages)
-    {
-        $stackPtr = 10;
-        $fileContent = file_get_contents(__DIR__ . '/_files/' . $file);
-        $tokens = $this->tokenizeString($fileContent);
-        $this->fileMock->expects($this->once())
-            ->method('findPrevious')
-            ->with(
-                T_OPEN_TAG,
-                $stackPtr - 1
-            )
-            ->willReturn(false);
-        $this->fileMock->expects($this->once())
-            ->method('getTokens')
-            ->willReturn($tokens);
-        $this->fileMock->numTokens = count($tokens);
-        $this->fileMock->expects($this->exactly($numIncorrectUsages))
-            ->method('addError')
-            ->with(
-                'Constants are not allowed as the first argument of translation function, use string literal instead',
-                $this->anything(),
-                'VariableTranslation'
-            );
-        $this->constantUsageSniff->process($this->fileMock, $stackPtr);
-    }
-
-    /**
-     * Get tokens for a string
-     *
-     * @param string $fileContent
-     * @return array
-     */
-    private function tokenizeString($fileContent)
-    {
-        $lineNumber = 1;
-        $tokens = token_get_all($fileContent);
-        $snifferTokens = [];
-        for ($i = 0, $count = count($tokens); $i < $count; $i++) {
-            $content = is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i];
-            $snifferTokens[$i]['line'] = $lineNumber;
-            $snifferTokens[$i]['content'] = $content;
-            $trimmedContent = trim($content, ' ');
-            if ($trimmedContent == PHP_EOL || $trimmedContent == PHP_EOL . PHP_EOL) {
-                $lineNumber++;
-            }
-        }
-        return $snifferTokens;
-    }
-
-    /**
-     * @return array
-     */
-    public function processDataProvider()
-    {
-        return [
-            [
-                'incorrect_arguments.txt',
-                9
-            ],
-            [
-                'correct_arguments.txt',
-                0
-            ]
-        ];
-    }
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/correct_arguments.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/correct_arguments.txt
deleted file mode 100644
index 8446fe75cf119..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/correct_arguments.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-__($variable)
-
-__($variable[Class::CONSTANT])
-
-__($variable[\Namespace\Class::CONSTANT])
-
-__($variable['value'])
-
-__(
-    $variable
-)
-
-Phrase($variable)
-
-Phrase($variable[Class::CONSTANT])
-
-Phrase($variable[\Namespace\Class::CONSTANT])
-
-\Magento\Framework\Phrase($variable['value'])
-
-\Magento\Framework\Phrase(
-    $variable[Class::CONSTANT]
-)
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/incorrect_arguments.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/incorrect_arguments.txt
deleted file mode 100644
index 536e715b51185..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/_files/incorrect_arguments.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-__(Class::CONSTANT)
-
-__(self::CONSTANT)
-
-__(\Namespace\Class::CONSTANT)
-
-__(
-    Class::CONSTANT
-)
-
-Phrase(Class::CONSTANT)
-
-Phrase(self::CONSTANT)
-
-Phrase(\Namespace\Class::CONSTANT)
-
-\Magento\Framework\Phrase(Class::CONSTANT)
-
-\Magento\Framework\Phrase(
-    Class::CONSTANT
-)
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
index 85380066cc7f3..ffa99ec8e6ace 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
@@ -7,6 +7,9 @@
 
 use PHP_CodeSniffer\Runner;
 
+/**
+ * Unit test to check CodeSniffer tool.
+ */
 class CodeSnifferTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -48,7 +51,6 @@ public function testRun()
             'files' => $whiteList,
             'standards' => [self::RULE_SET],
             'extensions' => $extensions,
-            'warningSeverity' => 0,
             'reports' => ['full' => self::REPORT_FILE],
         ];
 
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/XssOutputValidatorTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/XssOutputValidatorTest.php
deleted file mode 100644
index ed9d8115cca4e..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/XssOutputValidatorTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestFramework\Utility;
-
-class XssOutputValidatorTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @param string $file
-     * @param string $expectedResults
-     * @dataProvider getLinesWithXssSensitiveOutputDataProvider
-     */
-    public function testGetLinesWithXssSensitiveOutput($file, $expectedResults)
-    {
-        $xssOutputValidator = new XssOutputValidator();
-        $lines = $xssOutputValidator->getLinesWithXssSensitiveOutput($file);
-        static::assertEquals($expectedResults, $lines);
-    }
-
-    /**
-     * @return array
-     */
-    public function getLinesWithXssSensitiveOutputDataProvider()
-    {
-        $fixturePath = __DIR__ . '/_files/';
-        return [
-            'xss_safe' => [$fixturePath . 'xss_safe.phtml', ''],
-            'xss_unsafe' => [$fixturePath . 'xss_unsafe.phtml', '9,10,11,12,13,14,15,16,18,22,23'],
-        ];
-    }
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml
deleted file mode 100644
index 50d2503514d12..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-?>
-
-<?= /* @escapeNotVerified */ $block->getSomeData() ?>
-<?= /* @noEscape */ $block->getSomeData() ?>
-<input name="form_key" type="hidden" value="<?= $block->escapeUrl($var) ?>" />
-<input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr('value') ?>" />
-<input name="form_key" type="hidden" value="<?= $block->escapeJs('value') ?>" />
-<?= $block->escapeCss('value') ?>
-echo $var;
-<?= $block->getHtmlId("some value") ?>
-<?= $block->getIdHtml("some value") ?>
-<?= $block->getIdHtml("some value") ?>
-<?= "\$var1" ?>
-<?= '$var' ?>
-<?= "value" ?>
-<?= 'value' ?>
-<?= (int)$var ?>
-<?= (bool)$var ?>
-<?= count($var) ?>
-<?= $object->methodHtml() ?>
-<?php pecho($var);?>
-<?= $object->methodHtml() .
-    (bool)$var .
-    $block->escapeUrl("some value");
-?>
-<?= /* @noEscape */ '\'' . $code . '\',\'' . $block->escapeHtml($data['parentSymbol']) . '\'' ?>
-<?= $block->getExtendedElement($switchAttributeCode)->toHtml() ?>
-<?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>
-<?php
-/**
- * echo $someVar;
- */
-?>
-
-<?php
-/* This part is commented to remove all <col> tags from the code. */
-/* foreach ($block->getColumns() as $_column): ?>
-    <col <?= $_column->getProperty() ?> />
-<?php endforeach; */ ?>
-
-<?= $block->escapeHtmlAttr($block->getParamValue('title_' . $store['value'])) ?>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml
deleted file mode 100644
index bf3aec540b815..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-?>
-<?= $block->getSomeData() ?>
-<?= $block->getTitle() ?>
-<?= $object->getSomeMethod($block->getHtmlId()) ?>
-<?= "Title: $title" ?>
-<?= $block->escapeUrl($var) . $var . 'value' ?>
-<?= $var ?>
-<?= $someVar ?>
-<?= __("value") ?>
-
-<?= $object->methodHtml() .
-    $var .
-    $block->getSomeData();
-?>
-<?= '\'' . $code . '\',\'' . $block->escapeHtml($data['parentSymbol']) . '\'' ?>
-<?= "\"" . $code . "\",\"" . $block->escapeHtml($data['parentSymbol']) . "\"" ?>
-
-<?php
-/* This part is commented to remove all <col> tags from the code. */
-/* foreach ($block->getColumns() as $_column): ?>
-    <col <?= $_column->getProperty() ?> />
-<?php endforeach; */ ?>
diff --git a/dev/tests/static/phpunit.xml.dist b/dev/tests/static/phpunit.xml.dist
index 8ed80df002dfd..6c02ec1382563 100644
--- a/dev/tests/static/phpunit.xml.dist
+++ b/dev/tests/static/phpunit.xml.dist
@@ -24,9 +24,6 @@
         <testsuite name="Code Integrity Tests">
             <directory>testsuite/Magento/Test/Integrity</directory>
         </testsuite>
-        <testsuite name="Xss Unsafe Output Test">
-            <file>testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php</file>
-        </testsuite>
     </testsuites>
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
index 6edc46090d545..64f53736105d2 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
@@ -42,7 +42,6 @@ class UnsecureFunctionsUsageTest extends \PHPUnit\Framework\TestCase
      */
     public static function setUpBeforeClass()
     {
-        self::loadData(self::$phpUnsecureFunctions, 'unsecure_php_functions*.php');
         self::loadData(self::$jsUnsecureFunctions, 'unsecure_js_functions*.php');
     }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
deleted file mode 100644
index 10c0da47cb2d2..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * Functions that are not secure to use.
- * A <replacement> will be suggested to be used instead.
- * Use <exclude> to specify files and directories that are allowed to use function.
- *
- * Format: [
- *      <class_name> => [
- *          'replacement' => <replacement>,
- *          'exclude' => [
- *              <exclude>,
- *              <exclude>,
- *          ]
- *      ]
- */
-return [
-    'unserialize' => [
-        'replacement' => '\Magento\Framework\Serialize\SerializerInterface::unserialize',
-        'exclude' => [
-            ['type' => 'library', 'name' => 'magento/framework', 'path' => 'DB/Adapter/Pdo/Mysql.php'],
-            ['type' => 'library', 'name' => 'magento/framework', 'path' => 'Serialize/Serializer/Serialize.php'],
-        ]
-    ],
-    'serialize' => [
-        'replacement' => '\Magento\Framework\Serialize\SerializerInterface::serialize',
-        'exclude' => [
-            ['type' => 'library', 'name' => 'magento/framework', 'path' => 'DB/Adapter/Pdo/Mysql.php'],
-            ['type' => 'library', 'name' => 'magento/framework', 'path' => 'Serialize/Serializer/Serialize.php'],
-        ]
-    ],
-    'eval' => [
-        'replacement' => '',
-        'exclude' => []
-    ],
-    'md5' => [
-        'replacement' => '',
-        'exclude' => [
-            /*
-             * Usage of md5 in MessageQueue key generation algorithm
-             * added to exclude list to avoid backward incompatible changes
-             */
-            [
-                'type' => 'library',
-                'name' => 'magento/framework',
-                'path' => 'MessageQueue/Rpc/Publisher.php',
-            ],
-            [
-                'type' => 'library',
-                'name' => 'magento/framework',
-                'path' => 'MessageQueue/MessageController.php',
-            ],
-            [
-                'type' => 'library',
-                'name' => 'magento/framework',
-                'path' => 'MessageQueue/Publisher.php',
-            ],
-            [
-                'type' => 'module',
-                'name' => 'Magento_AsynchronousOperations',
-                'path' => 'Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php'
-            ],
-            [
-                'type' => 'module',
-                'name' => 'Magento_AuthorizenetAcceptjs',
-                'path' => 'Gateway/Validator/TransactionHashValidator.php'
-            ],
-            [
-                'type' => 'module',
-                'name' => 'Magento_Authorizenet',
-                'path' => 'Model/Directpost/Response.php'
-            ]
-        ]
-    ],
-    'srand' => [
-        'replacement' => '',
-        'exclude' => []
-    ],
-    'mt_srand' => [
-        'replacement' => '',
-        'exclude' => []
-    ],
-];
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 21ca0a495dd19..f1c93339b3052 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -77,7 +77,8 @@ public static function getWhitelist(
         $changedFilesBaseDir = '',
         $baseFilesFolder = '',
         $whitelistFile = '/_files/whitelist/common.txt'
-    ) {
+    )
+    {
         $changedFiles = self::getChangedFilesList($changedFilesBaseDir);
         if (empty($changedFiles)) {
             return [];
@@ -116,8 +117,10 @@ private static function getChangedFilesList($changedFilesBaseDir)
             'changed_files*',
             function () {
                 // if no list files, probably, this is the dev environment
+                // phpcs:disable Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
                 @exec('git diff --name-only', $changedFiles);
                 @exec('git diff --cached --name-only', $addedFiles);
+                // phpcs:enable
                 $changedFiles = array_unique(array_merge($changedFiles, $addedFiles));
                 return $changedFiles;
             }
@@ -137,6 +140,7 @@ private static function getAddedFilesList($changedFilesBaseDir)
             'changed_files*.added.*',
             function () {
                 // if no list files, probably, this is the dev environment
+                // phpcs:ignore Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
                 @exec('git diff --cached --name-only', $addedFiles);
                 return $addedFiles;
             }
@@ -158,7 +162,7 @@ private static function getFilesFromListFile($listsBaseDir, $listFilePattern, $n
         $globFilesListPattern = ($listsBaseDir ?: self::getChangedFilesBaseDir())
             . '/_files/' . $listFilePattern;
         $listFiles = glob($globFilesListPattern);
-        if (count($listFiles)) {
+        if (!empty($listFiles)) {
             foreach ($listFiles as $listFile) {
                 $filesDefinedInList = array_merge(
                     $filesDefinedInList,
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php b/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
deleted file mode 100644
index fac14af5ecab8..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Php/XssPhtmlTemplateTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Test\Php;
-
-use Magento\Framework\App\Utility\Files;
-use Magento\TestFramework\Utility\XssOutputValidator;
-use Magento\Framework\Component\ComponentRegistrar;
-
-/**
- * Find not escaped output in phtml templates
- */
-class XssPhtmlTemplateTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @return void
-     */
-    public function testXssSensitiveOutput()
-    {
-        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
-        $xssOutputValidator = new XssOutputValidator();
-        $invoker(
-            /**
-             * Static test will cover the following cases:
-             *
-             * 1. /\* @noEscape \*\/ before output. Output doesn't require escaping. Test is green.
-             * 2. Methods which contains "html" in their names (e.g. echo $object->{suffix}Html{postfix}() ).
-             *    Data is ready for the HTML output. Test is green.
-             * 3. AbstractBlock methods escapeHtml, escapeUrl, escapeQuote, escapeXssInUrl are allowed. Test is green.
-             * 4. Type casting and php function count() are allowed
-             *    (e.g. echo (int)$var, echo (float)$var, echo (bool)$var, echo count($var)). Test is green.
-             * 5. Output in single quotes (e.g. echo 'some text'). Test is green.
-             * 6. Output in double quotes without variables (e.g. echo "some text"). Test is green.
-             * 7. Other of p.1-6. Output is not escaped. Test is red.
-             *
-             * @param string $file
-             */
-            function ($file) use ($xssOutputValidator) {
-                $lines = $xssOutputValidator->getLinesWithXssSensitiveOutput($file);
-                $this->assertEmpty(
-                    $lines,
-                    "Potentially XSS vulnerability. " .
-                    "Please verify that output is escaped at lines " . $lines
-                );
-            },
-            Files::init()->getPhtmlFiles()
-        );
-    }
-
-    /**
-     * @return void
-     */
-    public function testAbsenceOfEscapeNotVerifiedAnnotationInRefinedModules()
-    {
-        $componentRegistrar = new ComponentRegistrar();
-        $exemptModules = [];
-        foreach (array_diff(scandir(__DIR__ . '/_files/whitelist/exempt_modules'), ['..', '.']) as $file) {
-            $exemptModules = array_merge(
-                $exemptModules,
-                include(__DIR__ . '/_files/whitelist/exempt_modules/' . $file)
-            );
-        }
-
-        $result = "";
-        foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $modulePath) {
-            if (in_array($moduleName, $exemptModules)) {
-                continue;
-            }
-            foreach (Files::init()->getFiles([$modulePath], '*.phtml') as $file) {
-                $fileContents = file_get_contents($file);
-                $pattern = "/\\/* @escapeNotVerified \\*\\/ echo (?!__).+/";
-                $instances = preg_grep($pattern, explode("\n", $fileContents));
-                if (!empty($instances)) {
-                    foreach (array_keys($instances) as $line) {
-                        $result .= $file . ':' . ($line + 1) . "\n";
-                    }
-                }
-            }
-        }
-        $this->assertEmpty(
-            $result,
-            "@escapeNotVerified annotation detected.\n" .
-            "Please use the correct escape strategy and remove annotation at:\n" . $result
-        );
-    }
-}
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 7a402818eb0b9..0e3b5fa3d341c 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
@@ -29,9 +29,6 @@
     <rule ref="rulesets/unusedcode.xml" />
 
     <!-- Code design rules -->
-    <rule ref="rulesets/design.xml/ExitExpression" />
-    <rule ref="rulesets/design.xml/EvalExpression" />
-    <rule ref="rulesets/design.xml/GotoStatement" />
     <rule ref="rulesets/design.xml/NumberOfChildren" />
     <rule ref="rulesets/design.xml/DepthOfInheritance">
         <properties>
@@ -46,7 +43,6 @@
     <rule ref="rulesets/naming.xml/BooleanGetMethodName" />
 
     <!-- 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" />
 
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
index 904c41ab9ec33..8ef7fced1bfae 100644
--- a/lib/internal/Magento/Framework/App/Bootstrap.php
+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -244,7 +244,10 @@ public function createApplication($type, $arguments = [])
      * Runs an application
      *
      * @param \Magento\Framework\AppInterface $application
+     * @throws \Exception
      * @return void
+     *
+     * phpcs:disable Magento2.Exceptions
      */
     public function run(AppInterface $application)
     {
@@ -267,13 +270,15 @@ public function run(AppInterface $application)
         } catch (\Exception $e) {
             $this->terminate($e);
         }
-    }
+    } // phpcs:enable
 
     /**
      * Asserts maintenance mode
      *
      * @return void
      * @throws \Exception
+     *
+     * phpcs:disable Magento2.Exceptions
      */
     protected function assertMaintenance()
     {
@@ -299,7 +304,7 @@ protected function assertMaintenance()
             $this->errorCode = self::ERR_MAINTENANCE;
             throw new \Exception('Unable to proceed: the maintenance mode must be enabled first. ');
         }
-    }
+    } // phpcs:enable
 
     /**
      * Asserts whether application is installed
@@ -316,10 +321,12 @@ protected function assertInstalled()
         $isInstalled = $this->isInstalled();
         if (!$isInstalled && $isExpected) {
             $this->errorCode = self::ERR_IS_INSTALLED;
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Error: Application is not installed yet. ');
         }
         if ($isInstalled && !$isExpected) {
             $this->errorCode = self::ERR_IS_INSTALLED;
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Error: Application is already installed. ');
         }
     }
@@ -412,12 +419,13 @@ public function isDeveloperMode()
      * Display an exception and terminate program execution
      *
      * @param \Exception $e
+     * @throws \DomainException
      * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     protected function terminate(\Exception $e)
     {
         if ($this->isDeveloperMode()) {
+            // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
             echo $e;
         } else {
             $message = "An error has happened during application run. See exception log for details.\n";
@@ -429,8 +437,10 @@ protected function terminate(\Exception $e)
             } catch (\Exception $e) {
                 $message .= "Could not write error message to log. Please use developer mode to see the message.\n";
             }
+            // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
             echo $message;
         }
+        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
         exit(1);
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Console/Response.php b/lib/internal/Magento/Framework/App/Console/Response.php
index 6255aaa3d87a6..cf2c490d690c7 100644
--- a/lib/internal/Magento/Framework/App/Console/Response.php
+++ b/lib/internal/Magento/Framework/App/Console/Response.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\App\Console;
 
 /**
- * @SuppressWarnings(PHPMD.ExitExpression)
+ * Class Response
  */
 class Response implements \Magento\Framework\App\ResponseInterface
 {
@@ -53,9 +53,11 @@ class Response implements \Magento\Framework\App\ResponseInterface
     public function sendResponse()
     {
         if (!empty($this->body)) {
+            // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
             echo $this->body;
         }
         if ($this->terminateOnSend) {
+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
             exit($this->code);
         }
         return $this->code;
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
index 19a89681a2d5f..02dc8d27fdb1f 100644
--- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.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\Filesystem\DirectoryList;
 
+/**
+ * Class FileFactory
+ */
 class FileFactory
 {
     /**
@@ -47,7 +49,6 @@ public function __construct(
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function create(
         $fileName,
@@ -68,6 +69,7 @@ public function create(
                 $isFile = true;
                 $file = $content['value'];
                 if (!$dir->isFile($file)) {
+                    // phpcs:ignore Magento2.Exceptions.DirectThrow
                     throw new \Exception((string)new \Magento\Framework\Phrase('File not found'));
                 }
                 $contentLength = $dir->stat($file)['size'];
@@ -86,6 +88,7 @@ public function create(
             if ($isFile) {
                 $stream = $dir->openFile($file, 'r');
                 while (!$stream->eof()) {
+                    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
                     echo $stream->read(1024);
                 }
             } else {
@@ -93,6 +96,7 @@ public function create(
                 $file = $fileName;
                 $stream = $dir->openFile($fileName, 'r');
                 while (!$stream->eof()) {
+                    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
                     echo $stream->read(1024);
                 }
             }
diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
index f810adcfd3491..26d24df21de55 100644
--- a/lib/internal/Magento/Framework/App/Router/Base.php
+++ b/lib/internal/Magento/Framework/App/Router/Base.php
@@ -346,7 +346,6 @@ public function getActionClassName($module, $actionPath)
      * @param \Magento\Framework\App\RequestInterface $request
      * @param string $path
      * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     protected function _checkShouldBeSecure(\Magento\Framework\App\RequestInterface $request, $path = '')
     {
@@ -361,6 +360,7 @@ protected function _checkShouldBeSecure(\Magento\Framework\App\RequestInterface
             }
 
             $this->_responseFactory->create()->setRedirect($url)->sendResponse();
+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
             exit;
         }
     }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php
index be34b2f8c696e..1d8ca249a073e 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php
@@ -7,6 +7,11 @@
 
 use Zend\Code\Generator\DocBlockGenerator;
 
+/**
+ * Class ParentClass
+ *
+ * phpcs:ignoreFile
+ */
 class ParentClass
 {
     /**
@@ -78,9 +83,6 @@ public static function publicParentStatic()
     {
     }
 
-    /**
-     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
-     */
     final public function publicParentFinal()
     {
     }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php
index 6d0e28db65f87..ba4cc9f4d3768 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php
@@ -7,6 +7,11 @@
 
 use Zend\Code\Generator\ClassGenerator;
 
+/**
+ * Class SourceClass
+ *
+ * phpcs:ignoreFile
+ */
 class SourceClass extends ParentClass
 {
     /**
@@ -111,10 +116,7 @@ public function publicChildWithoutParameters()
     public static function publicChildStatic()
     {
     }
-
-    /**
-     * @SuppressWarnings(PHPMD.FinalImplementation) Suppressed as is a fixture but not a real code
-     */
+    
     final public function publicChildFinal()
     {
     }
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
index e629a41056e60..f7e0f2932a3cb 100644
--- a/lib/internal/Magento/Framework/Console/Cli.php
+++ b/lib/internal/Magento/Framework/Console/Cli.php
@@ -22,9 +22,10 @@
 
 /**
  * Magento 2 CLI Application.
+ *
  * This is the hood for all command line tools supported by Magento.
  *
- * {@inheritdoc}
+ * @inheritdoc
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Cli extends Console\Application
@@ -61,11 +62,11 @@ class Cli extends Console\Application
     /**
      * @param string $name the application name
      * @param string $version the application version
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
     {
         try {
+            // phpcs:ignore Magento2.Security.IncludeFile
             $configuration = require BP . '/setup/config/application.config.php';
             $bootstrapApplication = new Application();
             $application = $bootstrapApplication->bootstrap($configuration);
@@ -78,7 +79,7 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
             $output->writeln(
                 '<error>' . $exception->getMessage() . '</error>'
             );
-
+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
             exit(static::RETURN_FAILURE);
         }
 
@@ -93,7 +94,7 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @throws \Exception The exception in case of unexpected error
      */
@@ -109,7 +110,7 @@ public function doRun(Console\Input\InputInterface $input, Console\Output\Output
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getDefaultCommands()
     {
@@ -217,8 +218,7 @@ protected function getVendorCommands($objectManager)
     }
 
     /**
-     * Provides updated configuration in
-     * accordance to document root settings.
+     * Provides updated configuration in accordance to document root settings.
      *
      * @param array $config
      * @return array
diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
index 9890c6ef0d240..6474fba6488e0 100644
--- a/lib/internal/Magento/Framework/DB/Tree.php
+++ b/lib/internal/Magento/Framework/DB/Tree.php
@@ -15,6 +15,7 @@
  * Magento Library
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * phpcs:ignoreFile
  *
  * @deprecated Not used anymore.
  */
@@ -300,7 +301,6 @@ public function getNodeInfo($nodeId)
      * @param string|int $nodeId
      * @param array $data
      * @return false|string
-     * @SuppressWarnings(PHPMD.ExitExpression)
      *
      * @deprecated Not used anymore.
      */
@@ -477,7 +477,6 @@ public function removeNode($nodeId)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @SuppressWarnings(PHPMD.ExitExpression)
      *
      * @deprecated Not used anymore.
      */
@@ -814,7 +813,6 @@ public function moveNode($eId, $pId, $aId = 0)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @SuppressWarnings(PHPMD.ExitExpression)
      *
      * @deprecated Not used anymore.
      */
@@ -1041,7 +1039,6 @@ protected function _addExtTablesToSelect(Select &$select)
      * @param int $startLevel
      * @param int $endLevel
      * @return NodeSet
-     * @SuppressWarnings(PHPMD.ExitExpression)
      *
      * @deprecated Not used anymore.
      */
diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
index 330ff4e975e8a..86bb71a12a7e3 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
@@ -27,63 +27,63 @@
 class Filesystem extends \Magento\Framework\Data\Collection
 {
     /**
-     * Target directory
+     * Target directory.
      *
      * @var string
      */
     protected $_targetDirs = [];
 
     /**
-     * Whether to collect files
+     * Whether to collect files.
      *
      * @var bool
      */
     protected $_collectFiles = true;
 
     /**
-     * Whether to collect directories before files
+     * Whether to collect directories before files.
      *
      * @var bool
      */
     protected $_dirsFirst = true;
 
     /**
-     * Whether to collect recursively
+     * Whether to collect recursively.
      *
      * @var bool
      */
     protected $_collectRecursively = true;
 
     /**
-     * Whether to collect dirs
+     * Whether to collect dirs.
      *
      * @var bool
      */
     protected $_collectDirs = false;
 
     /**
-     * \Directory names regex pre-filter
+     * \Directory names regex pre-filter.
      *
      * @var string
      */
     protected $_allowedDirsMask = '/^[a-z0-9\.\-\_]+$/i';
 
     /**
-     * Filenames regex pre-filter
+     * Filenames regex pre-filter.
      *
      * @var string
      */
     protected $_allowedFilesMask = '/^[a-z0-9\.\-\_]+\.[a-z0-9]+$/i';
 
     /**
-     * Disallowed filenames regex pre-filter match for better versatility
+     * Disallowed filenames regex pre-filter match for better versatility.
      *
      * @var string
      */
     protected $_disallowedFilesMask = '';
 
     /**
-     * Filter rendering helper variable
+     * Filter rendering helper variable.
      *
      * @var int
      * @see Collection::$_filter
@@ -92,7 +92,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
     private $_filterIncrement = 0;
 
     /**
-     * Filter rendering helper variable
+     * Filter rendering helper variable.
      *
      * @var array
      * @see Collection::$_filter
@@ -101,7 +101,7 @@ class Filesystem extends \Magento\Framework\Data\Collection
     private $_filterBrackets = [];
 
     /**
-     * Filter rendering helper variable
+     * Filter rendering helper variable.
      *
      * @var string
      * @see Collection::$_filter
@@ -110,22 +110,21 @@ class Filesystem extends \Magento\Framework\Data\Collection
     private $_filterEvalRendered = '';
 
     /**
-     * Collecting items helper variable
+     * Collecting items helper variable.
      *
      * @var array
      */
     protected $_collectedDirs = [];
 
     /**
-     * Collecting items helper variable
+     * Collecting items helper variable.
      *
      * @var array
      */
     protected $_collectedFiles = [];
 
     /**
-     * Allowed dirs mask setter
-     * Set empty to not filter
+     * Allowed dirs mask setter. Set empty to not filter.
      *
      * @param string $regex
      * @return $this
@@ -137,8 +136,7 @@ public function setDirsFilter($regex)
     }
 
     /**
-     * Allowed files mask setter
-     * Set empty to not filter
+     * Allowed files mask setter. Set empty to not filter.
      *
      * @param string $regex
      * @return $this
@@ -150,8 +148,7 @@ public function setFilesFilter($regex)
     }
 
     /**
-     * Disallowed files mask setter
-     * Set empty value to not use this filter
+     * Disallowed files mask setter. Set empty value to not use this filter.
      *
      * @param string $regex
      * @return $this
@@ -163,7 +160,7 @@ public function setDisallowedFilesFilter($regex)
     }
 
     /**
-     * Set whether to collect dirs
+     * Set whether to collect dirs.
      *
      * @param bool $value
      * @return $this
@@ -175,7 +172,7 @@ public function setCollectDirs($value)
     }
 
     /**
-     * Set whether to collect files
+     * Set whether to collect files.
      *
      * @param bool $value
      * @return $this
@@ -187,7 +184,7 @@ public function setCollectFiles($value)
     }
 
     /**
-     * Set whether to collect recursively
+     * Set whether to collect recursively.
      *
      * @param bool $value
      * @return $this
@@ -199,7 +196,7 @@ public function setCollectRecursively($value)
     }
 
     /**
-     * Target directory setter. Adds directory to be scanned
+     * Target directory setter. Adds directory to be scanned.
      *
      * @param string $value
      * @return $this
@@ -209,6 +206,7 @@ public function addTargetDir($value)
     {
         $value = (string)$value;
         if (!is_dir($value)) {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unable to set target directory.');
         }
         $this->_targetDirs[$value] = $value;
@@ -216,8 +214,7 @@ public function addTargetDir($value)
     }
 
     /**
-     * Set whether to collect directories before files
-     * Works *before* sorting.
+     * Set whether to collect directories before files. Works *before* sorting.
      *
      * @param bool $value
      * @return $this
@@ -229,7 +226,7 @@ public function setDirsFirst($value)
     }
 
     /**
-     * Get files from specified directory recursively (if needed)
+     * Get files from specified directory recursively (if needed).
      *
      * @param string|array $dir
      * @return void
@@ -281,7 +278,7 @@ protected function _collectRecursive($dir)
     }
 
     /**
-     * Lauch data collecting
+     * Launch data collecting.
      *
      * @param bool $printQuery
      * @param bool $logQuery
@@ -295,6 +292,7 @@ public function loadData($printQuery = false, $logQuery = false)
             return $this;
         }
         if (empty($this->_targetDirs)) {
+            // phpcs:disable Magento2.Exceptions.DirectThrow
             throw new \Exception('Please specify at least one target directory.');
         }
 
@@ -364,25 +362,22 @@ private function _generateAndFilterAndSort($attributeName)
     }
 
     /**
-     * Callback for sorting items
-     * Currently supports only sorting by one column
+     * Callback for sorting items. Currently supports only sorting by one column.
      *
      * @param array $a
      * @param array $b
-     * @return int|void
+     * @return int
      */
     protected function _usort($a, $b)
     {
         foreach ($this->_orders as $key => $direction) {
             $result = $a[$key] > $b[$key] ? 1 : ($a[$key] < $b[$key] ? -1 : 0);
             return self::SORT_ORDER_ASC === strtoupper($direction) ? $result : -$result;
-            break;
         }
     }
 
     /**
-     * Set select order
-     * Currently supports only sorting by one column
+     * Set select order. Currently supports only sorting by one column.
      *
      * @param   string $field
      * @param   string $direction
@@ -395,7 +390,7 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
     }
 
     /**
-     * Generate item row basing on the filename
+     * Generate item row basing on the filename.
      *
      * @param string $filename
      * @return array
@@ -433,13 +428,11 @@ public function addCallbackFilter($field, $value, $type, $callback, $isInverted
     }
 
     /**
-     * The filters renderer and caller
-     * Applies to each row, renders once.
+     * The filters renderer and caller. Applies to each row, renders once.
      *
      * @param array $row
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @SuppressWarnings(PHPMD.EvalExpression)
      */
     protected function _filterRow($row)
     {
@@ -469,14 +462,14 @@ protected function _filterRow($row)
         }
         $result = false;
         if ($this->_filterEvalRendered) {
+            // phpcs:ignore Squiz.PHP.Eval
             eval('$result = ' . $this->_filterEvalRendered . ';');
         }
         return $result;
     }
 
     /**
-     * Invokes specified callback
-     * Skips, if there is no filtered key in the row
+     * Invokes specified callback. Skips, if there is no filtered key in the row.
      *
      * @param callback $callback
      * @param array $callbackParams
@@ -493,7 +486,7 @@ protected function _invokeFilter($callback, $callbackParams)
     }
 
     /**
-     * Fancy field filter
+     * Fancy field filter.
      *
      * @param string $field
      * @param mixed $cond
@@ -626,7 +619,7 @@ public function addFieldToFilter($field, $cond, $type = 'and')
     }
 
     /**
-     * Prepare a bracket into filters
+     * Prepare a bracket into filters.
      *
      * @param string $bracket
      * @param bool $isAnd
@@ -643,7 +636,7 @@ protected function _addFilterBracket($bracket = '(', $isAnd = true)
     }
 
     /**
-     * Render condition sign before element, if required
+     * Render condition sign before element, if required.
      *
      * @param int $increment
      * @param bool $isAnd
@@ -666,7 +659,8 @@ protected function _renderConditionBeforeFilterElement($increment, $isAnd)
     }
 
     /**
-     * Does nothing. Intentionally disabled parent method
+     * Does nothing. Intentionally disabled parent method.
+     *
      * @param string $field
      * @param string $value
      * @param string $type
@@ -679,7 +673,7 @@ public function addFilter($field, $value, $type = 'and')
     }
 
     /**
-     * Get all ids of collected items
+     * Get all ids of collected items.
      *
      * @return array
      */
@@ -689,7 +683,7 @@ public function getAllIds()
     }
 
     /**
-     * Callback method for 'like' fancy filter
+     * Callback method for 'like' fancy filter.
      *
      * @param string $field
      * @param mixed $filterValue
@@ -708,7 +702,7 @@ public function filterCallbackLike($field, $filterValue, $row)
     }
 
     /**
-     * Callback method for 'eq' fancy filter
+     * Callback method for 'eq' fancy filter.
      *
      * @param string $field
      * @param mixed $filterValue
@@ -723,7 +717,7 @@ public function filterCallbackEq($field, $filterValue, $row)
     }
 
     /**
-     * Callback method for 'in' fancy filter
+     * Callback method for 'in' fancy filter.
      *
      * @param string $field
      * @param mixed $filterValue
@@ -738,7 +732,7 @@ public function filterCallbackInArray($field, $filterValue, $row)
     }
 
     /**
-     * Callback method for 'isnull' fancy filter
+     * Callback method for 'isnull' fancy filter.
      *
      * @param string $field
      * @param mixed $filterValue
@@ -754,7 +748,7 @@ public function filterCallbackIsNull($field, $filterValue, $row)
     }
 
     /**
-     * Callback method for 'moreq' fancy filter
+     * Callback method for 'moreq' fancy filter.
      *
      * @param string $field
      * @param mixed $filterValue
@@ -769,7 +763,7 @@ public function filterCallbackIsMoreThan($field, $filterValue, $row)
     }
 
     /**
-     * Callback method for 'lteq' fancy filter
+     * Callback method for 'lteq' fancy filter.
      *
      * @param string $field
      * @param mixed $filterValue
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
index 6ffcaa0676a0a..a98a4b3253b5c 100644
--- a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -172,7 +172,6 @@ public function maskException(\Exception $exception)
      * @param \Exception $exception
      * @param int $httpCode
      * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function renderException(\Exception $exception, $httpCode = self::DEFAULT_ERROR_HTTP_CODE)
     {
@@ -188,6 +187,7 @@ public function renderException(\Exception $exception, $httpCode = self::DEFAULT
                 $httpCode
             );
         }
+        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
         exit;
     }
 
@@ -232,6 +232,7 @@ public function renderErrorMessage(
             header('HTTP/1.1 ' . ($httpCode ? $httpCode : self::DEFAULT_ERROR_HTTP_CODE));
             header('Content-Type: ' . $mimeType . '; charset=' . self::DEFAULT_RESPONSE_CHARSET);
         }
+        // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
         echo $output;
     }
 
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
index cff3a14921d38..34a16e7aa3263 100644
--- a/pub/errors/processor.php
+++ b/pub/errors/processor.php
@@ -11,6 +11,7 @@
  * Error processor
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * phpcs:ignoreFile
  */
 class Processor
 {
@@ -501,7 +502,6 @@ public function saveReport($reportData)
      *
      * @param int $reportId
      * @return void
-     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function loadReport($reportId)
     {

From 2495fadb44e087d6f71f97f8dc82355e966cad50 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Wed, 27 Mar 2019 13:12:10 -0500
Subject: [PATCH 0827/1055] REPO-66: [EQP][Sniffs Consolidation] Deliver
 Magento Coding Standard to magento2ce

---
 .../Config/Backend/Admin/AfterCustomUrlChangedObserver.php     | 2 ++
 .../Magento/Customer/Controller/Adminhtml/Index/Viewfile.php   | 2 ++
 app/code/Magento/Downloadable/Controller/Download/Link.php     | 2 ++
 .../Magento/Downloadable/Controller/Download/LinkSample.php    | 2 ++
 app/code/Magento/Downloadable/Controller/Download/Sample.php   | 2 ++
 app/code/Magento/Paypal/Controller/Ipn/Index.php               | 2 ++
 dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php   | 3 +--
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
index 6b4e435c3e743..4cd3ecad66afd 100644
--- a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
+++ b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
@@ -9,6 +9,8 @@
 
 /**
  * Class AfterCustomUrlChangedObserver
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AfterCustomUrlChangedObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 6b17abb840f76..7cb7c6a0d8679 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -18,7 +18,9 @@
 
 /**
  * Class Viewfile
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
 {
diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php
index 446b262972f63..283fc6bbe0d17 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Link.php
@@ -11,6 +11,8 @@
 
 /**
  * Class Link
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class Link extends \Magento\Downloadable\Controller\Download
 {
diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
index b09aa18d15c2d..2f90179e6be1e 100644
--- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
@@ -10,6 +10,8 @@
 
 /**
  * Class LinkSample
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class LinkSample extends \Magento\Downloadable\Controller\Download
 {
diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
index d303fd612bba3..e36a0e1d99a39 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php
@@ -10,6 +10,8 @@
 
 /**
  * Class Sample
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class Sample extends \Magento\Downloadable\Controller\Download
 {
diff --git a/app/code/Magento/Paypal/Controller/Ipn/Index.php b/app/code/Magento/Paypal/Controller/Ipn/Index.php
index e1f7bd12b1d81..3063556feb9e1 100644
--- a/app/code/Magento/Paypal/Controller/Ipn/Index.php
+++ b/app/code/Magento/Paypal/Controller/Ipn/Index.php
@@ -16,6 +16,8 @@
 
 /**
  * Unified IPN controller for all supported PayPal methods
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class Index extends \Magento\Framework\App\Action\Action implements CsrfAwareActionInterface
 {
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index f1c93339b3052..1d84eafbdbc77 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -77,8 +77,7 @@ public static function getWhitelist(
         $changedFilesBaseDir = '',
         $baseFilesFolder = '',
         $whitelistFile = '/_files/whitelist/common.txt'
-    )
-    {
+    ) {
         $changedFiles = self::getChangedFilesList($changedFilesBaseDir);
         if (empty($changedFiles)) {
             return [];

From bfe315e65e2a907c6f67237e1068a04b1e6c164e Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Wed, 27 Mar 2019 14:11:00 -0500
Subject: [PATCH 0828/1055] MC-15439: Deferred loading / parsing of JS

---
 .../Controller/Result/JsFooterPlugin.php      | 39 +++++++++++++++++++
 app/code/Magento/Theme/etc/frontend/di.xml    |  3 ++
 2 files changed, 42 insertions(+)
 create mode 100644 app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
new file mode 100644
index 0000000000000..7bc02164e7a85
--- /dev/null
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Theme\Controller\Result;
+
+/**
+ * Plugin for putting messages to cookies
+ */
+class JsFooterPlugin
+{
+    /**
+     * Put all javascript to footer before sending the response
+     *
+     * @param \Magento\Framework\App\Response\Http $subject
+     * @return void
+     */
+    public function beforeSendResponse(\Magento\Framework\App\Response\Http $subject)
+    {
+        $content = $subject->getContent();
+        $script = [];
+        if (strpos($content, '</body') > 0) {
+            $content = preg_replace('#<!--(?!\s?/?ko).*?-->#s', '', $content);
+            $pattern = '#<script.*?</script>#is';
+            $content = preg_replace_callback(
+                $pattern,
+                function ($matchPart) use (&$script) {
+                    $script[] = $matchPart[0];
+                    return '';
+                },
+                $content
+            );
+            $subject->setContent(
+                str_replace('</body', implode("\n", $script) . "\n</body", $content)
+            );
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Theme/etc/frontend/di.xml b/app/code/Magento/Theme/etc/frontend/di.xml
index 7db2783cd8dfa..3837c6f717b54 100644
--- a/app/code/Magento/Theme/etc/frontend/di.xml
+++ b/app/code/Magento/Theme/etc/frontend/di.xml
@@ -26,4 +26,7 @@
     <type name="Magento\Framework\Controller\ResultInterface">
         <plugin name="result-messages" type="Magento\Theme\Controller\Result\MessagePlugin"/>
     </type>
+    <type name="Magento\Framework\App\Response\Http">
+        <plugin name="result-js-footer" type="Magento\Theme\Controller\Result\JsFooterPlugin"/>
+    </type>
 </config>

From 9b324e804c58ed2b05c9646bcd7c781ecf113edc Mon Sep 17 00:00:00 2001
From: Denis Kopylov <dkopylov@magenius.team>
Date: Wed, 27 Mar 2019 22:29:48 +0300
Subject: [PATCH 0829/1055] [BUG] Fix gallery event observer

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

diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js
index 15c3d01cf2be3..be78856b21fcd 100644
--- a/lib/web/mage/gallery/gallery.js
+++ b/lib/web/mage/gallery/gallery.js
@@ -141,7 +141,7 @@ define([
             this.setupBreakpoints();
             this.initFullscreenSettings();
 
-            this.settings.$element.on('mouseup', '.fotorama__stage__frame', function () {
+            this.settings.$element.on('click', '.fotorama__stage__frame', function () {
                 if (
                     !$(this).parents('.fotorama__shadows--left, .fotorama__shadows--right').length &&
                     !$(this).hasClass('fotorama-video-container')

From a04154b10f2b62611722064085ede8cf03c50983 Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Wed, 27 Mar 2019 22:49:58 +0200
Subject: [PATCH 0830/1055] Add suggested changes

---
 ...frontCustomerAccountInformationSection.xml | 16 +++++++
 .../Mftf/Test/CaptchaEditCustomerTest.xml     | 48 +++++++++++--------
 ...orefrontCustomerChangeEmailActionGroup.xml | 27 +++++++++++
 .../Mftf/Page/StorefrontCustomerEditPage.xml  | 14 ++++++
 ...frontCustomerAccountInformationSection.xml |  8 ++--
 .../StorefrontCustomerAccountMainSection.xml  |  1 +
 .../Test/TestCase/CaptchaEditCustomerTest.xml |  1 +
 7 files changed, 89 insertions(+), 26 deletions(-)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerEditPage.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
new file mode 100644
index 0000000000000..6a274601e69ed
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
@@ -0,0 +1,16 @@
+<?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="captchaField" type="input" selector="#captcha_user_edit"/>
+        <element name="captchaImg" type="block" selector=".captcha-img"/>
+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
index 646c9af3ba55f..ad126617611c6 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
@@ -35,39 +35,45 @@
         </after>
 
         <!-- Open Customer edit page -->
-        <amOnPage url="/customer/account/edit/" stepKey="goToEditPage"/>
+        <amOnPage url="{{StorefrontCustomerEditPage.url}}" stepKey="goToCustomerEditPage"/>
         <waitForPageLoad stepKey="waitForEditPage"/>
 
         <!-- Update email with incorrect password 3 times. -->
-        <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox1"/>
-        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword1"/>
-        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange1"/>
-        <see userInput="The password doesn't match this account. Verify the password and try again." selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage1"/>
+        <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailFirstAttempt">
+            <argument name="email" value="$$customer.email$$" />
+            <argument name="password" value="{{Colorado_US_Customer.password}}" />
+            <argument name="message" value="The password doesn't match this account. Verify the password and try again." />
+            <argument name="messageType" value="error" />
+        </actionGroup>
 
-        <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox2"/>
-        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword2"/>
-        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange2"/>
-        <see userInput="The password doesn't match this account. Verify the password and try again." selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage2"/>
+        <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailSecondAttempt">
+            <argument name="email" value="$$customer.email$$" />
+            <argument name="password" value="{{Colorado_US_Customer.password}}" />
+            <argument name="message" value="The password doesn't match this account. Verify the password and try again." />
+            <argument name="messageType" value="error" />
+        </actionGroup>
 
-        <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox3"/>
-        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword3"/>
-        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange3"/>
-        <see userInput="The password doesn't match this account. Verify the password and try again." selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage3"/>
+        <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailThirdAttempt">
+            <argument name="email" value="$$customer.email$$" />
+            <argument name="password" value="{{Colorado_US_Customer.password}}" />
+            <argument name="message" value="The password doesn't match this account. Verify the password and try again." />
+            <argument name="messageType" value="error" />
+        </actionGroup>
 
         <!-- Check captcha visibility after incorrect password submit form -->
-        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaField}}" stepKey="seeCaptchaField"/>
-        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
-        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaField"/>
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImage"/>
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
         <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaField}}" stepKey="seeCaptchaField2"/>
-        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
-        <waitForElementVisible selector="{{StorefrontCustomerEditFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
+        <waitForPageLoad stepKey="waitForPageReloaded" />
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaFieldAfterPageReload"/>
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImageAfterPageReload"/>
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButtonAfterPageReload"/>
 
         <!-- Try to submit form with incorrect captcha -->
         <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox4"/>
         <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword4"/>
-        <fillField selector="{{StorefrontCustomerEditFormSection.captchaField}}" userInput="wrongCaptcha" stepKey="enterWrongCaptcha"/>
+        <fillField selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" userInput="wrongCaptcha" stepKey="enterWrongCaptcha"/>
         <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange4"/>
         <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage4"/>
     </test>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml
new file mode 100644
index 0000000000000..6500d7800b6a1
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.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="StorefrontCustomerChangeEmailActionGroup">
+        <arguments>
+                <argument name="email" type="string" />
+                <argument name="password" type="string" />
+                <argument name="message" type="string" defaultValue="You saved the account information." />
+                <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+        <conditionalClick selector="{{StorefrontCustomerSidebarSection.sidebarTab('Account Information')}}" dependentSelector="{{StorefrontCustomerSidebarSection.sidebarTab('Account Information')}}" visible="true" stepKey="openAccountInfoTab" />
+        <waitForPageLoad stepKey="waitForAccountInfoTabOpened" />
+        <checkOption selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox" />
+        <fillField selector="{{StorefrontCustomerAccountInformationSection.email}}" userInput="{{email}}" stepKey="fillEmail" />
+        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="{{password}}" stepKey="fillCurrentPassword" />
+        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange" />
+        <waitForPageLoad stepKey="waitForPageLoaded" />
+        <see userInput="{{message}}" selector="{{StorefrontCustomerAccountMainSection.messageByType(messageType)}}" stepKey="verifyMessage" />
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerEditPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerEditPage.xml
new file mode 100644
index 0000000000000..d4cf90dde08ff
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerEditPage.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="StorefrontCustomerEditPage" url="/customer/account/edit/" area="storefront" module="Magento_Customer">
+        <section name="StorefrontCustomerAccountInformationSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
index e93985b4f469b..8a633ec5bc271 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
@@ -11,16 +11,14 @@
     <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="changeEmail" type="checkbox" selector=".form-edit-account input[name='change_email']"/>
+        <element name="changePassword" type="checkbox" selector=".form-edit-account input[name='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" timeout="30"/>
         <element name="currentPassword" type="input" selector="#current-password"/>
         <element name="newPassword" type="input" selector="#password"/>
         <element name="confirmNewPassword" type="input" selector="#password-confirmation"/>
         <element name="confirmNewPasswordError" type="text" selector="#password-confirmation-error"/>
-        <element name="captchaField" type="input" selector="#captcha_user_edit"/>
-        <element name="captchaImg" type="block" selector=".captcha-img"/>
-        <element name="captchaReload" type="block" selector=".captcha-reload"/>
+        <element name="email" type="input" selector=".form-edit-account input[name='email']" />
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml
index 3a4329969ae2b..c00b54b3964da 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountMainSection.xml
@@ -10,5 +10,6 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerAccountMainSection">
         <element name="pageTitle" type="text" selector="#maincontent .column.main [data-ui-id='page-title-wrapper']" />
+        <element name="messageByType" type="block" selector="#maincontent .message-{{messageType}}" parameterized="true" />
     </section>
 </sections>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml
index 12b9808adb9e0..0c0e06d63b6c9 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.xml
@@ -14,6 +14,7 @@
             <data name="attempts" xsi:type="number">3</data>
             <data name="captcha" xsi:type="string">111</data>
             <data name="configData" xsi:type="string">captcha_storefront_user_edit_failures_number, customer_max_login_failures_number</data>
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <constraint name="Magento\Security\Test\Constraint\AssertCustomerIsLocked" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerIsLockedOnBackend" />
         </variation>

From 1821c9d8b4a3c69f1b41be53afab239395b56c3e Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Sun, 10 Mar 2019 10:40:24 +0100
Subject: [PATCH 0831/1055] GraphQL-423: Created a first test. Set the right
 structure to the mutation

---
 .../Customer/SetShippingMethodsOnCartTest.php | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index b5634f51cb366..34c92765a368f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -7,7 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\Catalog\Model\Product;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
@@ -38,6 +40,10 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
      * @var QuoteIdToMaskedQuoteIdInterface
      */
     private $quoteIdToMaskedId;
+    /**
+     * @var \Magento\Quote\Model\Quote\Address\Rate
+     */
+    private $rate;
 
     /**
      * @inheritdoc
@@ -49,11 +55,41 @@ protected function setUp()
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->rate = $objectManager->get(\Magento\Quote\Model\Quote\Address\Rate::class);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @throws \Exception
+     */
     public function testShippingMethodWithVirtualProduct()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_virtual_product', 'reserved_order_id');
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate_flatrate',
+            '1'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
     public function testShippingMethodWithSimpleProduct()
@@ -135,18 +171,18 @@ private function prepareMutationQuery(
   setShippingMethodsOnCart(input: 
     {
       cart_id: "$maskedQuoteId", 
-      shipping_addresses: [{
+      shipping_methods: [{
         cart_address_id: $shippingAddressId
-        shipping_method: {
-          method_code: "$shippingMethodCode"
-          carrier_code: "$shippingCarrierCode"
-        }
+        method_code: "$shippingMethodCode"
+        carrier_code: "$shippingCarrierCode"
       }]
-      }) {
-    
+    } ) 
+    {
     cart {
-      cart_id,
       shipping_addresses {
+        address_id
+        firstname
+        lastname
         selected_shipping_method {
           carrier_code
           method_code

From 672526fb46ae0809e802299aaf7266ac797028cc Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Sun, 10 Mar 2019 20:32:00 +0100
Subject: [PATCH 0832/1055] GraphQL-423: Added more test cases for
 SetShippingMethod test. Part I finished. Half of the way

---
 .../Customer/SetShippingMethodsOnCartTest.php | 220 +++++++++++++++++-
 1 file changed, 210 insertions(+), 10 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 34c92765a368f..2a3e8c51f9b2a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -7,7 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Quote\Model\Quote\Address\Rate;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
@@ -40,11 +42,17 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
      * @var QuoteIdToMaskedQuoteIdInterface
      */
     private $quoteIdToMaskedId;
+
     /**
-     * @var \Magento\Quote\Model\Quote\Address\Rate
+     * @var Rate
      */
     private $rate;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @inheritdoc
      */
@@ -55,13 +63,13 @@ protected function setUp()
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->rate = $objectManager->get(\Magento\Quote\Model\Quote\Address\Rate::class);
+        $this->rate = $objectManager->get(Rate::class);
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
      * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
      * @throws \Exception
      */
     public function testShippingMethodWithVirtualProduct()
@@ -92,39 +100,227 @@ public function testShippingMethodWithVirtualProduct()
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testShippingMethodWithSimpleProduct()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        /** @var Product $product */
+        $product = $this->productRepository->get('simple');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $quote->addProduct($product, 1);
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $shippingAddress->getId()
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testShippingMethodWithSimpleProductWithoutAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $shippingAddress->getId()
+        );
+
+        self::expectExceptionMessage(
+            'The shipping address is missing. Set the address and try again.'
+        );
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodWithMissedRequiredParameters()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_1', 1);
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            '',
+            '',
+            '1'
+        );
+
+        self::expectExceptionMessage(
+            'Required parameter "carrier_code" is missing.'
+        );
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetNonExistentShippingMethod()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        /** @var Product $product */
+        $product = $this->productRepository->get('simple');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $quote->addProduct($product, 1);
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'non-existed-method-code',
+            'non-existed-carrier-code',
+            $shippingAddress->getId()
+        );
+
+        self::expectExceptionMessage(
+            'Carrier with such method not found: non-existed-carrier-code, non-existed-method-code'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodIfAddressIsNotBelongToCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        /** @var Product $product */
+        $product = $this->productRepository->get('simple');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $quote->addProduct($product, 1);
+
+        $shippingAddress = $quote->getShippingAddress();
+        $rate = $this->rate;
+
+        $rate->setPrice(2)
+            ->setAddressId($shippingAddress->getId())
+            ->setCode('flatrate_flatrate');
+        $shippingAddress->setShippingMethod('flatrate_flatrate')
+            ->addShippingRate($rate)
+            ->save();
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            '2'
+        );
+
+        self::expectExceptionMessage(
+            'Could not find a cart address with ID "2"'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
+     * @throws \Exception
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     */
     public function testSetShippingMethodToNonExistentCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            '1'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToGuestCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('guest_quote');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'guest_quote', 'reserved_order_id');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $quote->getShippingAddress()->getId()
+        );
+
+        $this->graphQlQuery($mutation);
     }
 
     public function testSetShippingMethodToAnotherCustomerCart()
@@ -197,6 +393,10 @@ private function prepareMutationQuery(
 QUERY;
     }
 
+    private function addShippingMethodToQuote(Quote $quote)
+    {
+    }
+
     /**
      * @param string $reversedOrderId
      * @return string

From 1bd2068581142e2ca24afeaad6a367932812c627 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Mon, 11 Mar 2019 23:55:58 +0100
Subject: [PATCH 0833/1055] GraphQL-423: Covered the cases what are left for
 SetShippingMethod test.

---
 .../Customer/SetShippingMethodsOnCartTest.php | 147 +++++++++++++++++-
 1 file changed, 141 insertions(+), 6 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 2a3e8c51f9b2a..6bb7a0717b116 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote\Address\Rate;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\Quote;
@@ -53,6 +54,11 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
      */
     private $productRepository;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @inheritdoc
      */
@@ -62,6 +68,7 @@ protected function setUp()
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->quoteRepository = $objectManager->get(CartRepositoryInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
         $this->rate = $objectManager->get(Rate::class);
         $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
@@ -94,7 +101,7 @@ public function testShippingMethodWithVirtualProduct()
             $maskedQuoteId,
             'flatrate',
             'flatrate_flatrate',
-            '1'
+            $shippingAddress->getId()
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -323,29 +330,157 @@ public function testSetShippingMethodToGuestCart()
         $this->graphQlQuery($mutation);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToAnotherCustomerCart()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+
+        /** @var Quote $quote test01 */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $quote->getShippingAddress()->getId()
+        );
+
+        self::expectExceptionMessage(
+            'Carrier with such method not found: flatrate, flatrate'
+        );
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToNonExistentCartAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            '16800'
+        );
+        self::expectExceptionMessage(
+            'Could not find a cart address with ID "16800"'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToGuestCartAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('guest_quote');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'guest_quote', 'reserved_order_id');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $quote->getShippingAddress()->getId()
+        );
+
+        $this->graphQlQuery($mutation);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetShippingMethodToAnotherCustomerCartAddress()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $mutation = $this->prepareMutationQuery(
+            $maskedQuoteId,
+            'flatrate',
+            'flatrate',
+            $quote->getShippingAddress()->getId()
+        );
+
+        self::expectExceptionMessage(
+            'Carrier with such method not found: flatrate, flatrate'
+        );
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
+     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
+     * @throws \Exception
+     */
     public function testSetMultipleShippingMethods()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/423');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+
+        /** @var Quote $quote */
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        $shippingAddressId = $quote->getShippingAddress()->getId();
+
+        $mutation = <<<MUTATION
+mutation {
+  setShippingMethodsOnCart(input: 
+    {
+      cart_id: "$maskedQuoteId", 
+      shipping_methods: [{
+          cart_address_id: $shippingAddressId
+          method_code: "flatrate"
+          carrier_code: "flatrate"
+        },
+        {
+          cart_address_id: $shippingAddressId
+          method_code: "ups"
+          carrier_code: "ups"
+      }]
+    }
+    ) {
+    cart {
+      shipping_addresses {
+        address_id
+        firstname
+        lastname
+        selected_shipping_method {
+          carrier_code
+          method_code
+          label
+          amount
+        }
+      }
+    }
+  }
+}
+
+MUTATION;
+        self::expectExceptionMessage(
+            'You cannot specify multiple shipping methods.'
+        );
+
+        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
     /**

From d280bb0ff8267e792c6f63d85a003652a7374d75 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Tue, 12 Mar 2019 21:00:08 +0100
Subject: [PATCH 0834/1055] GraphQL-423: Fixed some errors. Replaced save quote
 to save by quote repository. Worked on code style.

---
 .../Customer/SetShippingMethodsOnCartTest.php | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 6bb7a0717b116..d0209b2073acf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -9,15 +9,15 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Quote\Model\Quote\Address\Rate;
-use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
 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 setting shipping methods on cart for customer
@@ -30,34 +30,34 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var QuoteResource
+     * @var ProductRepositoryInterface
      */
-    private $quoteResource;
+    private $productRepository;
 
     /**
-     * @var QuoteFactory
+     * @var Rate
      */
-    private $quoteFactory;
+    private $rate;
 
     /**
-     * @var QuoteIdToMaskedQuoteIdInterface
+     * @var QuoteResource
      */
-    private $quoteIdToMaskedId;
+    private $quoteResource;
 
     /**
-     * @var Rate
+     * @var QuoteFactory
      */
-    private $rate;
+    private $quoteFactory;
 
     /**
-     * @var ProductRepositoryInterface
+     * @var CartRepositoryInterface
      */
-    private $productRepository;
+    private $quoteRepository;
 
     /**
-     * @var CartRepositoryInterface
+     * @var QuoteIdToMaskedQuoteIdInterface
      */
-    private $quoteRepository;
+    private $quoteIdToMaskedId;
 
     /**
      * @inheritdoc
@@ -65,13 +65,13 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->rate = $objectManager->get(Rate::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->quoteRepository = $objectManager->get(CartRepositoryInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->rate = $objectManager->get(Rate::class);
-        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -94,8 +94,9 @@ public function testShippingMethodWithVirtualProduct()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -132,8 +133,9 @@ public function testShippingMethodWithSimpleProduct()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -166,8 +168,9 @@ public function testShippingMethodWithSimpleProductWithoutAddress()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -228,8 +231,9 @@ public function testSetNonExistentShippingMethod()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -271,8 +275,9 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
             ->setAddressId($shippingAddress->getId())
             ->setCode('flatrate_flatrate');
         $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate)
-            ->save();
+            ->addShippingRate($rate);
+
+        $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -295,13 +300,13 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
      */
     public function testSetShippingMethodToNonExistentCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('Non_existent_cart_reversed_quote_id');
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            '1'
+            '80900'
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -528,10 +533,6 @@ private function prepareMutationQuery(
 QUERY;
     }
 
-    private function addShippingMethodToQuote(Quote $quote)
-    {
-    }
-
     /**
      * @param string $reversedOrderId
      * @return string

From d39e99bb45df7ac9a93cfc2671f5539bf32028c8 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Tue, 19 Mar 2019 00:33:52 +0100
Subject: [PATCH 0835/1055] GraphQL-423: Added RateFactory instead of Rate

---
 .../Customer/SetShippingMethodsOnCartTest.php | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index d0209b2073acf..ec54ec43f4cee 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -15,6 +15,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Quote\Model\Quote\Address\Rate;
+use Magento\Quote\Model\Quote\Address\RateFactory;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
@@ -35,9 +36,9 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     private $productRepository;
 
     /**
-     * @var Rate
+     * @var RateFactory
      */
-    private $rate;
+    private $rateFactory;
 
     /**
      * @var QuoteResource
@@ -66,7 +67,7 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
-        $this->rate = $objectManager->get(Rate::class);
+        $this->rateFactory = $objectManager->get(RateFactory::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -88,7 +89,9 @@ public function testShippingMethodWithVirtualProduct()
         $this->quoteResource->load($quote, 'test_order_with_virtual_product', 'reserved_order_id');
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())
@@ -127,7 +130,9 @@ public function testShippingMethodWithSimpleProduct()
         $quote->addProduct($product, 1);
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())
@@ -162,7 +167,9 @@ public function testShippingMethodWithSimpleProductWithoutAddress()
         $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())
@@ -225,7 +232,9 @@ public function testSetNonExistentShippingMethod()
         $quote->addProduct($product, 1);
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())
@@ -269,7 +278,9 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
         $quote->addProduct($product, 1);
 
         $shippingAddress = $quote->getShippingAddress();
-        $rate = $this->rate;
+
+        /** @var Rate $rate */
+        $rate = $this->rateFactory->create();
 
         $rate->setPrice(2)
             ->setAddressId($shippingAddress->getId())

From 40061f8180f23213802d68d96a03cf6740d72928 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Tue, 19 Mar 2019 19:40:04 +0100
Subject: [PATCH 0836/1055] GraphQL-423: Replaced  as integer parameter

---
 .../Customer/SetShippingMethodsOnCartTest.php | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index ec54ec43f4cee..aeb020dba8046 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -77,7 +77,6 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testShippingMethodWithVirtualProduct()
@@ -105,7 +104,7 @@ public function testShippingMethodWithVirtualProduct()
             $maskedQuoteId,
             'flatrate',
             'flatrate_flatrate',
-            $shippingAddress->getId()
+            (int)$shippingAddress->getId()
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -113,7 +112,6 @@ public function testShippingMethodWithVirtualProduct()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testShippingMethodWithSimpleProduct()
@@ -146,7 +144,7 @@ public function testShippingMethodWithSimpleProduct()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $shippingAddress->getId()
+            (int)$shippingAddress->getId()
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -155,7 +153,6 @@ public function testShippingMethodWithSimpleProduct()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testShippingMethodWithSimpleProductWithoutAddress()
@@ -183,7 +180,7 @@ public function testShippingMethodWithSimpleProductWithoutAddress()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $shippingAddress->getId()
+            (int)$shippingAddress->getId()
         );
 
         self::expectExceptionMessage(
@@ -204,7 +201,7 @@ public function testSetShippingMethodWithMissedRequiredParameters()
             $maskedQuoteId,
             '',
             '',
-            '1'
+            1
         );
 
         self::expectExceptionMessage(
@@ -215,7 +212,6 @@ public function testSetShippingMethodWithMissedRequiredParameters()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetNonExistentShippingMethod()
@@ -248,7 +244,7 @@ public function testSetNonExistentShippingMethod()
             $maskedQuoteId,
             'non-existed-method-code',
             'non-existed-carrier-code',
-            $shippingAddress->getId()
+            (int)$shippingAddress->getId()
         );
 
         self::expectExceptionMessage(
@@ -261,7 +257,6 @@ public function testSetNonExistentShippingMethod()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetShippingMethodIfAddressIsNotBelongToCart()
@@ -294,7 +289,7 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            '2'
+            2
         );
 
         self::expectExceptionMessage(
@@ -317,7 +312,7 @@ public function testSetShippingMethodToNonExistentCart()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            '80900'
+            80900
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -340,7 +335,7 @@ public function testSetShippingMethodToGuestCart()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $quote->getShippingAddress()->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         $this->graphQlQuery($mutation);
@@ -363,7 +358,7 @@ public function testSetShippingMethodToAnotherCustomerCart()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $quote->getShippingAddress()->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         self::expectExceptionMessage(
@@ -384,7 +379,7 @@ public function testSetShippingMethodToNonExistentCartAddress()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            '16800'
+            16800
         );
         self::expectExceptionMessage(
             'Could not find a cart address with ID "16800"'
@@ -395,7 +390,6 @@ public function testSetShippingMethodToNonExistentCartAddress()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetShippingMethodToGuestCartAddress()
@@ -410,7 +404,7 @@ public function testSetShippingMethodToGuestCartAddress()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $quote->getShippingAddress()->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         $this->graphQlQuery($mutation);
@@ -419,7 +413,6 @@ public function testSetShippingMethodToGuestCartAddress()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetShippingMethodToAnotherCustomerCartAddress()
@@ -434,7 +427,7 @@ public function testSetShippingMethodToAnotherCustomerCartAddress()
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            $quote->getShippingAddress()->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         self::expectExceptionMessage(
@@ -445,7 +438,6 @@ public function testSetShippingMethodToAnotherCustomerCartAddress()
 
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetMultipleShippingMethods()
@@ -456,7 +448,7 @@ public function testSetMultipleShippingMethods()
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
 
-        $shippingAddressId = $quote->getShippingAddress()->getId();
+        $shippingAddressId = (int)$quote->getShippingAddress()->getId();
 
         $mutation = <<<MUTATION
 mutation {
@@ -503,7 +495,7 @@ public function testSetMultipleShippingMethods()
      * @param string $maskedQuoteId
      * @param string $shippingMethodCode
      * @param string $shippingCarrierCode
-     * @param string $shippingAddressId
+     * @param int $shippingAddressId
      * @return string
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
@@ -511,7 +503,7 @@ private function prepareMutationQuery(
         string $maskedQuoteId,
         string $shippingMethodCode,
         string $shippingCarrierCode,
-        string $shippingAddressId
+        int $shippingAddressId
     ) : string {
         return <<<QUERY
 mutation {

From f88f975a2104ce91524e0d446f372371cac8814e Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Sat, 23 Mar 2019 20:58:48 +0100
Subject: [PATCH 0837/1055] GraphQL-423: Removed enable_shipping_methods
 fixture from prepared fixtures

---
 .../GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index aeb020dba8046..f08365673f65a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -320,7 +320,6 @@ public function testSetShippingMethodToNonExistentCart()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
      * @throws \Exception
      */
     public function testSetShippingMethodToGuestCart()

From f8de00a284fa68a25793e3cf142501b311f24850 Mon Sep 17 00:00:00 2001
From: AleksLi <aleksliwork@gmail.com>
Date: Tue, 26 Mar 2019 20:21:01 +0100
Subject: [PATCH 0838/1055] GraphQL-423: Rebased to have all new fixtures for
 testing. Applied new fixtures.

---
 .../Customer/SetShippingMethodsOnCartTest.php | 169 +++++-------------
 1 file changed, 41 insertions(+), 128 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index f08365673f65a..e61796fe66fe5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -9,13 +9,12 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\Quote\Model\Quote\Address\Rate;
-use Magento\Quote\Model\Quote\Address\RateFactory;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
@@ -36,9 +35,9 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     private $productRepository;
 
     /**
-     * @var RateFactory
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $rateFactory;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @var QuoteResource
@@ -67,7 +66,7 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
-        $this->rateFactory = $objectManager->get(RateFactory::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -76,75 +75,51 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
      * @throws \Exception
      */
     public function testShippingMethodWithVirtualProduct()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         /** @var Quote $quote */
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_with_virtual_product', 'reserved_order_id');
-
-        $shippingAddress = $quote->getShippingAddress();
-
-        /** @var Rate $rate */
-        $rate = $this->rateFactory->create();
-
-        $rate->setPrice(2)
-            ->setAddressId($shippingAddress->getId())
-            ->setCode('flatrate_flatrate');
-        $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate);
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
 
+        $virtualProduct = $this->productRepository->get('virtual-product');
+        $quote->addProduct($virtualProduct, 1);
         $this->quoteRepository->save($quote);
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
-            'flatrate',
-            'flatrate_flatrate',
-            (int)$shippingAddress->getId()
+            'freeshipping',
+            'freeshipping',
+            (int)$quote->getShippingAddress()->getId()
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
      * @throws \Exception
      */
     public function testShippingMethodWithSimpleProduct()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
-
-        /** @var Product $product */
-        $product = $this->productRepository->get('simple');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         /** @var Quote $quote */
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
 
-        $quote->addProduct($product, 1);
-
-        $shippingAddress = $quote->getShippingAddress();
-
-        /** @var Rate $rate */
-        $rate = $this->rateFactory->create();
-
-        $rate->setPrice(2)
-            ->setAddressId($shippingAddress->getId())
-            ->setCode('flatrate_flatrate');
-        $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate);
-
-        $this->quoteRepository->save($quote);
-
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
-            'flatrate',
-            'flatrate',
-            (int)$shippingAddress->getId()
+            'freeshipping',
+            'freeshipping',
+            (int)$quote->getShippingAddress()->getId()
         );
 
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
@@ -163,28 +138,15 @@ public function testShippingMethodWithSimpleProductWithoutAddress()
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
 
-        $shippingAddress = $quote->getShippingAddress();
-
-        /** @var Rate $rate */
-        $rate = $this->rateFactory->create();
-
-        $rate->setPrice(2)
-            ->setAddressId($shippingAddress->getId())
-            ->setCode('flatrate_flatrate');
-        $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate);
-
-        $this->quoteRepository->save($quote);
-
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
             'flatrate',
             'flatrate',
-            (int)$shippingAddress->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         self::expectExceptionMessage(
-            'The shipping address is missing. Set the address and try again.'
+            'Required parameter "cart_address_id" is missing'
         );
         $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
     }
@@ -211,40 +173,23 @@ public function testSetShippingMethodWithMissedRequiredParameters()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
      * @throws \Exception
      */
     public function testSetNonExistentShippingMethod()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
-
-        /** @var Product $product */
-        $product = $this->productRepository->get('simple');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         /** @var Quote $quote */
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
 
-        $quote->addProduct($product, 1);
-
-        $shippingAddress = $quote->getShippingAddress();
-
-        /** @var Rate $rate */
-        $rate = $this->rateFactory->create();
-
-        $rate->setPrice(2)
-            ->setAddressId($shippingAddress->getId())
-            ->setCode('flatrate_flatrate');
-        $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate);
-
-        $this->quoteRepository->save($quote);
-
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
             'non-existed-method-code',
             'non-existed-carrier-code',
-            (int)$shippingAddress->getId()
+            (int)$quote->getShippingAddress()->getId()
         );
 
         self::expectExceptionMessage(
@@ -255,35 +200,14 @@ public function testSetNonExistentShippingMethod()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
      * @throws \Exception
      */
     public function testSetShippingMethodIfAddressIsNotBelongToCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
-
-        /** @var Product $product */
-        $product = $this->productRepository->get('simple');
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-
-        $quote->addProduct($product, 1);
-
-        $shippingAddress = $quote->getShippingAddress();
-
-        /** @var Rate $rate */
-        $rate = $this->rateFactory->create();
-
-        $rate->setPrice(2)
-            ->setAddressId($shippingAddress->getId())
-            ->setCode('flatrate_flatrate');
-        $shippingAddress->setShippingMethod('flatrate_flatrate')
-            ->addShippingRate($rate);
-
-        $this->quoteRepository->save($quote);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -300,13 +224,14 @@ public function testSetShippingMethodIfAddressIsNotBelongToCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
      * @throws \Exception
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSetShippingMethodToNonExistentCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('Non_existent_cart_reversed_quote_id');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('Non_existent_cart_reversed_quote_id');
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -324,7 +249,7 @@ public function testSetShippingMethodToNonExistentCart()
      */
     public function testSetShippingMethodToGuestCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('guest_quote');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('guest_quote');
 
         /** @var Quote $quote */
         $quote = $this->quoteFactory->create();
@@ -341,15 +266,16 @@ public function testSetShippingMethodToGuestCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
      * @throws \Exception
      */
     public function testSetShippingMethodToAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_virtual_product');
 
-        /** @var Quote $quote test01 */
+        /** @var Quote $quote */
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
 
@@ -372,7 +298,7 @@ public function testSetShippingMethodToAnotherCustomerCart()
      */
     public function testSetShippingMethodToNonExistentCartAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $mutation = $this->prepareMutationQuery(
             $maskedQuoteId,
@@ -393,7 +319,7 @@ public function testSetShippingMethodToNonExistentCartAddress()
      */
     public function testSetShippingMethodToGuestCartAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('guest_quote');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('guest_quote');
 
         /** @var Quote $quote */
         $quote = $this->quoteFactory->create();
@@ -416,7 +342,7 @@ public function testSetShippingMethodToGuestCartAddress()
      */
     public function testSetShippingMethodToAnotherCustomerCartAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_virtual_product');
 
         /** @var Quote $quote */
         $quote = $this->quoteFactory->create();
@@ -441,7 +367,7 @@ public function testSetShippingMethodToAnotherCustomerCartAddress()
      */
     public function testSetMultipleShippingMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         /** @var Quote $quote */
         $quote = $this->quoteFactory->create();
@@ -535,19 +461,6 @@ private function prepareMutationQuery(
 QUERY;
     }
 
-    /**
-     * @param string $reversedOrderId
-     * @return string
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reversedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $reversedOrderId
      * @param int $customerId

From aa4a7a53ef7c9403039c7e4144c8aef909eb98c3 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Thu, 28 Mar 2019 09:15:33 +0200
Subject: [PATCH 0839/1055] MAGETWO-98886: Gift Card Accounts: expiration date
 subtracts one day

---
 .../Framework/Data/Form/Element/Date.php      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
index 897617e560be5..28e9a18337c68 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -53,6 +53,19 @@ public function __construct(
         }
     }
 
+    /**
+     * Check if a string is a date value
+     *
+     * @param string $value
+     * @return bool
+     */
+    private function isDate(string $value): bool
+    {
+        $date = date_parse($value);
+
+        return !empty($date['year']) && !empty($date['month']) && !empty($date['day']);
+    }
+
     /**
      * If script executes on x64 system, converts large numeric values to timestamp limit
      *
@@ -85,13 +98,13 @@ public function setValue($value)
             $this->_value = $value;
             return $this;
         }
-
         try {
             if (preg_match('/^[0-9]+$/', $value)) {
                 $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
+            } else if (is_string($value) && $this->isDate($value)) {
+                $this->_value = new \DateTime($value, new \DateTimeZone($this->localeDate->getConfigTimezone()));
             } else {
-                $this->_value = new \DateTime($value);
-                $this->_value->setTimezone(new \DateTimeZone($this->localeDate->getConfigTimezone()));
+                $this->_value = '';
             }
         } catch (\Exception $e) {
             $this->_value = '';

From 1fe977a11c238b19e6f79342bed637bc7941bea8 Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Thu, 28 Mar 2019 11:43:58 +0200
Subject: [PATCH 0840/1055] #21998 Magento/ImportExport/Model/Import has
 _coreConfig declared dynamically

---
 app/code/Magento/ImportExport/Model/Import.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index d115aea7f2ff9..2a4d6904b11b5 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -126,6 +126,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     protected $_importExportData = null;
 
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $_coreConfig;
+
     /**
      * @var \Magento\ImportExport\Model\Import\ConfigInterface
      */

From 392cd1bfabad342926142dcd98981c6d3b39f261 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 28 Mar 2019 11:57:30 +0200
Subject: [PATCH 0841/1055] magento/magento2#20526: Static test fix.

---
 .../Adminhtml/Product/Attribute/Validate.php  |  7 +++---
 .../Magento/Eav/Model/Entity/Attribute.php    |  2 +-
 app/code/Magento/Eav/Setup/EavSetup.php       | 25 ++++++++++++++-----
 3 files changed, 24 insertions(+), 10 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 072f3ff3ac38e..c74a382724a00 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -7,13 +7,13 @@
 
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute as AttributeAction;
 use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
-use Magento\Framework\Serialize\Serializer\FormData;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
-use Magento\Catalog\Controller\Adminhtml\Product\Attribute as AttributeAction;
+use Magento\Framework\Serialize\Serializer\FormData;
 
 /**
  * Product attribute validate controller.
@@ -80,7 +80,8 @@ public function __construct(
         $this->formDataSerializer = $formDataSerializer ?: ObjectManager::getInstance()
             ->get(FormData::class);
         $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
-            AttributeCodeValidator::class);
+            AttributeCodeValidator::class
+        );
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 4924b65896421..23054ad613c21 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -106,8 +106,8 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-     * @param AttributeCodeValidator|null $attributeCodeValidator
      * @param array $data
+     * @param AttributeCodeValidator|null $attributeCodeValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codeCoverageIgnore
      */
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index ecb085453bb6c..de285e81b1d03 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -799,6 +799,7 @@ private function _getValue($array, $key, $default = null)
      * @param array $attr
      * @return $this
      * @throws LocalizedException
+     * @throws \Zend_Validate_Exception
      */
     public function addAttribute($entityTypeId, $code, array $attr)
     {
@@ -809,12 +810,7 @@ public function addAttribute($entityTypeId, $code, array $attr)
             $this->attributeMapper->map($attr, $entityTypeId)
         );
 
-        $attributeCode = isset($data['attribute_code']) ? $data['attribute_code'] : '';
-        if (!$this->attributeCodeValidator->isValid($attributeCode)) {
-            $errorMessage = implode("\n", $this->attributeCodeValidator->getMessages());
-
-            throw new LocalizedException(__($errorMessage));
-        }
+        $this->validateAttributeCode($data);
 
         $sortOrder = isset($attr['sort_order']) ? $attr['sort_order'] : null;
         $attributeId = $this->getAttribute($entityTypeId, $code, 'attribute_id');
@@ -1535,4 +1531,21 @@ private function _insertAttributeAdditionalData($entityTypeId, array $data)
 
         return $this;
     }
+
+    /**
+     * Validate attribute code.
+     *
+     * @param array $data
+     * @throws LocalizedException
+     * @throws \Zend_Validate_Exception
+     */
+    private function validateAttributeCode(array $data): void
+    {
+        $attributeCode = $data['attribute_code'] ?? '';
+        if (!$this->attributeCodeValidator->isValid($attributeCode)) {
+            $errorMessage = implode('\n', $this->attributeCodeValidator->getMessages());
+
+            throw new LocalizedException(__($errorMessage));
+        }
+    }
 }

From 2d8404d59dafd97c4881dfb1529deb6ce3d8e0f6 Mon Sep 17 00:00:00 2001
From: Roman Zhupanyn <roma.dj.elf@gmail.com>
Date: Thu, 28 Mar 2019 12:04:25 +0200
Subject: [PATCH 0842/1055] MAGETWO-98680: Cart Price Rule code is absent on
 "view Order/Invoice" Admin page if had been used for Free Shipping

---
 app/code/Magento/Sales/Block/Adminhtml/Totals.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
index f26df0946168a..ccc05a54676d9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -75,7 +75,7 @@ protected function _initTotals()
             $this->getSource()->getShippingDescription())
         ) {
             $shippingLabel = __('Shipping & Handling');
-            if ($this->isHasFreeShipping($this->getSource()) && $this->getSource()->getDiscountDescription()) {
+            if ($this->isHasFreeShipping($this->getOrder()) && $this->getSource()->getDiscountDescription()) {
                 $shippingLabel .= sprintf(' (%s)', $this->getSource()->getDiscountDescription());
             }
             $this->_totals['shipping'] = new \Magento\Framework\DataObject(

From 9e6f56bee5b354981a7a45bac26620f598d9cd72 Mon Sep 17 00:00:00 2001
From: Vishal Sutariya <vishalsutariya7037@gmail.com>
Date: Thu, 28 Mar 2019 15:35:46 +0530
Subject: [PATCH 0843/1055] Removed unwanted interface implementation

---
 .../Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
index 0de1111ffa722..216c730ccccc0 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
@@ -6,12 +6,10 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
-use Magento\Framework\App\Action\HttpGetActionInterface;
-
 /**
  * Get most viewed products controller.
  */
-class ProductsViewed extends AjaxBlock implements HttpGetActionInterface
+class ProductsViewed extends AjaxBlock
 {
     /**
      * Gets most viewed products list

From 33d05229a1b61449f1f3a7975bb4981dbf47fa11 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Thu, 28 Mar 2019 12:25:12 +0200
Subject: [PATCH 0844/1055] magento/graphql-ce#547: ProductFilterInput. Remove
 duplicate "special_price" field

---
 app/code/Magento/CatalogGraphQl/etc/schema.graphqls | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 778d0783305b7..dc37b3ce76113 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -460,7 +460,7 @@ input ProductFilterInput @doc(description: "ProductFilterInput defines the filte
     description: FilterTypeInput @doc(description: "Detailed information about the product. The value can include simple HTML tags.")
     short_description: FilterTypeInput @doc(description: "A short description of the product. Its use depends on the theme.")
     price: FilterTypeInput @doc(description: "The price of an item")
-    special_price: FilterTypeInput @doc(description: "The discounted price of the product")
+    special_price: FilterTypeInput @doc(description: "The discounted price of the product. Do not include the currency code.")
     special_from_date: FilterTypeInput @doc(description: "The beginning date that a product has a special price")
     special_to_date: FilterTypeInput @doc(description: "The end date that a product has a special price")
     weight: FilterTypeInput @doc(description: "The weight of the item, in units defined by the store")
@@ -477,7 +477,6 @@ input ProductFilterInput @doc(description: "ProductFilterInput defines the filte
     custom_layout_update: FilterTypeInput @doc(description: "XML code that is applied as a layout update to the product page")
     min_price: FilterTypeInput @doc(description:"The numeric minimal price of the product. Do not include the currency code.")
     max_price: FilterTypeInput @doc(description:"The numeric maximal price of the product. Do not include the currency code.")
-    special_price: FilterTypeInput @doc(description:"The numeric special price of the product. Do not include the currency code.")
     category_id: FilterTypeInput @doc(description: "Category ID the product belongs to")
     options_container: FilterTypeInput @doc(description: "If the product has multiple options, determines where they appear on the product page")
     required_options: FilterTypeInput @doc(description: "Indicates whether the product has required options")

From 975872e4a5cd8b3b8642e22ff8260e5ddb830f74 Mon Sep 17 00:00:00 2001
From: Roman Zhupanyn <roma.dj.elf@gmail.com>
Date: Thu, 28 Mar 2019 15:09:29 +0200
Subject: [PATCH 0845/1055] MAGETWO-98680: Cart Price Rule code is absent on
 "view Order/Invoice" Admin page if had been used for Free Shipping

---
 .../Magento/Sales/Block/Adminhtml/Totals.php     | 14 ++++++--------
 .../Magento/Sales/Block/Adminhtml/TotalsTest.php | 16 +++++++++-------
 .../order_with_free_shipping_by_coupon.php       |  1 +
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
index ccc05a54676d9..8172a3c0db4ad 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -9,8 +9,6 @@
 
 /**
  * Adminhtml sales totals block
- *
- * @package Magento\Sales\Block\Adminhtml
  */
 class Totals extends \Magento\Sales\Block\Order\Totals
 {
@@ -75,7 +73,7 @@ protected function _initTotals()
             $this->getSource()->getShippingDescription())
         ) {
             $shippingLabel = __('Shipping & Handling');
-            if ($this->isHasFreeShipping($this->getOrder()) && $this->getSource()->getDiscountDescription()) {
+            if ($this->isFreeShipping($this->getOrder()) && $this->getSource()->getDiscountDescription()) {
                 $shippingLabel .= sprintf(' (%s)', $this->getSource()->getDiscountDescription());
             }
             $this->_totals['shipping'] = new \Magento\Framework\DataObject(
@@ -127,16 +125,16 @@ protected function _initTotals()
      * @param Order $order
      * @return bool
      */
-    private function isHasFreeShipping(Order $order): bool
+    private function isFreeShipping(Order $order): bool
     {
-        $isActive = false;
+        $isFreeShipping = false;
         foreach ($order->getItems() as $orderItem) {
-            if ($orderItem->getFreeShipping() === '1') {
-                $isActive = true;
+            if ($orderItem->getFreeShipping() == '1') {
+                $isFreeShipping = true;
                 break;
             }
         }
 
-        return $isActive;
+        return $isFreeShipping;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
index 091b8e3f2b72c..1125fc1730718 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Block\Adminhtml;
 
 use Magento\Framework\View\LayoutInterface;
@@ -15,10 +17,10 @@
 class TotalsTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /** @var LayoutInterface */
-    protected $_layout;
+    private $layout;
 
     /** @var Totals */
-    protected $_block;
+    private $block;
 
     /** @var OrderFactory */
     private $orderFactory;
@@ -29,8 +31,8 @@ class TotalsTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
     protected function setUp()
     {
         parent::setUp();
-        $this->_layout = $this->_objectManager->get(LayoutInterface::class);
-        $this->_block = $this->_layout->createBlock(Totals::class, 'totals_block');
+        $this->layout = $this->_objectManager->get(LayoutInterface::class);
+        $this->block = $this->layout->createBlock(Totals::class, 'totals_block');
         $this->orderFactory = $this->_objectManager->get(OrderFactory::class);
     }
 
@@ -43,10 +45,10 @@ public function testShowShippingCoupon()
         $order = $this->orderFactory->create();
         $order->loadByIncrementId('100000001');
 
-        $this->_block->setOrder($order);
-        $this->_block->toHtml();
+        $this->block->setOrder($order);
+        $this->block->toHtml();
 
-        $shippingTotal = $this->_block->getTotal('shipping');
+        $shippingTotal = $this->block->getTotal('shipping');
         $this->assertNotFalse($shippingTotal, 'Shipping method is absent on the total\'s block.');
         $this->assertContains(
             '1234567890',
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
index 04e39ae3e462c..57ccffadaa4d0 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;

From f826017acfb81d549d5eaada07a0081ddc2498c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20K=C3=B6cke?= <jens@koecke.net>
Date: Thu, 28 Mar 2019 14:55:05 +0100
Subject: [PATCH 0846/1055] Correct bug 21993 config:set not storing scoped
 values

---
 .../Config/Console/Command/ConfigSet/DefaultProcessor.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index 86ae1f96749df..c622a48b7f2c8 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -90,10 +90,10 @@ public function process($path, $value, $scope, $scopeCode)
         }
 
         try {
-            $config = $this->configFactory->create([
+            $config = $this->configFactory->create(['data' => [
                 'scope' => $scope,
                 'scope_code' => $scopeCode,
-            ]);
+            ]]);
             $config->setDataByPath($path, $value);
             $config->save();
         } catch (\Exception $exception) {

From 313f3952ffad8f19474995072c1b71ea1e566544 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 28 Mar 2019 16:08:31 +0200
Subject: [PATCH 0847/1055] magento/magento2#19987: Static test fix.

---
 app/code/Magento/Widget/Model/Widget/Config.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
index 5832a08f0df06..b259d4e6224be 100644
--- a/app/code/Magento/Widget/Model/Widget/Config.php
+++ b/app/code/Magento/Widget/Model/Widget/Config.php
@@ -120,6 +120,7 @@ public function getWidgetPlaceholderImageUrls()
 
     /**
      * Return url to error image
+     *
      * @return string
      */
     public function getErrorImageUrl()
@@ -129,6 +130,7 @@ public function getErrorImageUrl()
 
     /**
      * Return url to wysiwyg plugin
+     *
      * @return string
      */
     public function getWysiwygJsPluginSrc()
@@ -189,6 +191,8 @@ public function decodeWidgetsFromQuery($queryParam)
     }
 
     /**
+     * Get available widgets.
+     *
      * @param \Magento\Framework\DataObject $config Editor element config
      * @return array
      */

From cbdfcc32f11b5676907f97069a30c52135b9c278 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Thu, 28 Mar 2019 16:00:29 +0100
Subject: [PATCH 0848/1055] Refactoring

---
 ...efrontCustomerResetPasswordActionGroup.xml | 28 +++++++++++++++++
 ...StorefrontCustomerLoginMessagesSection.xml |  1 +
 ...refrontResetCustomerPasswordFailedTest.xml | 30 +++++++------------
 3 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
new file mode 100644
index 0000000000000..2c641317c6e9a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
@@ -0,0 +1,28 @@
+<?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="StorefrontCustomerResetPasswordActionGroup">
+        <arguments>
+            <argument name="email" type="string" />
+            <argument name="message" type="string" defaultValue="" />
+            <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+
+        <amOnPage stepKey="amOnSignInPage" url="{{StorefrontCustomerSignInPage.url}}"/>
+        <click stepKey="clickForgotPasswordLink" selector="{{StorefrontCustomerSignInFormSection.forgotPasswordLink}}"/>
+        <see stepKey="seePageTitle" userInput="Forgot Your Password" selector="{{StorefrontForgotPasswordSection.pageTitle}}"/>
+        <!-- Enter email and submit the forgot password form -->
+        <fillField stepKey="fillEmailField" userInput="{{email}}" selector="{{StorefrontForgotPasswordSection.email}}"/>
+        <click stepKey="clickResetPassword" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
+        <waitForPageLoad stepKey="waitForPageLoaded" />
+        <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForMessage" />
+        <see stepKey="seeMessage" userInput="{{message}}" selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml
index 078021db062cc..a9859cf58751b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml
@@ -11,5 +11,6 @@
     <section name="StorefrontCustomerLoginMessagesSection">
         <element name="successMessage" type="text" selector=".message-success"/>
         <element name="errorMessage" type="text" selector=".message-error"/>
+        <element name="messageByType" type="block" selector="#maincontent .message-{{messageType}}" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
index 7050050097874..684d0c0730c3f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
@@ -22,26 +22,18 @@
             <createData stepKey="customer" entity="Simple_US_Customer"/>
         </before>
         <after>
+            <magentoCLI command="config:set customer/captcha/enable 1" stepKey="enableCaptcha"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
-        <!-- Go to login page, and click on the forgot password link -->
-        <amOnPage stepKey="amOnSignInPage1"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <click stepKey="clickForgotPasswordLink1" selector="{{StorefrontCustomerSignInFormSection.forgotPasswordLink}}"/>
-        <see stepKey="seePageTitle1" userInput="Forgot Your Password" selector="{{StorefrontForgotPasswordSection.pageTitle}}"/>
-        <!-- Enter email and submit the forgot password form -->
-        <fillField stepKey="enterEmail1" userInput="$$customer.email$$" selector="{{StorefrontForgotPasswordSection.email}}"/>
-        <click stepKey="clickResetPassword1" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
-        <seeInCurrentUrl stepKey="seeInSignInPage" url="account/login"/>
-        <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.successMessage}}" stepKey="waitForSuccessMessage" />
-        <see stepKey="seeSuccessMessage" userInput="If there is an account associated with $$customer.email$$ you will receive an email with a link to reset your password." selector="{{StorefrontCustomerLoginMessagesSection.successMessage}}"/>
-        <!-- Repeat the procedure once again and ensure that on a second attempt customer sees an error -->
-        <amOnPage stepKey="amOnSignInPage2"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <click stepKey="clickForgotPasswordLink2" selector="{{StorefrontCustomerSignInFormSection.forgotPasswordLink}}"/>
-        <see stepKey="seePageTitle2" userInput="Forgot Your Password" selector="{{StorefrontForgotPasswordSection.pageTitle}}"/>
-        <fillField stepKey="enterEmail2" userInput="$$customer.email$$" selector="{{StorefrontForgotPasswordSection.email}}"/>
-        <click stepKey="clickResetPassword2" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
-        <seeInCurrentUrl stepKey="seeInForgotPasswordPage" url="account/forgotpassword"/>
-        <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" stepKey="waitForFailMessage" />
-        <see stepKey="seeFailMessage" userInput="We received too many requests for password resets. Please wait and try again later or contact hello@example.com." selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}"/>
+
+        <actionGroup ref="StorefrontCustomerResetPasswordActionGroup" stepKey="resetPasswordFirstAttempt">
+            <argument name="email" value="$$customer.email$$" />
+            <argument name="message" value="If there is an account associated with $$customer.email$$ you will receive an email with a link to reset your password."/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerResetPasswordActionGroup" stepKey="resetPasswordSecondAttempt">
+            <argument name="email" value="$$customer.email$$" />
+            <argument name="message" value="We received too many requests for password resets. Please wait and try again later or contact hello@example.com."/>
+            <argument name="messageType" value="error" />
+        </actionGroup>
     </test>
 </tests>

From 51c984e65956dcce1ffc259c8fbac13a1c48f7f7 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Thu, 28 Mar 2019 10:42:08 -0500
Subject: [PATCH 0849/1055] GraphQL-513: Test coverage for graphql GET support

- added integration test for queries with parameterized variables
---
 .../Controller/GraphQlControllerTest.php      | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index 32dfa63b7ab70..59b29e3b5d0ce 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -180,6 +180,61 @@ public function testMutationWithHttpGet()
         $this->assertEquals('Mutation requests allowed only for POST requests', $output['errors'][0]);
     }
 
+    /** Test request is dispatched and response generated when using GET request with parameterized query string
+     *
+     * @return void
+     */
+    public function testDispatchGetWithParameterizedVariables() : void
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+
+        /** @var ProductInterface $product */
+        $product = $productRepository->get('simple1');
+        $query1 =  <<<'QUERY'
+                
+ query GetProducts($filterInput:ProductFilterInput){
+ products(
+  filter:$filterInput
+){
+  items{
+   id
+   name
+   sku
+  }  
+}
+ 
+}
+QUERY;
+        $variables = [
+            'filterInput'=>[
+                'sku' =>['eq' => 'simple1']
+            ]
+        ];
+        $postData = [
+            'query'         => $query1,
+            'variables'     => json_encode($variables),
+            'operationName' => null
+        ];
+
+
+        /** @var Http $request */
+        $request = $this->objectManager->get(Http::class);
+        $request->setPathInfo('/graphql');
+        $request->setMethod('GET');
+        $request->setParams($postData);
+        $response = $this->graphql->dispatch($request);
+        $output = $this->jsonSerializer->unserialize($response->getContent());
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+
+        $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
+        $this->assertTrue(!empty($output['data']['products']['items']), 'Products array has items');
+        $this->assertTrue(!empty($output['data']['products']['items'][0]), 'Products array has items');
+        $this->assertEquals($output['data']['products']['items'][0]['id'], $product->getData($linkField));
+        $this->assertEquals($output['data']['products']['items'][0]['sku'], $product->getSku());
+        $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
+    }
+
     /**
      * Test the errors on graphql output
      *

From d49445a7ff25ec1e7d8413ebeceaa06432786d05 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Thu, 28 Mar 2019 11:35:16 -0500
Subject: [PATCH 0850/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../Magento/Test/Integrity/DeclarativeDependencyTest.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
index a7fb86e7dff29..b19caa650e5e7 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
@@ -85,7 +85,7 @@ function ($file) {
                 foreach ($undeclaredDependency as $name => $modules) {
                     $modules = array_unique($modules);
                     if ($this->filterBlacklistedDependencies($foundModuleName, $modules)) {
-                        $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules);
+                        $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules) . "\n";
                     }
                 }
                 if (count($result)) {
@@ -144,12 +144,12 @@ private function getErrorMessage(string $id): string
         $entityType = $decodedId['entityType'];
         if ($entityType === DeclarativeSchemaDependencyProvider::SCHEMA_ENTITY_TABLE) {
             $message = sprintf(
-                'Table %s has undeclared dependency on one of the next modules.',
+                'Table %s has undeclared dependency on one of the following modules:',
                 $decodedId['tableName']
             );
         } else {
             $message = sprintf(
-                '%s %s from %s table has undeclared dependency on one of the next modules.',
+                '%s %s from %s table has undeclared dependency on one of the following modules:',
                 ucfirst($entityType),
                 $decodedId['entityName'],
                 $decodedId['tableName']

From f421d0458d97e195e2bab207a662a64277eb7869 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Thu, 28 Mar 2019 11:48:17 -0500
Subject: [PATCH 0851/1055] MC-15466: Migrate PWA GraphQL scenarios

---
 setup/performance-toolkit/benchmark.jmx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 08ce61e9b1a8e..f8b8244b2f898 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -36,7 +36,7 @@
           </elementProp>
           <elementProp name="graphql_port_number" elementType="Argument">
             <stringProp name="Argument.name">graphql_port_number</stringProp>
-            <stringProp name="Argument.value">${__P(graphql_port_number,80)}</stringProp>
+            <stringProp name="Argument.value">${__P(graphql_port_number,)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="admin_password" elementType="Argument">
@@ -38438,7 +38438,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(\n   pageSize:20\n   currentPage:0\n    sort:{price:ASC}\n    search: \"configurable\"\n        filter: {name: {like: \"Configurable Product%\"} }\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        \t\t\tweight\n      \t\t\t}\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}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(\n   pageSize:20\n   currentPage:0\n    search: \"configurable\"\n        filter: {name: {like: \"Configurable Product%\"} }\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        \t\t\tweight\n      \t\t\t}\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}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -38498,7 +38498,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(\n   pageSize:20\n   currentPage:0\n    sort:{price:ASC}\n    search: \"configurable\") {\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        \t\t\tweight\n      \t\t\t}\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                            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}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(\n   pageSize:20\n   currentPage:0\n    search: \"configurable\") {\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        \t\t\tweight\n      \t\t\t}\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                            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}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -38558,7 +38558,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(\n   pageSize:20\n   currentPage:0\n    sort:{price:ASC}\n    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.value">{"query":"{\n    products(\n   pageSize:20\n   currentPage:0\n    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 ed348f79eef1f741bafc950bc93e480d55503635 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Thu, 28 Mar 2019 13:09:41 -0500
Subject: [PATCH 0852/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

---
 .../Magento/GraphQl/Controller/GraphQlControllerTest.php         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index 59b29e3b5d0ce..6e8d60a177c5d 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -217,7 +217,6 @@ public function testDispatchGetWithParameterizedVariables() : void
             'operationName' => null
         ];
 
-
         /** @var Http $request */
         $request = $this->objectManager->get(Http::class);
         $request->setPathInfo('/graphql');

From 5ec72e426a1771ffca7da16d0d00bf905f15f016 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Thu, 28 Mar 2019 21:06:38 +0200
Subject: [PATCH 0853/1055] MAGETWO-70996: [GitHub] Customer Address "default
 billing address" Attribute Not Used in Checkout #8777

---
 .../BraintreeCreditCardOnCheckoutTest.xml     |  1 +
 .../Mftf/Section/CheckoutPaymentSection.xml   |  1 +
 ...StorefrontCheckoutPaymentMethodSection.xml |  1 +
 ...ddressShouldBeCheckedOnPaymentPageTest.xml | 63 +++++++++++++++++++
 .../Test/StorefrontCustomerCheckoutTest.xml   | 19 +++---
 ...OrderWithNewAddressesThatWasEditedTest.xml |  3 +-
 .../web/js/model/checkout-data-resolver.js    |  9 +--
 .../Test/TestCase/OnePageCheckoutTest.xml     |  7 +--
 .../TestStep/FillBillingInformationStep.php   | 35 +++++++++--
 .../payment/method-renderer/cc-form.test.js   | 12 ++++
 .../payment/method-renderer/paypal.test.js    | 12 ++++
 .../paypal-express-abstract.test.js           | 12 ++++
 12 files changed, 152 insertions(+), 23 deletions(-)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml

diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
index f27477ce8a672..84a3bbf8262d2 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
@@ -87,6 +87,7 @@
         <waitForPageLoad stepKey="waitForPageLoad10"/>
         <click selector="{{BraintreeConfigurationPaymentSection.paymentMethod}}" stepKey="SelectBraintreePaymentMethod1"/>
         <waitForPageLoad stepKey="waitForPageLoad11"/>
+        <click selector="{{CheckoutPaymentSection.shippingAndBillingAddressSame}}" stepKey="CheckCheckBox"/>
         <click selector="{{CheckoutPaymentSection.shippingAndBillingAddressSame}}" stepKey="UncheckCheckBox"/>
 
         <click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="clickToUpdate"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index 0206c18b819c2..f4d14fdcd827f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -54,5 +54,6 @@
         <element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
         <element name="noQuotes" type="text" selector=".no-quotes-block"/>
         <element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
+        <element name="addressOptionByName" type="text" selector=" //option[text()='{{action}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
index 55c4385706ba9..9d9a96d2ea5e6 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
@@ -12,5 +12,6 @@
         <element name="billingAddress" type="text" selector=".checkout-billing-address"/>
         <element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[@class='payment-method']//label//span[contains(., '{{methodName}}')]/../..//input" parameterized="true"/>
         <element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
+        <element name="billingAddressSameAsShippingShared" type="checkbox" selector="#billing-address-same-as-shipping-shared"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
new file mode 100644
index 0000000000000..86c466ad06034
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
@@ -0,0 +1,63 @@
+<?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="DefaultBillingAddressShouldBeCheckedOnPaymentPageTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via the Storefront"/>
+            <title value="The default billing address should be used on checkout"/>
+            <description value="Default billing address should be preselected on payments page on checkout if it exist"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-98892"/>
+            <useCaseId value="MAGETWO-70996"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <!--Logout from customer account-->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+        <!--Go to Storefront as Customer-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <!-- Add simple product to cart and go to checkout-->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <!-- Click "+ New Address" and Fill new address-->
+        <click selector="{{CheckoutShippingSection.newAddressButton}}" stepKey="addAddress"/>
+        <actionGroup ref="LoggedInCheckoutWithOneAddressFieldWithoutStateField" stepKey="changeAddress">
+            <argument name="Address" value="UK_Not_Default_Address"/>
+            <argument name="classPrefix" value="._show"/>
+        </actionGroup>
+        <!--Click "Save Addresses" -->
+        <click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveAddress"/>
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <dontSeeElement selector="{{StorefrontCheckoutAddressPopupSection.newAddressModalPopup}}" stepKey="dontSeeModalPopup"/>
+        <!--Select Shipping Rate "Flat Rate" and click "Next" button-->
+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" stepKey="selectFlatShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <!--Verify that "My billing and shipping address are the same" is unchecked and billing address is preselected-->
+        <dontSeeCheckboxIsChecked selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="shippingAndBillingAddressIsSameUnchecked"/>
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" stepKey="assertBillingAddress"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
index e7c2ad3dd28a4..c298e949fd9ea 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -196,7 +196,7 @@
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
         <waitForElement stepKey="waitForPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
-        <see stepKey="seeBillingAddressIsCorrect2" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" />
+        <see stepKey="seeBillingAddressIsCorrect2" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" />
         <click stepKey="clickPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" />
         <waitForPageLoad stepKey="waitForOrderSuccessPage2"/>
         <see stepKey="seeSuccessMessage2" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
@@ -216,6 +216,7 @@
             <createData entity="ApiSimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+            <magentoCLI stepKey="setShowBillingAddressOnCheckout" command="config:set checkout/options/display_billing_address_on 1" />
             <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 1" />
             <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry GB" />
             <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
@@ -226,6 +227,7 @@
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 0" />
             <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry ''" />
+            <magentoCLI stepKey="setShowBillingAddressOnCheckout" command="config:set checkout/options/display_billing_address_on 0" />
         </after>
         <!-- Login as Customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
@@ -253,16 +255,19 @@
         <dontsee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
 
         <!-- Fill UK Address and verify that payment available and checkout successful -->
-        <click selector="{{CheckoutHeaderSection.shippingMethodStep}}" stepKey="goToShipping" />
-        <click selector="{{CheckoutShippingSection.newAddressButton}}" stepKey="fillNewAddress" />
-        <actionGroup ref="LoggedInUserCheckoutAddNewShippingSectionWithoutRegionActionGroup" stepKey="customerCheckoutFillingShippingSectionUK">
-            <argument name="customerVar" value="CustomerEntityOne" />
-            <argument name="customerAddressVar" value="UK_Not_Default_Address" />
+        <click selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="UncheckCheckCheckBox"/>
+        <click selector="{{CheckoutShippingSection.addressDropdown}}" stepKey="clickOnAddressDropDown"/>
+        <click selector="{{CheckoutPaymentSection.addressOptionByName('New Address')}}" stepKey="clickOnNewAddress"/>
+        <waitForPageLoad stepKey="waitNewAddressBillingForm"/>
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="Address" value="updateCustomerUKAddress"/>
+            <argument name="classPrefix" value="[aria-hidden=false]"/>
         </actionGroup>
+        <click selector="{{CheckoutPaymentSection.addressAction('Update')}}" stepKey="clickUpdateBillingAddressButton" />
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="customerSelectCheckMoneyOrderPayment" />
         <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceorder">
             <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage" />
             <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
         </actionGroup>
     </test>
-</tests>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
index 8537e10ce5a03..651c5bd8d4375 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -71,6 +71,7 @@
         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
 
         <!--Refresh Page and Place Order-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <reloadPage stepKey="reloadPage"/>
         <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPlaceOrderButton"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
@@ -89,7 +90,7 @@
         <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}}"
              selector="{{StorefrontCustomerOrderViewSection.shippingAddress}}" stepKey="checkShippingAddress"/>
-        <see userInput="{{UK_Not_Default_Address.street[0]}} {{UK_Not_Default_Address.city}}, {{UK_Not_Default_Address.postcode}}"
+        <see userInput="{{US_Address_TX_Default_Billing.street[0]}}"
              selector="{{StorefrontCustomerOrderViewSection.billingAddress}}" stepKey="checkBillingAddress"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
index 9cc60a3645d58..8f468e9966906 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -243,15 +243,12 @@ define([
                 return;
             }
 
-            if (quote.isVirtual()) {
-                isBillingAddressInitialized = addressList.some(function (addrs) {
+            if (quote.isVirtual() || !quote.billingAddress()) {
+                addressList.some(function (addrs) {
                     if (addrs.isDefaultBilling()) {
                         selectBillingAddress(addrs);
-
-                        return true;
+                        isBillingAddressInitialized = true;
                     }
-
-                    return false;
                 });
             }
 
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
index 0edd8f4183f30..daf9aaae50580 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
@@ -15,13 +15,11 @@
             <data name="shippingAddressCustomer" xsi:type="array">
                 <item name="added" xsi:type="number">1</item>
             </data>
-            <data name="billingAddressCustomer" xsi:type="array">
-                <item name="added" xsi:type="number">1</item>
-            </data>
             <data name="prices" xsi:type="array">
                 <item name="grandTotal" xsi:type="string">565.00</item>
             </data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="editBillingInformation" xsi:type="boolean">false</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo</data>
@@ -43,6 +41,7 @@
                 <item name="grandTotal" xsi:type="string">565.00</item>
             </data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="editBillingInformation" xsi:type="boolean">false</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo</data>
@@ -61,7 +60,7 @@
             <data name="shippingAddress/dataset" xsi:type="string">UK_address_without_email</data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
-            <data name="billingCheckboxState" xsi:type="string">Yes</data>
+            <data name="editBillingInformation" xsi:type="boolean">false</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo</data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
index aa7eba634145f..cf2f99a78cefb 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
@@ -126,11 +126,15 @@ public function run()
         if ($this->billingCheckboxState) {
             $this->assertBillingAddressCheckbox->processAssert($this->checkoutOnepage, $this->billingCheckboxState);
         }
-        if ($this->billingCheckboxState === 'Yes' && !$this->editBillingInformation) {
-            return [
-                'billingAddress' => $this->shippingAddress
-            ];
+
+        if (!$this->editBillingInformation) {
+            $billingAddress = $this->billingCheckboxState === 'Yes'
+                ? $this->shippingAddress
+                : $this->getDefaultBillingAddress();
+
+            return ['billingAddress' => $billingAddress];
         }
+
         if ($this->billingAddress) {
             $selectedPaymentMethod = $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock();
             if ($this->shippingAddress) {
@@ -139,9 +143,11 @@ public function run()
             $selectedPaymentMethod->getBillingBlock()->fillBilling($this->billingAddress);
             $billingAddress = $this->billingAddress;
         }
+
         if (isset($this->billingAddressCustomer['added'])) {
             $addressIndex = $this->billingAddressCustomer['added'];
-            $billingAddress = $this->customer->getDataFieldConfig('address')['source']->getAddresses()[$addressIndex];
+            $billingAddress = $this->customer->getDataFieldConfig('address')['source']
+                ->getAddresses()[$addressIndex];
             $address = $this->objectManager->create(
                 \Magento\Customer\Test\Block\Address\Renderer::class,
                 ['address' => $billingAddress, 'type' => 'html_for_select_element']
@@ -156,4 +162,23 @@ public function run()
             'billingAddress' => $billingAddress
         ];
     }
+
+    /**
+     * Get default billing address
+     *
+     * @return Address|null
+     */
+    private function getDefaultBillingAddress()
+    {
+        $addresses = $this->customer->getDataFieldConfig('address')['source']->getAddresses();
+        $defaultAddress = null;
+        foreach ($addresses as $address) {
+            if ($address->getDefaultBilling() === 'Yes') {
+                $defaultAddress = $address;
+                break;
+            }
+        }
+
+        return $defaultAddress;
+    }
 }
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
index 8fdef2cbaadbb..429342b43bcb2 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
@@ -15,6 +15,18 @@ define([
     describe('Magento_Braintree/js/view/payment/method-renderer/cc-form', function () {
         var injector = new Squire(),
             mocks = {
+                'Magento_Checkout/js/model/checkout-data-resolver': {
+
+                    /** Stub */
+                    applyBillingAddress: function () {
+                        return true;
+                    },
+
+                    /** Stub */
+                    resolveBillingAddress: function () {
+                        return true;
+                    }
+                },
                 'Magento_Checkout/js/model/quote': {
                     billingAddress: ko.observable(),
                     shippingAddress: ko.observable(),
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
index 4fc73caf7e14b..6ba0ed0b58f03 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
@@ -14,6 +14,18 @@ define([
 
         var injector = new Squire(),
             mocks = {
+                'Magento_Checkout/js/model/checkout-data-resolver': {
+
+                    /** Stub */
+                    applyBillingAddress: function () {
+                        return true;
+                    },
+
+                    /** Stub */
+                    resolveBillingAddress: function () {
+                        return true;
+                    }
+                },
                 'Magento_Checkout/js/model/quote': {
                     billingAddress: ko.observable(),
                     shippingAddress: ko.observable({
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 29a2e8db914a7..7bc9a2a0113aa 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
@@ -24,6 +24,18 @@ define([
                 return true;
             }).and.callThrough(),
             mocks = {
+                'Magento_Checkout/js/model/checkout-data-resolver': {
+
+                    /** Stub */
+                    applyBillingAddress: function () {
+                        return true;
+                    },
+
+                    /** Stub */
+                    resolveBillingAddress: function () {
+                        return true;
+                    }
+                },
                 'Magento_Checkout/js/model/quote': {
                     billingAddress: ko.observable(),
                     shippingAddress: ko.observable(),

From 9ee635ddc63640bb5403fb4e3f3597543dd01716 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Thu, 28 Mar 2019 14:18:07 -0500
Subject: [PATCH 0854/1055] REPO-66: [EQP][Sniffs Consolidation] Deliver
 Magento Coding Standard to magento2ce - review fixes

---
 .../Config/Backend/Admin/AfterCustomUrlChangedObserver.php      | 2 +-
 .../Magento/Customer/Controller/Adminhtml/Index/Viewfile.php    | 2 +-
 app/code/Magento/Downloadable/Controller/Download/Link.php      | 2 +-
 .../Magento/Downloadable/Controller/Download/LinkSample.php     | 2 +-
 app/code/Magento/Downloadable/Controller/Download/Sample.php    | 2 +-
 .../Framework/Code/GeneratorTest/ParentClassWithNamespace.php   | 2 --
 .../Framework/Code/GeneratorTest/SourceClassWithNamespace.php   | 1 -
 lib/internal/Magento/Framework/App/Console/Response.php         | 2 +-
 .../Magento/Framework/App/Response/Http/FileFactory.php         | 2 +-
 .../Code/Test/Unit/Generator/TestAsset/ParentClass.php          | 2 --
 .../Code/Test/Unit/Generator/TestAsset/SourceClass.php          | 2 --
 11 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
index 4cd3ecad66afd..06fcc17f6e8dd 100644
--- a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
+++ b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
@@ -8,7 +8,7 @@
 use Magento\Framework\Event\ObserverInterface;
 
 /**
- * Class AfterCustomUrlChangedObserver
+ * Class AfterCustomUrlChangedObserver redirects to new custom admin URL.
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 7cb7c6a0d8679..e5455f5cbaaa9 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -17,7 +17,7 @@
 use Magento\Framework\DataObjectFactory;
 
 /**
- * Class Viewfile
+ * Class Viewfile serves to show file or image by file/image name provided in request parameters.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.AllPurposeAction)
diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php
index 283fc6bbe0d17..8b9f91dbd548c 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Link.php
@@ -10,7 +10,7 @@
 use Magento\Framework\App\ResponseInterface;
 
 /**
- * Class Link
+ * Class Link executes download link action.
  *
  * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
index 2f90179e6be1e..a6b06220bb5c7 100644
--- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
@@ -9,7 +9,7 @@
 use Magento\Framework\App\ResponseInterface;
 
 /**
- * Class LinkSample
+ * Class LinkSample executes download sample link action.
  *
  * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
index e36a0e1d99a39..165d8bcd56edf 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php
@@ -9,7 +9,7 @@
 use Magento\Framework\App\ResponseInterface;
 
 /**
- * Class Sample
+ * Class Sample executes download sample action.
  *
  * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php
index 6662c20e5576c..01e63126e5cde 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/ParentClassWithNamespace.php
@@ -8,8 +8,6 @@
 use Zend\Code\Generator\DocBlockGenerator;
 
 /**
- * Class ParentClassWithNamespace
- *
  * phpcs:ignoreFile
  */
 class ParentClassWithNamespace
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
index 4025a82abdf29..b9fc351ff64e6 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest/SourceClassWithNamespace.php
@@ -8,7 +8,6 @@
 use Zend\Code\Generator\ClassGenerator;
 
 /**
- * Class  SourceClassWithNamespace
  * phpcs:ignoreFile
  */
 class SourceClassWithNamespace extends ParentClassWithNamespace
diff --git a/lib/internal/Magento/Framework/App/Console/Response.php b/lib/internal/Magento/Framework/App/Console/Response.php
index cf2c490d690c7..2d048862213fc 100644
--- a/lib/internal/Magento/Framework/App/Console/Response.php
+++ b/lib/internal/Magento/Framework/App/Console/Response.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\App\Console;
 
 /**
- * Class Response
+ * HTTP response implementation.
  */
 class Response implements \Magento\Framework\App\ResponseInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
index 02dc8d27fdb1f..3fdec31c9a217 100644
--- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -8,7 +8,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
- * Class FileFactory
+ * Class FileFactory serves to declare file content in response for download.
  */
 class FileFactory
 {
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php
index 1d8ca249a073e..4565620a7557e 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/ParentClass.php
@@ -8,8 +8,6 @@
 use Zend\Code\Generator\DocBlockGenerator;
 
 /**
- * Class ParentClass
- *
  * phpcs:ignoreFile
  */
 class ParentClass
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php
index ba4cc9f4d3768..5ba3031a2ae4d 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/TestAsset/SourceClass.php
@@ -8,8 +8,6 @@
 use Zend\Code\Generator\ClassGenerator;
 
 /**
- * Class SourceClass
- *
  * phpcs:ignoreFile
  */
 class SourceClass extends ParentClass

From 7fa9e19004a3cdb9a07224d6da37a0519b722224 Mon Sep 17 00:00:00 2001
From: Ventimiglia Samuel <sam.ventimiglia@gmail.com>
Date: Fri, 29 Mar 2019 09:29:44 +0100
Subject: [PATCH 0855/1055] Removed two times zlib.output_compression on

## Enable resulting html compression

    #php_flag zlib.output_compression on

###########################################
---
 pub/.htaccess | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pub/.htaccess b/pub/.htaccess
index 926c012eef6a5..64166f1727c84 100644
--- a/pub/.htaccess
+++ b/pub/.htaccess
@@ -47,11 +47,6 @@
     php_flag session.auto_start off
 
 ############################################
-## Enable resulting html compression
-
-    #php_flag zlib.output_compression on
-
-###########################################
 # Disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off

From 423f92c698de842123b250f0caa578bdc791a47a Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 29 Mar 2019 14:35:43 +0300
Subject: [PATCH 0856/1055] MAGETWO-96429: Wrong special price displayed in
 product search results

- Delete preference for price;
- Deprecate class.
---
 .../Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php | 5 +++++
 app/code/Magento/Catalog/etc/frontend/di.xml                 | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
index f6893a41113e6..dabfdb74f0118 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
@@ -17,6 +17,9 @@
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @deprecated
+ * @see \Magento\Catalog\Model\Product\Type\Price
  */
 class FrontSpecialPrice extends Price
 {
@@ -66,6 +69,8 @@ public function __construct(
 
     /**
      * @inheritdoc
+     *
+     * @deprecated
      */
     protected function _applySpecialPrice($product, $finalPrice)
     {
diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
index 793a2291f599c..ee9c5b29da894 100644
--- a/app/code/Magento/Catalog/etc/frontend/di.xml
+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
@@ -120,5 +120,4 @@
         <plugin name="catalog_app_action_dispatch_controller_context_plugin"
                 type="Magento\Catalog\Plugin\Framework\App\Action\ContextPlugin" />
     </type>
-    <preference for="Magento\Catalog\Model\Product\Type\Price" type="Magento\Catalog\Model\Product\Type\FrontSpecialPrice" />
 </config>

From 0b7455fa35795a6835bebb15ec25009689f0605e Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Fri, 29 Mar 2019 14:24:23 +0200
Subject: [PATCH 0857/1055] MAGETWO-70996: [GitHub] Customer Address "default
 billing address" Attribute Not Used in Checkout #8777

---
 .../BraintreeCreditCardOnCheckoutTest.xml     |  4 --
 .../Mftf/Section/CheckoutPaymentSection.xml   |  2 +-
 ...ddressShouldBeCheckedOnPaymentPageTest.xml | 14 +++----
 .../Test/StorefrontCustomerCheckoutTest.xml   | 38 +++++++++----------
 .../web/js/model/checkout-data-resolver.js    |  7 +++-
 5 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
index 84a3bbf8262d2..d701993be2c4c 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
@@ -87,10 +87,6 @@
         <waitForPageLoad stepKey="waitForPageLoad10"/>
         <click selector="{{BraintreeConfigurationPaymentSection.paymentMethod}}" stepKey="SelectBraintreePaymentMethod1"/>
         <waitForPageLoad stepKey="waitForPageLoad11"/>
-        <click selector="{{CheckoutPaymentSection.shippingAndBillingAddressSame}}" stepKey="CheckCheckBox"/>
-        <click selector="{{CheckoutPaymentSection.shippingAndBillingAddressSame}}" stepKey="UncheckCheckBox"/>
-
-        <click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="clickToUpdate"/>
         <waitForPageLoad stepKey="waitForPageLoad12"/>
         <!--Place order-->
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="PlaceOrder1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index f4d14fdcd827f..7acfc14111b6f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -54,6 +54,6 @@
         <element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
         <element name="noQuotes" type="text" selector=".no-quotes-block"/>
         <element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
-        <element name="addressOptionByName" type="text" selector=" //option[text()='{{action}}']" parameterized="true"/>
+        <element name="billingAddressSelect" type="select" selector="select[name='billing_address_id']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
index 86c466ad06034..166f5022d5aeb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
@@ -25,18 +25,18 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--Go to Storefront as Customer-->
+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+                <argument name="Customer" value="$$createCustomer$$" />
+            </actionGroup>
         </before>
         <after>
-            <!--Logout from customer account-->
-            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!--Logout from customer account-->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
         </after>
-        <!--Go to Storefront as Customer-->
-        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-            <argument name="Customer" value="$$createCustomer$$" />
-        </actionGroup>
         <!-- Add simple product to cart and go to checkout-->
         <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
             <argument name="product" value="$$createProduct$$"/>
@@ -53,7 +53,7 @@
         <waitForPageLoad stepKey="waitForAddressSaved"/>
         <dontSeeElement selector="{{StorefrontCheckoutAddressPopupSection.newAddressModalPopup}}" stepKey="dontSeeModalPopup"/>
         <!--Select Shipping Rate "Flat Rate" and click "Next" button-->
-        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" stepKey="selectFlatShippingMethod"/>
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
         <!--Verify that "My billing and shipping address are the same" is unchecked and billing address is preselected-->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
index c298e949fd9ea..13b7be6e3c411 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -186,20 +186,20 @@
         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity2"/>
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2" />
 
-        <click stepKey="changeShippingAddress" selector="{{CheckoutShippingMethodsSection.shipHereButton}}"/>
-        <waitForElementNotVisible stepKey="waitForShippingMethodLoaderNotVisible" selector="{{CheckoutShippingMethodsSection.shippingMethodLoader}}" time="30"/>
-        <waitForElementVisible stepKey="waitForShippingMethodRadioToBeVisible" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" time="30"/>
+        <click selector="{{CheckoutShippingMethodsSection.shipHereButton}}" stepKey="changeShippingAddress"/>
+        <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodLoader}}" time="30" stepKey="waitForShippingMethodLoaderNotVisible"/>
+        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" time="30" stepKey="waitForShippingMethodRadioToBeVisible"/>
         <waitForPageLoad stepKey="waitForPageLoad23"/>
-        <click stepKey="selectFirstShippingMethod2" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
-        <waitForElement stepKey="waitForShippingMethodSelect2" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
-        <click stepKey="clickNextOnShippingMethodLoad2" selector="{{CheckoutShippingMethodsSection.next}}" />
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod2"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30"  stepKey="waitForShippingMethodSelect2"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}"  stepKey="clickNextOnShippingMethodLoad2"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
-        <waitForElement stepKey="waitForPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
-        <see stepKey="seeBillingAddressIsCorrect2" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" />
-        <click stepKey="clickPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" />
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton2"/>
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" stepKey="seeBillingAddressIsCorrect2" />
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton2"/>
         <waitForPageLoad stepKey="waitForOrderSuccessPage2"/>
-        <see stepKey="seeSuccessMessage2" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" stepKey="seeSuccessMessage2"/>
     </test>
     <test name="StorefrontCustomerCheckoutTestWithRestrictedCountriesForPayment">
         <annotations>
@@ -216,18 +216,18 @@
             <createData entity="ApiSimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <magentoCLI stepKey="setShowBillingAddressOnCheckout" command="config:set checkout/options/display_billing_address_on 1" />
-            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 1" />
-            <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry GB" />
+            <magentoCLI command="config:set checkout/options/display_billing_address_on 1"  stepKey="setShowBillingAddressOnPaymentPage" />
+            <magentoCLI command="config:set payment/checkmo/allowspecific 1" stepKey="allowSpecificValue"  />
+            <magentoCLI command="config:set payment/checkmo/specificcountry GB" stepKey="specificCountryValue" />
             <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-            <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 0" />
-            <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry ''" />
-            <magentoCLI stepKey="setShowBillingAddressOnCheckout" command="config:set checkout/options/display_billing_address_on 0" />
+            <magentoCLI command="config:set payment/checkmo/allowspecific 0" stepKey="allowSpecificValue" />
+            <magentoCLI command="config:set payment/checkmo/specificcountry ''" stepKey="specificCountryValue" />
+            <magentoCLI command="config:set checkout/options/display_billing_address_on 0" stepKey="setDisplayBillingAddressOnPaymentMethod" />
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
         </after>
         <!-- Login as Customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
@@ -255,9 +255,9 @@
         <dontsee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
 
         <!-- Fill UK Address and verify that payment available and checkout successful -->
-        <click selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="UncheckCheckCheckBox"/>
+        <uncheckOption selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="uncheckBillingAddressSameAsShippingCheckCheckBox"/>
         <click selector="{{CheckoutShippingSection.addressDropdown}}" stepKey="clickOnAddressDropDown"/>
-        <click selector="{{CheckoutPaymentSection.addressOptionByName('New Address')}}" stepKey="clickOnNewAddress"/>
+        <selectOption selector="{{CheckoutPaymentSection.billingAddressSelect}}" userInput="New Address" stepKey="clickOnNewAddress"/>
         <waitForPageLoad stepKey="waitNewAddressBillingForm"/>
         <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
             <argument name="Address" value="updateCustomerUKAddress"/>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
index 8f468e9966906..e54f464f24d02 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -244,11 +244,14 @@ define([
             }
 
             if (quote.isVirtual() || !quote.billingAddress()) {
-                addressList.some(function (addrs) {
+                isBillingAddressInitialized = addressList.some(function (addrs) {
                     if (addrs.isDefaultBilling()) {
                         selectBillingAddress(addrs);
-                        isBillingAddressInitialized = true;
+
+                        return true;
                     }
+
+                    return false;
                 });
             }
 

From 7c6d41a07595e6fee7d416fe4921739d1e32e19e Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Fri, 29 Mar 2019 15:22:56 +0200
Subject: [PATCH 0858/1055] MAGETWO-97423: Price column in sales_order_item
 table shows the price including tax when Custom Price is applied on admin
 order

---
 .../Sales/Total/Quote/CommonTaxCollector.php  |   3 +
 .../Total/Quote/CommonTaxCollectorTest.php    | 130 +++++++++++++-----
 .../Tax/Model/Sales/Total/Quote/SetupUtil.php |  17 ++-
 .../including_tax_with_custom_price.php       |  93 +++++++++++++
 .../tax_calculation_data_aggregated.php       |   2 +
 5 files changed, 213 insertions(+), 32 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php

diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index bff489ee50c2f..31d5deb7ea0d5 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -688,6 +688,9 @@ public function updateItemTaxInfo($quoteItem, $itemTaxDetails, $baseItemTaxDetai
     {
         //The price should be base price
         $quoteItem->setPrice($baseItemTaxDetails->getPrice());
+        if ($quoteItem->getCustomPrice() && $this->taxHelper->applyTaxOnCustomPrice()) {
+            $quoteItem->setCustomPrice($baseItemTaxDetails->getPrice());
+        }
         $quoteItem->setConvertedPrice($itemTaxDetails->getPrice());
         $quoteItem->setPriceInclTax($itemTaxDetails->getPriceInclTax());
         $quoteItem->setRowTotal($itemTaxDetails->getRowTotal());
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
index 9325ec10dc627..711ead4625659 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
@@ -3,79 +3,106 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Tax\Test\Unit\Model\Sales\Total\Quote;
 
-/**
- * Test class for \Magento\Tax\Model\Sales\Total\Quote\Tax
- */
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Tax\Helper\Data as TaxHelper;
+use Magento\Tax\Api\Data\TaxDetailsItemInterface;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Store\Model\Store;
+use Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector;
+use Magento\Tax\Model\Config;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+use Magento\Quote\Model\Quote;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
+use Magento\Tax\Api\Data\TaxClassKeyInterface;
+use Magento\Tax\Model\Sales\Quote\ItemDetails;
+use Magento\Tax\Model\TaxClass\Key as TaxClassKey;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory;
+use Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Api\Data\ShippingInterface;
+use Magento\Quote\Model\Quote\Address\Total as QuoteAddressTotal;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
+ * Common tax collector test
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
+class CommonTaxCollectorTest extends TestCase
 {
     /**
-     * @var \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector
+     * @var CommonTaxCollector
      */
     private $commonTaxCollector;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Model\Config
+     * @var MockObject|Config
      */
     private $taxConfig;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\Quote\Address
+     * @var MockObject|QuoteAddress
      */
     private $address;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\Quote
+     * @var MockObject|Quote
      */
     private $quote;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\Store
+     * @var MockObject|Store
      */
     private $store;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|
+     * @var MockObject
      */
     protected $taxClassKeyDataObjectFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|
+     * @var MockObject
      */
     protected $quoteDetailsItemDataObjectFactoryMock;
 
     /**
-     * @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface
+     * @var QuoteDetailsItemInterface
      */
     protected $quoteDetailsItemDataObject;
 
     /**
-     * @var \Magento\Tax\Api\Data\TaxClassKeyInterface
+     * @var TaxClassKeyInterface
      */
     protected $taxClassKeyDataObject;
 
+    /**
+     * @var TaxHelper
+     */
+    protected $taxHelper;
+
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
 
-        $this->taxConfig = $this->getMockBuilder(\Magento\Tax\Model\Config::class)
+        $this->taxConfig = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getShippingTaxClass', 'shippingPriceIncludesTax'])
+            ->setMethods(['getShippingTaxClass', 'shippingPriceIncludesTax', 'discountTax'])
             ->getMock();
 
-        $this->store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        $this->store = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->setMethods(['__wakeup'])
             ->getMock();
 
-        $this->quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+        $this->quote = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->setMethods(['__wakeup', 'getStore'])
             ->getMock();
@@ -84,7 +111,7 @@ protected function setUp()
             ->method('getStore')
             ->will($this->returnValue($this->store));
 
-        $this->address = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address::class)
+        $this->address = $this->getMockBuilder(QuoteAddress::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -92,31 +119,35 @@ protected function setUp()
             ->method('getQuote')
             ->will($this->returnValue($this->quote));
         $methods = ['create'];
-        $this->quoteDetailsItemDataObject = $objectManager->getObject(
-            \Magento\Tax\Model\Sales\Quote\ItemDetails::class
-        );
-        $this->taxClassKeyDataObject = $objectManager->getObject(\Magento\Tax\Model\TaxClass\Key::class);
+        $this->quoteDetailsItemDataObject = $objectManager->getObject(ItemDetails::class);
+        $this->taxClassKeyDataObject = $objectManager->getObject(TaxClassKey::class);
         $this->quoteDetailsItemDataObjectFactoryMock
-            = $this->createPartialMock(\Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory::class, $methods);
+            = $this->createPartialMock(QuoteDetailsItemInterfaceFactory::class, $methods);
         $this->quoteDetailsItemDataObjectFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->quoteDetailsItemDataObject);
         $this->taxClassKeyDataObjectFactoryMock =
-            $this->createPartialMock(\Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory::class, $methods);
+            $this->createPartialMock(TaxClassKeyInterfaceFactory::class, $methods);
         $this->taxClassKeyDataObjectFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->taxClassKeyDataObject);
+        $this->taxHelper = $this->getMockBuilder(TaxHelper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->commonTaxCollector = $objectManager->getObject(
-            \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector::class,
+            CommonTaxCollector::class,
             [
                 'taxConfig' => $this->taxConfig,
                 'quoteDetailsItemDataObjectFactory' => $this->quoteDetailsItemDataObjectFactoryMock,
-                'taxClassKeyDataObjectFactory' => $this->taxClassKeyDataObjectFactoryMock
+                'taxClassKeyDataObjectFactory' => $this->taxClassKeyDataObjectFactoryMock,
+                'taxHelper' => $this->taxHelper,
             ]
         );
     }
 
     /**
+     * Test for GetShippingDataObject
+     *
      * @param array $addressData
      * @param bool $useBaseCurrency
      * @param string $shippingTaxClass
@@ -128,8 +159,8 @@ public function testGetShippingDataObject(
         $useBaseCurrency,
         $shippingTaxClass,
         $shippingPriceInclTax
-    ) {
-        $shippingAssignmentMock = $this->createMock(\Magento\Quote\Api\Data\ShippingAssignmentInterface::class);
+    ): void {
+        $shippingAssignmentMock = $this->createMock(ShippingAssignmentInterface::class);
         $methods = [
             'getShippingDiscountAmount',
             'getShippingTaxCalculationAmount',
@@ -139,8 +170,10 @@ public function testGetShippingDataObject(
             'getBaseShippingAmount',
             'getBaseShippingDiscountAmount'
         ];
-        $totalsMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address\Total::class, $methods);
-        $shippingMock = $this->createMock(\Magento\Quote\Api\Data\ShippingInterface::class);
+        /** @var MockObject|QuoteAddressTotal $totalsMock */
+        $totalsMock = $this->createPartialMock(QuoteAddressTotal::class, $methods);
+        $shippingMock = $this->createMock(ShippingInterface::class);
+        /** @var MockObject|ShippingAssignmentInterface $shippingAssignmentMock */
         $shippingAssignmentMock->expects($this->once())->method('getShipping')->willReturn($shippingMock);
         $shippingMock->expects($this->once())->method('getAddress')->willReturn($this->address);
         $baseShippingAmount = $addressData['base_shipping_amount'];
@@ -184,9 +217,44 @@ public function testGetShippingDataObject(
     }
 
     /**
+     * Update item tax info
+     *
+     * @return void
+     */
+    public function testUpdateItemTaxInfo(): void
+    {
+        /** @var MockObject|QuoteItem $quoteItem */
+        $quoteItem = $this->getMockBuilder(QuoteItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPrice', 'setPrice', 'getCustomPrice', 'setCustomPrice'])
+            ->getMock();
+        $this->taxHelper->method('applyTaxOnCustomPrice')->willReturn(true);
+        $quoteItem->method('getCustomPrice')->willReturn(true);
+        /** @var MockObject|TaxDetailsItemInterface $itemTaxDetails */
+        $itemTaxDetails = $this->getMockBuilder(TaxDetailsItemInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var MockObject|TaxDetailsItemInterface $baseItemTaxDetails */
+        $baseItemTaxDetails = $this->getMockBuilder(TaxDetailsItemInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $quoteItem->expects($this->once())->method('setCustomPrice');
+
+        $this->commonTaxCollector->updateItemTaxInfo(
+            $quoteItem,
+            $itemTaxDetails,
+            $baseItemTaxDetails,
+            $this->store
+        );
+    }
+
+    /**
+     * Data for testGetShippingDataObject
+     *
      * @return array
      */
-    public function getShippingDataObjectDataProvider()
+    public function getShippingDataObjectDataProvider(): array
     {
         $data = [
             'free_shipping' => [
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
index bd505fd4db035..0ae021b4e9036 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
@@ -9,8 +9,12 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Tax\Model\Config;
 use Magento\Tax\Model\Calculation;
+use Magento\Quote\Model\Quote\Item\Updater;
+use \Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
+ * Setup utility for quote
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SetupUtil
@@ -666,7 +670,18 @@ public function setupQuote($quoteData)
         $quote = $this->createQuote($quoteData, $customer);
 
         $this->addProductToQuote($quote, $quoteData['items']);
-
+        if (isset($quoteData['update_items'])) {
+            $updater = $this->objectManager->get(Updater::class);
+            $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+            foreach ($quoteData['update_items'] as $sku => $updateItem) {
+                $product = $productRepository->get($sku);
+                $quoteItem = $quote->getItemByProduct($product);
+                $updater->update(
+                    $quoteItem,
+                    $updateItem
+                );
+            }
+        }
         //Set shipping amount
         if (isset($quoteData['shipping_method'])) {
             $quote->getShippingAddress()->setShippingMethod($quoteData['shipping_method']);
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php
new file mode 100644
index 0000000000000..584b356beb53b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Tax\Model\Config;
+use Magento\Tax\Model\Sales\Total\Quote\SetupUtil;
+
+$taxCalculationData['including_tax_with_custom_price'] = [
+    'config_data' => [
+        SetupUtil::CONFIG_OVERRIDES => [
+            Config::CONFIG_XML_PATH_PRICE_INCLUDES_TAX => 1,
+            Config::CONFIG_XML_PATH_APPLY_ON => 0
+        ],
+        SetupUtil::TAX_RATE_OVERRIDES => [
+            SetupUtil::TAX_RATE_TX => 8.25,
+            SetupUtil::TAX_STORE_RATE => 8.25,
+        ],
+        SetupUtil::TAX_RULE_OVERRIDES => [
+        ],
+    ],
+    'quote_data' => [
+        'billing_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'shipping_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'items' => [
+            [
+                'sku' => 'simple1',
+                'price' => 16.24,
+                'qty' => 1,
+            ],
+        ],
+        'update_items' => [
+            'simple1' => [
+                'custom_price' => 14,
+                'qty' => 1,
+            ],
+        ],
+    ],
+    'expected_results' => [
+        'address_data' => [
+            'subtotal' => 12.93,
+            'base_subtotal' => 12.93,
+            'subtotal_incl_tax' => 14,
+            'base_subtotal_incl_tax' => 14,
+            'tax_amount' => 1.07,
+            'base_tax_amount' => 1.07,
+            'shipping_amount' => 0,
+            'base_shipping_amount' => 0,
+            'shipping_incl_tax' => 0,
+            'base_shipping_incl_tax' => 0,
+            'shipping_taxable' => 0,
+            'base_shipping_taxable' => 0,
+            'shipping_tax_amount' => 0,
+            'base_shipping_tax_amount' => 0,
+            'discount_amount' => 0,
+            'base_discount_amount' => 0,
+            'discount_tax_compensation_amount' => 0,
+            'base_discount_tax_compensation_amount' => 0,
+            'shipping_discount_tax_compensation_amount' => 0,
+            'base_shipping_discount_tax_compensation_amount' => 0,
+            'grand_total' => 14,
+            'base_grand_total' => 14,
+        ],
+        'items_data' => [
+            'simple1' => [
+                'row_total' => 12.93,
+                'base_row_total' => 12.93,
+                'tax_percent' => 8.25,
+                'price' => 12.93,
+                'custom_price' => 12.93,
+                'original_custom_price' => 14,
+                'base_price' => 12.93,
+                'price_incl_tax' => 14,
+                'base_price_incl_tax' => 14,
+                'row_total_incl_tax' => 14,
+                'base_row_total_incl_tax' => 14,
+                'tax_amount' => 1.07,
+                'base_tax_amount' => 1.07,
+                'discount_amount' => 0,
+                'base_discount_amount' => 0,
+                'discount_percent' => 0,
+                'discount_tax_compensation_amount' => 0,
+                'base_discount_tax_compensation_amount' => 0,
+            ],
+        ],
+    ],
+];
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
index f22b48a259685..cdc3b7d135d1d 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 /**
  * Global array that holds test scenarios data
@@ -31,3 +32,4 @@
 require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_row.php';
 require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_total.php';
 require_once __DIR__ . '/scenarios/including_tax_apply_tax_after_discount.php';
+require_once __DIR__ . '/scenarios/including_tax_with_custom_price.php';

From 8fa7af56d43bd1657534a31b8d0588ce06e9acde Mon Sep 17 00:00:00 2001
From: Davit_Zakharyan <davit_zakharyan@epam.com>
Date: Fri, 29 Mar 2019 17:50:32 +0400
Subject: [PATCH 0859/1055] MAGETWO-58764: [GitHub] Minimal Query Length For
 Catalog Search #6681

- Updated automated test script.
---
 .../AdminSetMinimalQueryLengthActionGroup.xml |  1 +
 .../Test/Mftf/Data/CatalogSearchData.xml      | 27 ++++++++++++++++
 .../Mftf/Data/MinMaxQueryLengthHintsData.xml  |  0
 .../Mftf/Metadata/catalog_search-meta.xml     | 32 +++++++++++++++++++
 .../CatalogSearchAdminConfigSection.xml       | 17 ++++++++++
 ...MinimalQueryLengthForCatalogSearchTest.xml |  6 ++--
 .../CatalogSearchAdminConfigSection.xml       |  4 ---
 7 files changed, 81 insertions(+), 6 deletions(-)
 rename app/code/Magento/{Config => CatalogSearch}/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml (93%)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml
 rename app/code/Magento/{Config => CatalogSearch}/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml (100%)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
 rename app/code/Magento/{Search => CatalogSearch}/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml (86%)

diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
similarity index 93%
rename from app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
index b9ef37cb4effe..e60be3729834a 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
@@ -21,6 +21,7 @@
         <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
         <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
         <fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
+        <scrollTo selector="{{AdminConfigCatalogCategoryPermissionsSection.catalogPermissionsTab}}" stepKey="scrollToCatalogPermissionsTab"/>
         <click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForConfigSaved"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml
new file mode 100644
index 0000000000000..6868456079110
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml
@@ -0,0 +1,27 @@
+<?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="SetMinQueryLengthToDefault" type="catalog_search_config_def">
+        <requiredEntity type="enable">DefaultMinQueryLength</requiredEntity>
+    </entity>
+    <entity name="UncheckMinQueryLengthAndSet" type="catalog_search_config_query_length">
+        <requiredEntity type="number">SetMinQueryLengthToOne</requiredEntity>
+    </entity>
+    <entity name="DefaultMinQueryLength" type="enable">
+        <data key="inherit">true</data>
+    </entity>
+    <entity name="DefaultMinQueryLengthDisable" type="enable">
+        <data key="inherit">0</data>
+    </entity>
+    <entity name="SetMinQueryLengthToOne" type="number">
+        <data key="value">1</data>
+    </entity>
+
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Config/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
similarity index 100%
rename from app/code/Magento/Config/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml
new file mode 100644
index 0000000000000..7405377249aa4
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml
@@ -0,0 +1,32 @@
+<?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="CatalogSearchConfigDefault" dataType="catalog_search_config_def" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="catalog_search_config_def">
+            <object key="search" dataType="catalog_search_config_def">
+                <object key="fields" dataType="catalog_search_config_def">
+                    <object key="min_query_length" dataType="enable">
+                        <field key="inherit">boolean</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+    <operation name="CatalogSearchConfigQueryLength" dataType="catalog_search_config_query_length" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="catalog_search_config_query_length">
+            <object key="search" dataType="catalog_search_config_query_length">
+                <object key="fields" dataType="catalog_search_config_query_length">
+                    <object key="min_query_length" dataType="number">
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
new file mode 100644
index 0000000000000..605bcabb8a81d
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/CatalogSearchAdminConfigSection.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="AdminCatalogSearchConfigurationSection">
+        <element name="minQueryLength" type="input" selector="#catalog_search_min_query_length"/>
+        <element name="minQueryLengthInherit" type="checkbox" selector="#catalog_search_min_query_length_inherit"/>
+        <element name="minQueryLengthHint" type="text" selector="#row_catalog_search_min_query_length .value span"/>
+        <element name="maxQueryLengthHint" type="text" selector="#row_catalog_search_max_query_length .value span"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Search/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
similarity index 86%
rename from app/code/Magento/Search/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
index 2736b3d67474f..9ca7614ed166b 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
@@ -10,13 +10,13 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="MinimalQueryLengthForCatalogSearchTest">
         <annotations>
-            <features value="Catalog"/>
+            <features value="CatalogSearch"/>
             <title value="Minimal query length for catalog search"/>
             <description value="Minimal query length for catalog search"/>
             <severity value="AVERAGE"/>
             <testCaseId value="MC-6325"/>
             <useCaseId value="MAGETWO-58764"/>
-            <group value="Catalog"/>
+            <group value="CatalogSearch"/>
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
@@ -28,9 +28,11 @@
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <createData entity="SetMinQueryLengthToDefault" stepKey="setMinimumQueryLengthToDefault"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="SetMinimalQueryLengthActionGroup" stepKey="setMinQueryLength"/>
+        <comment userInput="go to Storefront and search for product" stepKey="searchProdUsingMinQueryLength"/>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
         <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="s" stepKey="fillAttribute"/>
         <waitForPageLoad stepKey="waitForSearchTextBox"/>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
index ab9fb55c2c9d5..e82ad4670f9b3 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
@@ -11,9 +11,5 @@
         <element name="checkIfCatalogSearchTabExpand" type="button" selector="#catalog_search-head:not(.open)"/>
         <element name="searchEngineDefaultSystemValue" type="checkbox" selector="#catalog_search_engine_inherit"/>
         <element name="searchEngine" type="select" selector="#catalog_search_engine"/>
-        <element name="minQueryLength" type="input" selector="#catalog_search_min_query_length"/>
-        <element name="minQueryLengthInherit" type="checkbox" selector="#catalog_search_min_query_length_inherit"/>
-        <element name="minQueryLengthHint" type="text" selector="#row_catalog_search_min_query_length .value span"/>
-        <element name="maxQueryLengthHint" type="text" selector="#row_catalog_search_max_query_length .value span"/>
     </section>
 </sections>
\ No newline at end of file

From e71d8e80c7373ac5adcc6a0b97cfd5ca17761233 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 29 Mar 2019 16:58:11 +0300
Subject: [PATCH 0860/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Updated automated test script.
---
 .../Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
index 060720ab007eb..85c54e0942c74 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
@@ -65,6 +65,10 @@
             </actionGroup>
             <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
             <deleteData createDataKey="product" stepKey="deleteFirstProduct"/>
+
+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 

From 147d11d158c2fff05186744979fcc25e2bd671f8 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Thu, 28 Mar 2019 18:02:52 -0500
Subject: [PATCH 0861/1055] REPO-66: [EQP][Sniffs Consolidation] Deliver
 Magento Coding Standard to magento2ce - review fixes

---
 .../Admin/AfterCustomUrlChangedObserver.php        |  2 ++
 .../Controller/Adminhtml/Index/Viewfile.php        |  2 ++
 app/code/Magento/Deploy/Process/Queue.php          |  2 ++
 .../Downloadable/Controller/Download/Link.php      |  2 ++
 .../Controller/Download/LinkSample.php             |  2 ++
 .../Downloadable/Controller/Download/Sample.php    |  2 ++
 app/code/Magento/Paypal/Controller/Ipn/Index.php   |  1 +
 .../Controller/Download/DownloadCustomOption.php   |  1 +
 .../Controller/Index/DownloadCustomOption.php      |  2 ++
 .../lib/Magento/Mtf/EntryPoint/EntryPoint.php      |  1 +
 .../Test/Legacy/UnsecureFunctionsUsageTest.php     |  2 ++
 .../testsuite/Magento/Test/Php/LiveCodeTest.php    |  1 +
 lib/internal/Magento/Framework/App/Bootstrap.php   | 12 ++++++------
 .../Magento/Framework/App/Console/Response.php     |  2 ++
 .../Framework/App/Response/Http/FileFactory.php    |  2 ++
 lib/internal/Magento/Framework/App/Router/Base.php |  2 ++
 .../Framework/App/Test/Unit/Router/BaseTest.php    | 14 ++++++++++++++
 lib/internal/Magento/Framework/Console/Cli.php     |  2 ++
 lib/internal/Magento/Framework/DB/Tree.php         |  1 +
 .../Framework/Data/Collection/Filesystem.php       |  6 ++++--
 .../Magento/Framework/Webapi/ErrorProcessor.php    |  2 ++
 pub/errors/processor.php                           |  2 ++
 22 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
index 06fcc17f6e8dd..830b6376c94bc 100644
--- a/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
+++ b/app/code/Magento/Config/Observer/Config/Backend/Admin/AfterCustomUrlChangedObserver.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Config\Observer\Config\Backend\Admin;
 
 use Magento\Framework\Event\ObserverInterface;
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index e5455f5cbaaa9..02a045086224c 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
 use Magento\Customer\Api\AccountManagementInterface;
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
index 8bc33c36d8bf1..fd7aad44e0a5b 100644
--- a/app/code/Magento/Deploy/Process/Queue.php
+++ b/app/code/Magento/Deploy/Process/Queue.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Deploy\Process;
 
 use Magento\Deploy\Package\Package;
diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php
index 8b9f91dbd548c..4766f1699afb6 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Link.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Controller\Download;
 
 use Magento\Downloadable\Helper\Download as DownloadHelper;
diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
index a6b06220bb5c7..f40df744dd3ea 100644
--- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Controller\Download;
 
 use Magento\Downloadable\Helper\Download as DownloadHelper;
diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
index 165d8bcd56edf..ac9eeac678f8d 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Controller\Download;
 
 use Magento\Downloadable\Helper\Download as DownloadHelper;
diff --git a/app/code/Magento/Paypal/Controller/Ipn/Index.php b/app/code/Magento/Paypal/Controller/Ipn/Index.php
index 3063556feb9e1..a879266bc1915 100644
--- a/app/code/Magento/Paypal/Controller/Ipn/Index.php
+++ b/app/code/Magento/Paypal/Controller/Ipn/Index.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Controller\Ipn;
 
diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
index 19d1566d9f739..fc4e238d47c99 100644
--- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Sales\Controller\Download;
 
diff --git a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
index fe18b3483bd29..742b2a91e9317 100644
--- a/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
+++ b/app/code/Magento/Wishlist/Controller/Index/DownloadCustomOption.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
diff --git a/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
index 553d4a5aa80c0..836cc486cb0ff 100644
--- a/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
+++ b/dev/tests/functional/lib/Magento/Mtf/EntryPoint/EntryPoint.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Mtf\EntryPoint;
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
index 64f53736105d2..2ce9934c6c1a2 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Test\Legacy;
 
 use Magento\Framework\App\Utility\Files;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 1d84eafbdbc77..76c0d047bcbbf 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Test\Php;
 
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
index 8ef7fced1bfae..717b810cffd29 100644
--- a/lib/internal/Magento/Framework/App/Bootstrap.php
+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\App;
 
@@ -244,10 +245,9 @@ public function createApplication($type, $arguments = [])
      * Runs an application
      *
      * @param \Magento\Framework\AppInterface $application
-     * @throws \Exception
      * @return void
      *
-     * phpcs:disable Magento2.Exceptions
+     * phpcs:disable Magento2.Exceptions,Squiz.Commenting.FunctionCommentThrowTag
      */
     public function run(AppInterface $application)
     {
@@ -419,13 +419,14 @@ public function isDeveloperMode()
      * Display an exception and terminate program execution
      *
      * @param \Exception $e
-     * @throws \DomainException
      * @return void
+     *
+     * phpcs:disable Magento2.Security.LanguageConstruct, Squiz.Commenting.FunctionCommentThrowTag
      */
     protected function terminate(\Exception $e)
     {
+
         if ($this->isDeveloperMode()) {
-            // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
             echo $e;
         } else {
             $message = "An error has happened during application run. See exception log for details.\n";
@@ -437,10 +438,9 @@ protected function terminate(\Exception $e)
             } catch (\Exception $e) {
                 $message .= "Could not write error message to log. Please use developer mode to see the message.\n";
             }
-            // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
             echo $message;
         }
-        // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
         exit(1);
     }
+    // phpcs:enable
 }
diff --git a/lib/internal/Magento/Framework/App/Console/Response.php b/lib/internal/Magento/Framework/App/Console/Response.php
index 2d048862213fc..853c3d5ca269e 100644
--- a/lib/internal/Magento/Framework/App/Console/Response.php
+++ b/lib/internal/Magento/Framework/App/Console/Response.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Console;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
index 3fdec31c9a217..d599f91ca8ca4 100644
--- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Response\Http;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
index 26d24df21de55..fcce821858eb3 100644
--- a/lib/internal/Magento/Framework/App/Router/Base.php
+++ b/lib/internal/Magento/Framework/App/Router/Base.php
@@ -5,6 +5,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Router;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
index 3d44073a24b85..db3df4111dae9 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App\Test\Unit\Router;
 
+/**
+ * Base router unit test.
+ */
 class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
 {
     /**
@@ -49,6 +52,11 @@ class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
      */
     private $defaultPathMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Router\PathConfigInterface
+     */
+    private $pathConfigMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -60,6 +68,7 @@ protected function setUp()
         $this->actionFactoryMock = $this->basicMock(\Magento\Framework\App\ActionFactory::class);
         $this->nameBuilderMock = $this->basicMock(\Magento\Framework\Code\NameBuilder::class);
         $this->defaultPathMock = $this->basicMock(\Magento\Framework\App\DefaultPathInterface::class);
+        $this->pathConfigMock = $this->basicMock(\Magento\Framework\App\Router\PathConfigInterface::class);
 
         // Prepare SUT
         $mocks = [
@@ -69,6 +78,7 @@ protected function setUp()
             'appState' => $this->appStateMock,
             'nameBuilder' => $this->nameBuilderMock,
             'defaultPath' => $this->defaultPathMock,
+            'pathConfigMock' => $this->pathConfigMock,
         ];
         $this->model = $this->objectManager->getObject(\Magento\Framework\App\Router\Base::class, $mocks);
     }
@@ -83,15 +93,19 @@ public function testMatch()
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $moduleName = 'module name';
         $moduleList = [$moduleName];
+        $pathInfo = 'path/info/';
+        $defaultPath = 'default/path/';
 
         // Stubs
         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);
+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($pathInfo);
         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
         $this->appStateMock->expects($this->any())->method('isInstalled')->willReturn(true);
         $this->actionListMock->expects($this->any())->method('get')->willReturn($actionClassName);
         $this->actionFactoryMock->expects($this->any())->method('create')->willReturn($actionInstance);
+        $this->pathConfigMock->expects($this->any())->method('getDefaultPath')->willReturn($defaultPath);
 
         // Expectations and Test
         $this->requestExpects('setModuleName', $moduleFrontName)
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
index f7e0f2932a3cb..fac588f1fbc1e 100644
--- a/lib/internal/Magento/Framework/Console/Cli.php
+++ b/lib/internal/Magento/Framework/Console/Cli.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Console;
 
 use Magento\Framework\App\Bootstrap;
diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
index 6474fba6488e0..1aeaf122131f6 100644
--- a/lib/internal/Magento/Framework/DB/Tree.php
+++ b/lib/internal/Magento/Framework/DB/Tree.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\DB;
 
diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
index 86bb71a12a7e3..c1028461d7be8 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Data\Collection;
 
 use Magento\Framework\Data\Collection;
@@ -686,13 +688,13 @@ public function getAllIds()
      * Callback method for 'like' fancy filter.
      *
      * @param string $field
-     * @param mixed $filterValue
+     * @param string $filterValue
      * @param array $row
      * @return bool
      * @see addFieldToFilter()
      * @see addCallbackFilter()
      */
-    public function filterCallbackLike($field, $filterValue, $row)
+    public function filterCallbackLike(string $field, string $filterValue, array $row) : bool
     {
         $filterValue = trim(stripslashes($filterValue), '\'');
         $filterValue = trim($filterValue, '%');
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
index a98a4b3253b5c..f9b6a32fc5673 100644
--- a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Webapi;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
index 34a16e7aa3263..ab21f791bc021 100644
--- a/pub/errors/processor.php
+++ b/pub/errors/processor.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Error;
 
 use Magento\Framework\Serialize\Serializer\Json;

From 503ab39f9cfbc0a71b99ca5a98d67cb1955f1f73 Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Fri, 29 Mar 2019 16:13:03 +0200
Subject: [PATCH 0862/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 .../Mftf/Section/StorefrontBundledSection.xml |   3 +
 ...rontCheckBundleProductOptionTierPrices.xml | 150 ++++++++++++++++++
 .../DataProviders/OptionPriceRendererTest.php |  73 +++++++++
 .../view/type/bundle/option/checkbox.phtml    |   4 +-
 .../view/type/bundle/option/radio.phtml       |   4 +-
 .../view/type/bundle/option/select.phtml      |   9 +-
 .../product_with_simple_tier_pricing.php      |   9 +-
 7 files changed, 240 insertions(+), 12 deletions(-)
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
 create mode 100644 app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php

diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
index dbe48c46c820b..30a7e8b777f3b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
@@ -26,11 +26,14 @@
         <element name="bundleProductName" type="text" selector="//*[@id='maincontent']//span[@itemprop='name']"/>
         <element name="pageNotFound" type="text" selector="//h1[@class='page-title']//span[contains(., 'Whoops, our bad...')]"/>
         <element name="dropDownOptionOneProducts" type="select" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//select" parameterized="true"/>
+        <element name="dropDownOptionTierPrices" type="text" selector="//label//span[contains(text(), '{{optionName}}')]/../..//div[@class='control']//div[@class='option-tier-prices']" parameterized="true"/>
         <element name="productInBundle" type="select" selector="//label//span[contains(text(), '{{productName}}')]" parameterized="true"/>
         <element name="dropDownOptionOneQuantity" type="input" selector="//span[contains(text(), '{{productName}}')]/../..//input" parameterized="true"/>
         <element name="radioButtonOptionTwoProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
         <element name="radioButtonOptionTwoQuantity" type="input" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field qty qty-holder']//input" parameterized="true"/>
+        <element name="radioButtonOptionLabel" type="text" selector="//label//span[contains(text(), '{{optionName}}')]/../..//div[@class='control']//div[@class='field choice']//label[contains(.,'{{productName}}')]" parameterized="true"/>
         <element name="checkboxOptionThreeProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
+        <element name="checkboxOptionLabel" type="text" selector="//label//span[contains(text(), '{{optionName}}')]/../..//div[@class='control']//div[@class='field choice']//label[contains(.,'{{productName}}')]" parameterized="true"/>
         <element name="multiselectOptionFourProducts" type="multiselect" selector="//label//span[contains(text(), '{{productName}}')]/../..//select[@multiple='multiple']" parameterized="true"/>
         <element name="currencyTrigger" type="select" selector="#switcher-currency-trigger" timeout="30"/>
         <element name="currency" type="select" selector="//a[text()='{{arg}}']" parameterized="true"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
new file mode 100644
index 0000000000000..23d70c978ecd8
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
@@ -0,0 +1,150 @@
+<?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="StorefrontCheckBundleProductOptionTierPrices">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="View bundle products"/>
+            <title value="Check tier prices for bundle options"/>
+            <testCaseId value="MAGETWO-98968"/>
+            <group value="bundle"/>
+        </annotations>
+        <before>
+            <!-- Create simple products -->
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+                <field key="price">10</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">20</field>
+            </createData>
+
+            <!-- Add tier prices to simple products -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct1.id$$)}}" stepKey="openAdminEditPageProduct1"/>
+            <actionGroup ref="ProductSetAdvancedPricing" stepKey="addTierPriceProduct1">
+                <argument name="group" value="ALL GROUPS"/>
+                <argument name="quantity" value="5"/>
+                <argument name="price" value="Discount"/>
+                <argument name="amount" value="50"/>
+            </actionGroup>
+
+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct2.id$$)}}" stepKey="openAdminEditPageProduct2"/>
+            <actionGroup ref="ProductSetAdvancedPricing" stepKey="addTierPriceProduct2">
+                <argument name="group" value="ALL GROUPS"/>
+                <argument name="quantity" value="7"/>
+                <argument name="price" value="Discount"/>
+                <argument name="amount" value="25"/>
+            </actionGroup>
+
+            <!-- Create Bundle product -->
+            <createData entity="ApiBundleProduct" stepKey="createBundleProduct"/>
+            <createData entity="DropDownBundleOption" stepKey="createDropDownBundleOption">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <field key="title">Drop-down Option</field>
+            </createData>
+            <createData entity="RadioButtonsOption" stepKey="createBundleRadioButtonsOption">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <field key="title">Radio Buttons Option</field>
+            </createData>
+            <createData entity="CheckboxOption" stepKey="createBundleCheckboxOption">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <field key="title">Checkbox Option</field>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleCheckboxOption"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleCheckboxOption"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createDropDownBundleOption"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createDropDownBundleOption"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
+        </after>
+
+        <!-- Go to storefront product page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct.custom_attributes[url_key]$$)}}" stepKey="onPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+
+        <!--"Drop-down" type option-->
+        <!-- Check Tier Prices for product 1 -->
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="selectDropDownOptionProduct1"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="checkDropDownOptionProduct1"/>
+        <grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="DropDownTierPriceTextProduct1"/>
+        <assertContains stepKey="assertDropDownTierPriceTextProduct1">
+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
+            <actualResult type="variable">DropDownTierPriceTextProduct1</actualResult>
+        </assertContains>
+        <!-- Check Tier Prices for product 2 -->
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="selectDropDownOptionProduct2"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="checkDropDownOptionProduct2"/>
+        <grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="DropDownTierPriceTextProduct2"/>
+        <assertContains stepKey="assertDropDownTierPriceTextProduct2">
+            <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
+            <actualResult type="variable">DropDownTierPriceTextProduct2</actualResult>
+        </assertContains>
+
+        <!--"Radio Buttons" type option-->
+        <!-- Check Tier Prices for product 1 -->
+        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct1.sku$$')}}" stepKey="RadioButtonsOptionTierPriceTextProduct1"/>
+        <assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct1">
+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
+            <actualResult type="variable">RadioButtonsOptionTierPriceTextProduct1</actualResult>
+        </assertContains>
+        <!-- Check Tier Prices for product 2 -->
+        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct2.sku$$')}}" stepKey="RadioButtonsOptionTierPriceTextProduct2"/>
+        <assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct2">
+            <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
+            <actualResult type="variable">RadioButtonsOptionTierPriceTextProduct2</actualResult>
+        </assertContains>
+
+        <!--"Checkbox" type option-->
+        <!-- Check Tier Prices for product 1 -->
+        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct1.sku$$')}}" stepKey="CheckBoxOptionTierPriceTextProduct1"/>
+        <assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct1">
+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
+            <actualResult type="variable">CheckBoxOptionTierPriceTextProduct1</actualResult>
+        </assertContains>
+        <!-- Check Tier Prices for product 2 -->
+        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct2.sku$$')}}" stepKey="CheckBoxOptionTierPriceTextProduct2"/>
+        <assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct2">
+            <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
+            <actualResult type="variable">CheckBoxOptionTierPriceTextProduct2</actualResult>
+        </assertContains>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
new file mode 100644
index 0000000000000..657803fbb3e2b
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Test\Unit\Block\DataProviders;
+
+use Magento\Bundle\Block\DataProviders\OptionPriceRenderer;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Pricing\Render;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\LayoutInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class to test additional data for bundle options
+ */
+class OptionPriceRendererTest extends TestCase
+{
+    /**
+     * @var LayoutInterface|MockObject
+     */
+    private $layoutMock;
+
+    /**
+     * @var OptionPriceRenderer
+     */
+    private $renderer;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->layoutMock = $this->createMock(
+            LayoutInterface::class
+        );
+
+        $this->renderer = $objectManager->getObject(
+            OptionPriceRenderer::class,
+            ['layout' => $this->layoutMock]
+        );
+    }
+
+    public function testRenderTierPrice()
+    {
+        $tierPriceHtml = 'tier price html';
+        $expectedArguments = ['zone' => Render::ZONE_ITEM_OPTION];
+
+        $productMock = $this->createMock(Product::class);
+        $blockMock = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
+        $blockMock->expects($this->once())
+            ->method('render')
+            ->with('tier_price', $productMock, $expectedArguments)
+        ->willReturn($tierPriceHtml);
+
+        $this->layoutMock->method('getBlock')
+            ->with('product.price.render.default')
+            ->willReturn($blockMock);
+
+        $this->assertEquals(
+            $tierPriceHtml,
+            $this->renderer->renderTierPrice($productMock),
+            'Render Tier price is wrong'
+        );
+    }
+}
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
index ad1843890eb4a..830d03c826f32 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -19,7 +19,7 @@
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
                 <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-                <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
+                <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
                 <input type="hidden"
                        class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
                        name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
@@ -40,7 +40,7 @@
                                for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
                             <span><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
                             <br/>
-                            <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
+                            <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
                         </label>
                     </div>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
index cd4af99cbc60f..1f33d97227ea3 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
@@ -21,7 +21,7 @@
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
                 <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
-                <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
+                <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
                 <input type="hidden"
                     class="bundle-option-<?= (int)$_option->getId() ?>  product bundle option"
                     name="bundle_option[<?= (int)$_option->getId() ?>]"
@@ -59,7 +59,7 @@
                                for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
                             <span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span>
                             <br/>
-                            <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
+                            <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
                         </label>
                     </div>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
index 4f718278971ae..4ea00f62b2043 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
@@ -20,7 +20,7 @@
     <div class="control">
         <?php if ($block->showSingle()): ?>
             <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
-            <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
+            <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
             <input type="hidden"
                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
@@ -40,11 +40,12 @@
                     </option>
                 <?php endforeach; ?>
             </select>
-            <div id="option-tier-prices-<?= /* @escapeNotVerified */ $_option->getId() ?>">
+            <div id="option-tier-prices-<?= /* @escapeNotVerified */ $_option->getId() ?>" class="option-tier-prices">
                 <?php foreach ($_selections as $_selection): ?>
                     <div data-role="selection-tier-prices"
-                         data-selection-id="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
-                        <?= /* @escapeNotVerified */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
+                         data-selection-id="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
+                         class="selection-tier-prices">
+                        <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
                     </div>
                 <?php endforeach; ?>
             </div>
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
index 0342694cead93..b97c1f0208b40 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
@@ -7,7 +7,6 @@
 
 require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
 
-
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 $simpleProduct = $productRepository->get('simple');
@@ -15,9 +14,10 @@
 /** @var $product \Magento\Catalog\Model\Product */
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId('bundle')
-    ->setAttributeSetId(4)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([1])
     ->setPriceType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC)
+    ->setPriceView(1)
     ->setName('Bundle Product')
     ->setSku('bundle-product')
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
@@ -28,7 +28,8 @@
             [
                 'title' => 'Bundle Product Items',
                 'default_title' => 'Bundle Product Items',
-                'type' => 'checkbox', 'required' => 1,
+                'type' => 'checkbox',
+                'required' => 1,
                 'delete' => '',
             ],
         ]
@@ -36,4 +37,4 @@
     ->setBundleSelectionsData(
         [[['product_id' => $simpleProduct->getId(), 'selection_qty' => 1, 'delete' => '']]]
     );
-$product->save();
+$productRepository->save($product);

From 08eafb31397065fcf087ebdbaf3c9f6ea9534d62 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Fri, 29 Mar 2019 16:00:12 +0100
Subject: [PATCH 0863/1055] Adjusting action groups

---
 .../StorefrontCustomerResetPasswordActionGroup.xml   | 12 ++++++++++--
 .../StorefrontResetCustomerPasswordFailedTest.xml    |  6 ++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
index 2c641317c6e9a..f322be6109218 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
@@ -11,8 +11,6 @@
     <actionGroup name="StorefrontCustomerResetPasswordActionGroup">
         <arguments>
             <argument name="email" type="string" />
-            <argument name="message" type="string" defaultValue="" />
-            <argument name="messageType" type="string" defaultValue="success" />
         </arguments>
 
         <amOnPage stepKey="amOnSignInPage" url="{{StorefrontCustomerSignInPage.url}}"/>
@@ -22,6 +20,16 @@
         <fillField stepKey="fillEmailField" userInput="{{email}}" selector="{{StorefrontForgotPasswordSection.email}}"/>
         <click stepKey="clickResetPassword" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
         <waitForPageLoad stepKey="waitForPageLoaded" />
+    </actionGroup>
+
+    <actionGroup name="AssertCustomerResetPasswordActionGroup">
+        <arguments>
+            <argument name="url" type="string"/>
+            <argument name="message" type="string" defaultValue="" />
+            <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+
+        <seeInCurrentUrl stepKey="seeInSignInPage" url="{{url}}"/>
         <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForMessage" />
         <see stepKey="seeMessage" userInput="{{message}}" selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}"/>
     </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
index 684d0c0730c3f..56c8af118fadc 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
@@ -28,10 +28,16 @@
 
         <actionGroup ref="StorefrontCustomerResetPasswordActionGroup" stepKey="resetPasswordFirstAttempt">
             <argument name="email" value="$$customer.email$$" />
+        </actionGroup>
+        <actionGroup ref="AssertCustomerResetPasswordActionGroup" stepKey="seePageWithSuccessMessage">
+            <argument name="url" value="{{StorefrontCustomerSignInPage.url}}"/>
             <argument name="message" value="If there is an account associated with $$customer.email$$ you will receive an email with a link to reset your password."/>
         </actionGroup>
         <actionGroup ref="StorefrontCustomerResetPasswordActionGroup" stepKey="resetPasswordSecondAttempt">
             <argument name="email" value="$$customer.email$$" />
+        </actionGroup>
+        <actionGroup ref="AssertCustomerResetPasswordActionGroup" stepKey="seePageWithErrorMessage">
+            <argument name="url" value="{{StorefrontForgotPasswordPage.url}}"/>
             <argument name="message" value="We received too many requests for password resets. Please wait and try again later or contact hello@example.com."/>
             <argument name="messageType" value="error" />
         </actionGroup>

From 95ff068bba05361ea49cf82cf55cb0a4bff060a6 Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Fri, 29 Mar 2019 10:15:45 -0500
Subject: [PATCH 0864/1055] REPO-66: [EQP][Sniffs Consolidation] Deliver
 Magento Coding Standard to magento2ce - stabilization

---
 .../App/Test/Unit/Router/BaseTest.php         | 19 ++++++++-----------
 .../Framework/Data/Collection/Filesystem.php  |  7 +++++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
index db3df4111dae9..94a7330c322b8 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Router/BaseTest.php
@@ -52,11 +52,6 @@ class BaseTest extends \Magento\Framework\TestFramework\Unit\BaseTestCase
      */
     private $defaultPathMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Router\PathConfigInterface
-     */
-    private $pathConfigMock;
-
     protected function setUp()
     {
         parent::setUp();
@@ -68,7 +63,6 @@ protected function setUp()
         $this->actionFactoryMock = $this->basicMock(\Magento\Framework\App\ActionFactory::class);
         $this->nameBuilderMock = $this->basicMock(\Magento\Framework\Code\NameBuilder::class);
         $this->defaultPathMock = $this->basicMock(\Magento\Framework\App\DefaultPathInterface::class);
-        $this->pathConfigMock = $this->basicMock(\Magento\Framework\App\Router\PathConfigInterface::class);
 
         // Prepare SUT
         $mocks = [
@@ -78,7 +72,6 @@ protected function setUp()
             'appState' => $this->appStateMock,
             'nameBuilder' => $this->nameBuilderMock,
             'defaultPath' => $this->defaultPathMock,
-            'pathConfigMock' => $this->pathConfigMock,
         ];
         $this->model = $this->objectManager->getObject(\Magento\Framework\App\Router\Base::class, $mocks);
     }
@@ -93,19 +86,17 @@ public function testMatch()
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $moduleName = 'module name';
         $moduleList = [$moduleName];
-        $pathInfo = 'path/info/';
-        $defaultPath = 'default/path/';
+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
 
         // Stubs
         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);
-        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($pathInfo);
+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
         $this->appStateMock->expects($this->any())->method('isInstalled')->willReturn(true);
         $this->actionListMock->expects($this->any())->method('get')->willReturn($actionClassName);
         $this->actionFactoryMock->expects($this->any())->method('create')->willReturn($actionInstance);
-        $this->pathConfigMock->expects($this->any())->method('getDefaultPath')->willReturn($defaultPath);
 
         // Expectations and Test
         $this->requestExpects('setModuleName', $moduleFrontName)
@@ -154,6 +145,7 @@ public function testMatchUseDefaultPath()
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $moduleName = 'module name';
         $moduleList = [$moduleName];
+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
 
         // Stubs
         $defaultReturnMap = [
@@ -161,6 +153,7 @@ public function testMatchUseDefaultPath()
             ['controller', $actionPath],
             ['action', $actionName],
         ];
+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
         $this->defaultPathMock->expects($this->any())->method('getPart')->willReturnMap($defaultReturnMap);
         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
         $this->appStateMock->expects($this->any())->method('isInstalled')->willReturn(false);
@@ -185,9 +178,11 @@ public function testMatchEmptyModuleList()
         $actionName = 'action name';
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $emptyModuleList = [];
+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
 
         // Stubs
         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($emptyModuleList);
         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);
@@ -209,9 +204,11 @@ public function testMatchEmptyActionInstance()
         $actionClassName = \Magento\Framework\App\Action\Action::class;
         $moduleName = 'module name';
         $moduleList = [$moduleName];
+        $paramList = $moduleFrontName . '/' . $actionPath . '/' . $actionName . '/key/val/key2/val2/';
 
         // Stubs
         $this->requestMock->expects($this->any())->method('getModuleName')->willReturn($moduleFrontName);
+        $this->requestMock->expects($this->any())->method('getPathInfo')->willReturn($paramList);
         $this->routeConfigMock->expects($this->any())->method('getModulesByFrontName')->willReturn($moduleList);
         $this->requestMock->expects($this->any())->method('getControllerName')->willReturn($actionPath);
         $this->requestMock->expects($this->any())->method('getActionName')->willReturn($actionName);
diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
index c1028461d7be8..b2bd352ea279c 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
@@ -688,14 +688,17 @@ public function getAllIds()
      * Callback method for 'like' fancy filter.
      *
      * @param string $field
-     * @param string $filterValue
+     * @param mixed $filterValue
      * @param array $row
      * @return bool
      * @see addFieldToFilter()
      * @see addCallbackFilter()
      */
-    public function filterCallbackLike(string $field, string $filterValue, array $row) : bool
+    public function filterCallbackLike($field, $filterValue, $row)
     {
+        // Forced to do this in order to keep backward compatibility for @api class.
+        // Strict typing must be added to this method next major release.
+        $filterValue = (string)$filterValue;
         $filterValue = trim(stripslashes($filterValue), '\'');
         $filterValue = trim($filterValue, '%');
         $filterValueRegex = '(.*?)' . preg_quote($filterValue, '/') . '(.*?)';

From 5b919eac8764901e1d504ccf2db1b046a91ae79c Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 29 Mar 2019 17:33:12 +0200
Subject: [PATCH 0865/1055] MAGETWO-98886: Gift Card Accounts: expiration date
 subtracts one day

---
 .../Framework/Data/Form/Element/DateTest.php  | 43 +++++++++++++------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
index a934372bfd907..a64df0451f9c0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
@@ -4,41 +4,51 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Framework\Data\Form\Element;
+
+use Magento\Framework\Data\Form\ElementFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Tests for \Magento\Framework\Data\Form\Element\Date
  */
-namespace Magento\Framework\Data\Form\Element;
-
 class DateTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\Data\Form\ElementFactory
+     * @var ElementFactory
      */
     protected $_elementFactory;
 
     /**
-     * SetUp method
+     * @inheritdoc
      */
     protected function setUp()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->_elementFactory = $objectManager->create(\Magento\Framework\Data\Form\ElementFactory::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->_elementFactory = $objectManager->create(ElementFactory::class);
     }
 
     /**
+     * Test get value
+     *
+     * @param array $data
+     * @param string $expect
+     * @return void
      * @dataProvider getValueDataProvider
      */
-    public function testGetValue(array $data, $expect)
+    public function testGetValue(array $data, string $expect): void
     {
-        /** @var $date \Magento\Framework\Data\Form\Element\Date */
-        $date = $this->_elementFactory->create(\Magento\Framework\Data\Form\Element\Date::class, $data);
+        /** @var $date Date */
+        $date = $this->_elementFactory->create(Date::class, $data);
         $this->assertEquals($expect, $date->getValue());
     }
 
     /**
+     * Get value test data provider
+     *
      * @return array
      */
-    public function getValueDataProvider()
+    public function getValueDataProvider(): array
     {
         $testTimestamp = strtotime('2014-05-18 12:08:16');
         $date = new \DateTime('@' . $testTimestamp);
@@ -56,15 +66,22 @@ public function getValueDataProvider()
                     'time_format' => 'h:mm a',
                     'value' => $testTimestamp,
                 ],
-                $date->format('g:i A')
+                $date->format('g:i A'),
             ],
             [
                 [
                     'date_format' => 'MM/d/yy',
                     'value' => $testTimestamp,
                 ],
-                $date->format('m/j/y')
-            ]
+                $date->format('m/j/y'),
+            ],
+            [
+                [
+                    'date_format' => 'd-MM-Y',
+                    'value' => $date->format('d-m-Y'),
+                ],
+                $date->format('d-m-Y'),
+            ],
         ];
     }
 }

From fd611a7b4978d11e3ca5ad062224c19bf0830894 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Fri, 29 Mar 2019 17:56:39 +0200
Subject: [PATCH 0866/1055] MAGETWO-70996: [GitHub] Customer Address "default
 billing address" Attribute Not Used in Checkout #8777

# Conflicts:
#	app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
#	app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
#	app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
#	app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
#	app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
---
 .../Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml      | 1 -
 .../Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml     | 3 ++-
 .../Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml         | 3 +--
 .../Checkout/Test/TestStep/FillBillingInformationStep.php     | 4 +++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
index d701993be2c4c..f066c88b12fcc 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml
@@ -87,7 +87,6 @@
         <waitForPageLoad stepKey="waitForPageLoad10"/>
         <click selector="{{BraintreeConfigurationPaymentSection.paymentMethod}}" stepKey="SelectBraintreePaymentMethod1"/>
         <waitForPageLoad stepKey="waitForPageLoad11"/>
-        <waitForPageLoad stepKey="waitForPageLoad12"/>
         <!--Place order-->
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="PlaceOrder1"/>
         <waitForPageLoad stepKey="waitForPageLoad13"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index 7acfc14111b6f..7f9ba744507bb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -54,6 +54,7 @@
         <element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
         <element name="noQuotes" type="text" selector=".no-quotes-block"/>
         <element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
-        <element name="billingAddressSelect" type="select" selector="select[name='billing_address_id']"/>
+        <element name="billingAddressSelect" type="select" selector=".payment-method._active select[name='billing_address_id']"/>
+        <element name="billingAddressSelectShared" type="select" selector=".checkout-billing-address select[name='billing_address_id']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
index 13b7be6e3c411..fadc9ec50ad8d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -256,8 +256,7 @@
 
         <!-- Fill UK Address and verify that payment available and checkout successful -->
         <uncheckOption selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="uncheckBillingAddressSameAsShippingCheckCheckBox"/>
-        <click selector="{{CheckoutShippingSection.addressDropdown}}" stepKey="clickOnAddressDropDown"/>
-        <selectOption selector="{{CheckoutPaymentSection.billingAddressSelect}}" userInput="New Address" stepKey="clickOnNewAddress"/>
+        <selectOption selector="{{CheckoutPaymentSection.billingAddressSelectShared}}" userInput="New Address" stepKey="clickOnNewAddress"/>
         <waitForPageLoad stepKey="waitNewAddressBillingForm"/>
         <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
             <argument name="Address" value="updateCustomerUKAddress"/>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
index cf2f99a78cefb..b7a4c17537539 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
@@ -170,7 +170,9 @@ public function run()
      */
     private function getDefaultBillingAddress()
     {
-        $addresses = $this->customer->getDataFieldConfig('address')['source']->getAddresses();
+        $addresses = $this->customer->hasData('address')
+            ? $this->customer->getDataFieldConfig('address')['source']->getAddress()
+            : [];
         $defaultAddress = null;
         foreach ($addresses as $address) {
             if ($address->getDefaultBilling() === 'Yes') {

From 86573396f983df625bd7bd564f251f05baf73459 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Fri, 29 Mar 2019 18:04:15 +0200
Subject: [PATCH 0867/1055] MAGETWO-70996: [GitHub] Customer Address "default
 billing address" Attribute Not Used in Checkout #8777

---
 .../Checkout/Test/TestStep/FillBillingInformationStep.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
index b7a4c17537539..52b296c2e01fa 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
@@ -171,7 +171,7 @@ public function run()
     private function getDefaultBillingAddress()
     {
         $addresses = $this->customer->hasData('address')
-            ? $this->customer->getDataFieldConfig('address')['source']->getAddress()
+            ? $this->customer->getDataFieldConfig('address')['source']->getAddresses()
             : [];
         $defaultAddress = null;
         foreach ($addresses as $address) {

From 829a39b3578f2236e8fe5645822a57afe42a5666 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 29 Mar 2019 11:25:43 -0500
Subject: [PATCH 0868/1055] GraphQL-422: Test coverage:
 SetShippingMethodsOnCartTest for Guest

---
 .../Model/Cart/GetQuoteAddress.php            |  21 +-
 .../Model/Cart/SetShippingMethodsOnCart.php   |   3 +-
 .../Customer/SetBillingAddressOnCartTest.php  |  18 +-
 .../Customer/SetPaymentMethodOnCartTest.php   |  12 +-
 .../GetMaskedQuoteIdByReservedOrderId.php     |   3 +-
 ...uoteShippingAddressIdByReservedQuoteId.php |  53 ++
 .../Guest/SetBillingAddressOnCartTest.php     |  29 +-
 .../Guest/SetPaymentMethodOnCartTest.php      |  12 +-
 .../Guest/SetShippingMethodsOnCartTest.php    | 610 +++++++-----------
 ...h_virtual_product_and_address_rollback.php |   2 +-
 .../_files/simple_product_rollback.php        |   2 +-
 .../Quote/_files/guest/quote_with_address.php |  49 ++
 .../guest/quote_with_address_rollback.php     |  28 +
 .../_files/set_flatrate_shipping_method.php   |  36 ++
 14 files changed, 474 insertions(+), 404 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
index 1fb737d964139..89124c594dd87 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetQuoteAddress.php
@@ -8,10 +8,10 @@
 namespace Magento\QuoteGraphQl\Model\Cart;
 
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\ResourceModel\Quote\Address as AddressResource;
 
 /**
@@ -44,14 +44,14 @@ public function __construct(
     /**
      * Get quote address
      *
+     * @param CartInterface $cart
      * @param int $quoteAddressId
      * @param int|null $customerId
      * @return AddressInterface
-     * @throws GraphQlInputException
-     * @throws GraphQlNoSuchEntityException
      * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
      */
-    public function execute(int $quoteAddressId, ?int $customerId): AddressInterface
+    public function execute(CartInterface $cart, int $quoteAddressId, ?int $customerId): AddressInterface
     {
         $quoteAddress = $this->quoteAddressFactory->create();
 
@@ -62,14 +62,15 @@ public function execute(int $quoteAddressId, ?int $customerId): AddressInterface
             );
         }
 
-        $quoteAddressCustomerId = (int)$quoteAddress->getCustomerId();
-
-        /* Guest cart, allow operations */
-        if (!$quoteAddressCustomerId && null === $customerId) {
-            return $quoteAddress;
+        // TODO: GetQuoteAddress::execute should depend only on AddressInterface contract
+        // https://github.com/magento/graphql-ce/issues/550
+        if ($quoteAddress->getQuoteId() !== $cart->getId()) {
+            throw new GraphQlNoSuchEntityException(
+                __('Cart does not contain address with ID "%cart_address_id"', ['cart_address_id' => $quoteAddressId])
+            );
         }
 
-        if ($quoteAddressCustomerId !== $customerId) {
+        if ((int)$quoteAddress->getCustomerId() !== (int)$customerId) {
             throw new GraphQlAuthorizationException(
                 __(
                     'The current user cannot use cart address with ID "%cart_address_id"',
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
index 37e0118423745..4104e179160d9 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
@@ -69,8 +69,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         }
         $methodCode = $shippingMethodInput['method_code'];
 
-        $quoteAddress = $this->getQuoteAddress->execute($cartAddressId, $context->getUserId());
-
+        $quoteAddress = $this->getQuoteAddress->execute($cart, $cartAddressId, $context->getUserId());
         $this->assignShippingMethodToCart->execute($cart, $quoteAddress, $carrierCode, $methodCode);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 129375debe068..88e7b93dd1d08 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -429,6 +429,7 @@ public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
@@ -436,10 +437,19 @@ public function testSetBillingAddressOnNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
         $query = <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    items {
-      id
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+          customer_address_id: 1
+       }
+    }
+  ) {
+    cart {
+      billing_address {
+        city
+      }
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index 450a22dd6e9c7..98eded8300665 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -126,15 +126,9 @@ public function testSetNonExistentPaymentMethod()
     public function testSetPaymentOnNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    items {
-      id
-    }
-  }
-}
-QUERY;
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
index c5a4e8af02a58..eab362c3a0a6f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote;
 
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\QuoteFactory;
@@ -51,7 +52,7 @@ public function __construct(
      *
      * @param string $reversedOrderId
      * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function execute(string $reversedOrderId): string
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php
new file mode 100644
index 0000000000000..fa42ad4d71fb2
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\QuoteFactory;
+
+/**
+ * Get quote shipping address id by reserved order id
+ */
+class GetQuoteShippingAddressIdByReservedQuoteId
+{
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @param QuoteFactory $quoteFactory
+     * @param QuoteResource $quoteResource
+     */
+    public function __construct(
+        QuoteFactory $quoteFactory,
+        QuoteResource $quoteResource
+    ) {
+        $this->quoteFactory = $quoteFactory;
+        $this->quoteResource = $quoteResource;
+    }
+
+    /**
+     * Get quote shipping address id by reserved order id
+     *
+     * @param string $reversedOrderId
+     * @return int
+     */
+    public function execute(string $reversedOrderId): int
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+
+        return (int)$quote->getShippingAddress()->getId();
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 3808ce38b9d7b..ae0a1a0e822ac 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -248,10 +248,30 @@ public function testSetBillingAddressOnNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
         $query = <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    items {
-      id
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+        address: {
+          firstname: "test firstname"
+          lastname: "test lastname"
+          company: "test company"
+          street: ["test street 1", "test street 2"]
+          city: "test city"
+          region: "test region"
+          postcode: "887766"
+          country_code: "US"
+          telephone: "88776655"
+          save_in_address_book: false
+        }
+      }
+    }
+  ) {
+    cart {
+      billing_address {
+        city
+      }
     }
   }
 }
@@ -289,7 +309,6 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
   }
 }
 QUERY;
-
         $this->expectExceptionMessage($message);
         $this->graphQlQuery($query);
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 8f37f00c3db7f..c9078fd84f6bc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -113,15 +113,9 @@ public function testSetNonExistentPaymentMethod()
     public function testSetPaymentOnNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    items {
-      id
-    }
-  }
-}
-QUERY;
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
         $this->graphQlQuery($query);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 07ccfc7bf727e..6289d88de6ee4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -7,12 +7,10 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
 /**
  * Test for setting shipping methods on cart for guest
@@ -20,24 +18,14 @@
 class SetShippingMethodsOnCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var QuoteFactory
+     * @var GetQuoteShippingAddressIdByReservedQuoteId
      */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var QuoteAddress
-     */
-    private $quoteAddress;
+    private $getQuoteShippingAddressIdByReservedQuoteId;
 
     /**
      * @inheritdoc
@@ -45,410 +33,355 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->quoteAddress = $objectManager->get(QuoteAddress::class);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-     */
-    public function testShippingMethodWithVirtualProduct()
-    {
-        $methodCode = 'flatrate';
-        $carrierCode = 'flatrate';
-        $reservedOrderId = 'test_order_with_virtual_product_without_address';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-        $quoteAddressId = $this->getQuoteAddressIdByReversedQuoteId($reservedOrderId);
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $methodCode,
-            $carrierCode,
-            $quoteAddressId
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(
+            GetQuoteShippingAddressIdByReservedQuoteId::class
         );
-
-        self::expectException(\Exception::class);
-        self::expectExceptionMessage('You can\'t set shipping methods for virtual products');
-        $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testShippingMethodWithSimpleProduct()
+    public function testSetShippingMethodOnCartWithSimpleProduct()
     {
-        $methodCode = 'flatrate';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $carrierCode = 'flatrate';
-        $reservedOrderId = 'guest_quote';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
+        $methodCode = 'flatrate';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery(
+        $query = $this->getQuery(
             $maskedQuoteId,
             $methodCode,
             $carrierCode,
             $quoteAddressId
         );
-
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('setShippingMethodsOnCart', $response);
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
         self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
 
-        $shippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingMethod);
-        self::assertEquals($carrierCode, $shippingMethod['selected_shipping_method']['carrier_code']);
-        self::assertEquals($methodCode, $shippingMethod['selected_shipping_method']['method_code']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @dataProvider dataProviderWithMissedRequiredParameters
-     * @param int $addressId
-     * @param string $message
-     * @expectedException \Exception
-     */
-    public function testShippingMethodWithSimpleProductWithoutAddress(int $addressId, string $message)
-    {
-        $methodCode = 'flatrate';
-        $carrierCode = 'flatrate';
-        $reservedOrderId = 'test_order_with_simple_product_without_address';
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
 
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $methodCode,
-            $carrierCode,
-            $addressId
-        );
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
 
-        $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query);
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
     }
 
     /**
-     * @return array
-     */
-    public function dataProviderWithMissedRequiredParameters()
-    {
-        return [
-            'shipping_methods' => [
-                0,
-                'Required parameter "cart_address_id" is missing.',
-            ]
-        ];
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
      * @expectedException \Exception
-     * @expectedExceptionMessage Required parameter "method_code" is missing.
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
-    public function testSetShippingMethodWithMissedRequiredParameters()
+    public function testSetShippingMethodOnCartWithSimpleProductAndWithoutAddress()
     {
-        $methodCode = '';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $carrierCode = 'flatrate';
-        $reservedOrderId = 'test_order_with_simple_product_without_address';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-        $quoteAddressId = $this->getQuoteAddressIdByReversedQuoteId($reservedOrderId);
+        $methodCode = 'flatrate';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery(
+        $query = $this->getQuery(
             $maskedQuoteId,
             $methodCode,
             $carrierCode,
             $quoteAddressId
         );
-
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
      */
-    public function testSetNonExistentShippingMethod()
+    public function testReSetShippingMethod()
     {
-        $methodCode = 'non-existed-method-code';
-        $carrierCode = 'non-carrier-method-code';
-        $reservedOrderId = 'guest_quote';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'guest_quote', 'reserved_order_id');
-        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $carrierCode = 'freeshipping';
+        $methodCode = 'freeshipping';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
 
-        $query = $this->prepareMutationQuery(
+        $query = $this->getQuery(
             $maskedQuoteId,
             $methodCode,
             $carrierCode,
             $quoteAddressId
         );
+        $response = $this->graphQlQuery($query);
 
-        self::expectException(\Exception::class);
-        self::expectExceptionMessage('Carrier with such method not found: ' . $carrierCode . ', ' . $methodCode . '');
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-     */
-    public function testSetShippingMethodIfAddressIsNotBelongToCart()
-    {
-        $methodCode = 'flatrate';
-        $carrierCode = 'flatrate';
-        $reservedOrderId = 'guest_quote';
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
 
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
 
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_with_virtual_product', 'reserved_order_id');
-        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
 
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $methodCode,
-            $carrierCode,
-            $quoteAddressId
-        );
-
-        self::expectException(\Exception::class);
-        self::expectExceptionMessage('The current user cannot use cart address with ID "' . $quoteAddressId . '"');
-        $this->graphQlQuery($query);
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @expectedException \Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException
-     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     *
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderSetShippingMethodWithWrongParameters
+     * @throws \Exception
      */
-    public function testSetShippingMethodToNonExistentCart()
+    public function testSetShippingMethodWithWrongParameters(string $input, string $message)
     {
-        $methodCode = 'flatrate';
-        $carrierCode = 'flatrate';
-
-        $maskedQuoteId = 'non_existent_masked_id';
-        $quoteAddressId = 1;
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $methodCode,
-            $carrierCode,
-            $quoteAddressId
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+        $input = str_replace(['cart_id_value', 'cart_address_id_value'], [$maskedQuoteId, $quoteAddressId], $input);
 
+        $query = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input:  {
+   {$input}     
+  }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testSetShippingMethodToAnotherCustomerCart()
+    public function dataProviderSetShippingMethodWithWrongParameters(): array
     {
-        $methodCode = 'flatrate';
-        $carrierCode = 'flatrate';
-        $reservedOrderId = 'guest_quote';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $methodCode,
-            $carrierCode,
-            $quoteAddressId
-        );
-
-        self::expectException(\Exception::class);
-        self::expectExceptionMessage(
-            'The current user cannot perform operations on cart "' . $maskedQuoteId . '"'
-        );
-        $this->graphQlQuery($query);
+        return [
+            'missed_cart_id' => [
+                'shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                    method_code: "flatrate"
+                }]',
+                'Required parameter "cart_id" is missing'
+            ],
+            'missed_shipping_methods' => [
+                'cart_id: "cart_id_value"',
+                'Required parameter "shipping_methods" is missing'
+            ],
+            'shipping_methods_are_empty' => [
+                'cart_id: "cart_id_value" shipping_methods: []',
+                'Required parameter "shipping_methods" is missing'
+            ],
+            'missed_cart_address_id' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    carrier_code: "flatrate"
+                    method_code: "flatrate"
+                }]',
+                'Required parameter "cart_address_id" is missing.'
+            ],
+            'non_existent_cart_address_id' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: -1
+                    carrier_code: "flatrate"
+                    method_code: "flatrate"
+                }]',
+                'Could not find a cart address with ID "-1"'
+            ],
+            'missed_carrier_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    method_code: "flatrate"
+                }]',
+                'Field ShippingMethodInput.carrier_code of required type String! was not provided.'
+            ],
+            'empty_carrier_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: ""
+                    method_code: "flatrate"
+                }]',
+                'Required parameter "carrier_code" is missing.'
+            ],
+            'non_existent_carrier_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "wrong-carrier-code"
+                    method_code: "flatrate"
+                }]',
+                'Carrier with such method not found: wrong-carrier-code, flatrate'
+            ],
+            'missed_method_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                }]',
+                'Required parameter "method_code" is missing.'
+            ],
+            'empty_method_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                    method_code: ""
+                }]',
+                'Required parameter "method_code" is missing.'
+            ],
+            'non_existent_method_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                    method_code: "wrong-carrier-code"
+                }]',
+                'Carrier with such method not found: flatrate, wrong-carrier-code'
+            ],
+            'non_existent_shopping_cart' => [
+                'cart_id: "non_existent_masked_id", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                    method_code: "flatrate"
+                }]',
+                'Could not find a cart with ID "non_existent_masked_id"'
+            ],
+        ];
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage You cannot specify multiple shipping methods.
      */
-    public function testSetShippingMethodToNonExistentCartAddress()
+    public function testSetMultipleShippingMethods()
     {
-        $methodCode = 'flatrate';
-        $carrierCode = 'flatrate';
-        $reservedOrderId = 'guest_quote';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
 
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-        $quoteAddressId = 1963425585;
-
-        $query = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            $methodCode,
-            $carrierCode,
-            $quoteAddressId
-        );
-
-        self::expectException(\Exception::class);
-        self::expectExceptionMessage(
-            'Could not find a cart address with ID "' . $quoteAddressId . '"'
-        );
+        $query = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input:  {
+   cart_id: "{$maskedQuoteId}", 
+   shipping_methods: [
+        {
+            cart_address_id: {$quoteAddressId}
+            carrier_code: "flatrate"
+            method_code: "flatrate"
+        }
+        {
+            cart_address_id: {$quoteAddressId}
+            carrier_code: "flatrate"
+            method_code: "flatrate"
+        }
+   ]
+  }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+        }
+      }
+    }
+  }
+}
+QUERY;
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     *
+     * @expectedException \Exception
      */
-    public function testSetShippingMethodToGuestCartAddress()
+    public function testSetShippingMethodToCustomerCart()
     {
-        $methodCode = 'flatrate';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $carrierCode = 'flatrate';
-        $reservedOrderId = 'guest_quote';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
-
-        $query = $this->prepareMutationQuery(
+        $methodCode = 'flatrate';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+        $query = $this->getQuery(
             $maskedQuoteId,
             $methodCode,
             $carrierCode,
             $quoteAddressId
         );
 
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-
-        $shippingMethod = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingMethod);
-        self::assertEquals($carrierCode, $shippingMethod['selected_shipping_method']['carrier_code']);
-        self::assertEquals($methodCode, $shippingMethod['selected_shipping_method']['method_code']);
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * _security
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/quote_with_address.php
      */
-    public function testSetShippingMethodToAnotherCustomerCartAddress()
+    public function testSetShippingMethodIfGuestIsNotOwnerOfAddress()
     {
-        $methodCode = 'flatrate';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $carrierCode = 'flatrate';
-        $reservedOrderId = 'test_order_1';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-        $quoteAddressId = (int) $quote->getShippingAddress()->getId();
-
-        $query = $this->prepareMutationQuery(
+        $methodCode = 'flatrate';
+        $anotherQuoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('guest_quote_with_address');
+        $query = $this->getQuery(
             $maskedQuoteId,
             $methodCode,
             $carrierCode,
-            $quoteAddressId
+            $anotherQuoteAddressId
         );
 
-        self::expectException(\Exception::class);
-        self::expectExceptionMessage(
-            'The current user cannot perform operations on cart "' . $maskedQuoteId . '"'
+        $this->expectExceptionMessage(
+            "Cart does not contain address with ID \"{$anotherQuoteAddressId}\""
         );
         $this->graphQlQuery($query);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @magentoApiDataFixture Magento/Checkout/_files/enable_all_shipping_methods.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage You cannot specify multiple shipping methods.
-     */
-    public function testSetMultipleShippingMethods()
-    {
-        $methodCode = 'flatrate';
-        $carrierCode = 'flatrate';
-        $reservedOrderId = 'guest_quote';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId($reservedOrderId);
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-        $shippingAddressId = (int) $quote->getShippingAddress()->getId();
-
-        $query = <<<QUERY
-mutation {
-  setShippingMethodsOnCart(input:
-    {
-      cart_id: "$maskedQuoteId",
-      shipping_methods: [{
-          cart_address_id: $shippingAddressId
-          method_code: "$methodCode"
-          carrier_code: "$carrierCode"
-        },
-        {
-          cart_address_id: $shippingAddressId
-          method_code: "ups"
-          carrier_code: "ups"
-      }]
-    }) {
-
-    cart {
-      shipping_addresses {
-        address_id
-        firstname
-        lastname
-        selected_shipping_method {
-          carrier_code
-          method_code
-          label
-          amount
-        }
-      }
-    }
-  }
-}
-
-QUERY;
-
-        $this->graphQlQuery($query);
-    }
-
     /**
      * @param string $maskedQuoteId
      * @param string $shippingMethodCode
      * @param string $shippingCarrierCode
      * @param int $shippingAddressId
      * @return string
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
-    private function prepareMutationQuery(
+    private function getQuery(
         string $maskedQuoteId,
         string $shippingMethodCode,
         string $shippingCarrierCode,
         int $shippingAddressId
-    ) : string {
+    ): string {
         return <<<QUERY
 mutation {
   setShippingMethodsOnCart(input: 
@@ -460,63 +393,16 @@ private function prepareMutationQuery(
         method_code: "$shippingMethodCode"
       }]
     }) {
-
     cart {
       shipping_addresses {
         selected_shipping_method {
           carrier_code
           method_code
-          label
-          amount
         }
       }
     }
   }
 }
-
 QUERY;
     }
-
-    /**
-     * @param string $reversedOrderId
-     * @return string
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reversedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
-    /**
-     * @param string $reversedQuoteId
-     * @return int
-     */
-    private function getQuoteAddressIdByReversedQuoteId(string $reversedQuoteId): int
-    {
-        $guestAddress = $this->quoteAddress->setData([
-            'firstname'=> 'John',
-            'lastname'=> 'Smith',
-            'company'=> 'Company Name',
-            'street'=> 'Green str, 67',
-            'city'=> 'CityM',
-            'region' => 'AL',
-            'postcode'=> 75477,
-            'telephone'=> 3468676,
-            'country_id'=> 'US',
-            'region_id' => 1
-        ]);
-
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        $quote->setBillingAddress($guestAddress);
-        $quote->setShippingAddress($guestAddress);
-        $quote->collectTotals();
-        $this->quoteResource->save($quote);
-
-        return (int) $quote->getShippingAddress()->getId();
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php
index 52ce4b4006db8..402ad030ed857 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address_rollback.php
@@ -16,4 +16,4 @@
 
 require __DIR__ . '/../../Customer/_files/customer_rollback.php';
 require __DIR__ . '/../../Customer/_files/customer_address_rollback.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/product_virtual_rollback.php';
+require __DIR__ . '/../../Catalog/_files/product_virtual_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
index 43beafe822043..d8744873af00c 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
@@ -13,7 +13,7 @@
 $registry->register('isSecureArea', true);
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
 try {
     $product = $productRepository->get('simple', false, null, true);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address.php
new file mode 100644
index 0000000000000..60d2f1c49d240
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\GuestCartManagementInterface;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\Quote\Model\ShippingAddressManagementInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Api\DataObjectHelper;
+
+/** @var GuestCartManagementInterface $guestCartManagement */
+$guestCartManagement = Bootstrap::getObjectManager()->get(GuestCartManagementInterface::class);
+/** @var CartRepositoryInterface $cartRepository */
+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+/** @var MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId */
+$maskedQuoteIdToQuoteId = Bootstrap::getObjectManager()->get(MaskedQuoteIdToQuoteIdInterface::class);
+/** @var AddressInterfaceFactory $quoteAddressFactory */
+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var ShippingAddressManagementInterface $shippingAddressManagement */
+$shippingAddressManagement = Bootstrap::getObjectManager()->get(ShippingAddressManagementInterface::class);
+
+$cartHash = $guestCartManagement->createEmptyCart();
+$cartId = $maskedQuoteIdToQuoteId->execute($cartHash);
+$cart = $cartRepository->get($cartId);
+$cart->setReservedOrderId('guest_quote_with_address');
+$cartRepository->save($cart);
+
+$quoteAddressData = [
+    AddressInterface::KEY_TELEPHONE => 4435555,
+    AddressInterface::KEY_POSTCODE => 78717,
+    AddressInterface::KEY_COUNTRY_ID => 'US',
+    AddressInterface::KEY_CITY => 'CityA',
+    AddressInterface::KEY_COMPANY => 'CompanyName',
+    AddressInterface::KEY_STREET => 'Andora str, 121',
+    AddressInterface::KEY_LASTNAME => 'Smith',
+    AddressInterface::KEY_FIRSTNAME => 'John',
+    AddressInterface::KEY_REGION_ID => 1,
+];
+$quoteAddress = $quoteAddressFactory->create();
+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
+$shippingAddressManagement->assign($cartId, $quoteAddress);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address_rollback.php
new file mode 100644
index 0000000000000..d9f894abf45b4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/quote_with_address_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
+$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'guest_quote_with_address', 'reserved_order_id');
+$quoteResource->delete($quote);
+
+/** @var QuoteIdMask $quoteIdMask */
+$quoteIdMask = $quoteIdMaskFactory->create();
+$quoteIdMask->setQuoteId($quote->getId())
+    ->delete();
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
new file mode 100644
index 0000000000000..1e7c10d251be0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
+use Magento\Checkout\Api\ShippingInformationManagementInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var ShippingInformationInterfaceFactory $shippingInformationFactory */
+$shippingInformationFactory = Bootstrap::getObjectManager()->get(ShippingInformationInterfaceFactory::class);
+/** @var ShippingInformationManagementInterface $shippingInformationManagement */
+$shippingInformationManagement = Bootstrap::getObjectManager()->get(ShippingInformationManagementInterface::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$quoteAddress = $quote->getShippingAddress();
+
+/** @var ShippingInformationInterface $shippingInformation */
+$shippingInformation = $shippingInformationFactory->create([
+    'data' => [
+        ShippingInformationInterface::SHIPPING_ADDRESS => $quoteAddress,
+        ShippingInformationInterface::SHIPPING_CARRIER_CODE => 'flatrate',
+        ShippingInformationInterface::SHIPPING_METHOD_CODE => 'flatrate',
+    ],
+]);
+$shippingInformationManagement->saveAddressInformation($quote->getId(), $shippingInformation);

From 26974e1f727e83bec7a92ce7e9b54c9e23de1c9d Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Fri, 29 Mar 2019 11:43:26 -0500
Subject: [PATCH 0869/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

---
 .../Magento/GraphQl/Controller/GraphQl.php    |  5 ++-
 .../TestCase/GraphQlAbstract.php              |  7 ++--
 .../TestModule/GraphQlMutationTest.php        |  6 ++--
 .../Controller/GraphQlControllerTest.php      | 35 +++++++++----------
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index abbe0e093c79c..6c37a5709a0bd 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -12,6 +12,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\GraphQl\Exception\ExceptionFormatter;
+use Magento\Framework\GraphQl\Exception\GraphQlRequestException;
 use Magento\Framework\GraphQl\Query\QueryProcessor;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
@@ -23,6 +24,7 @@
  * Front controller for web API GraphQL area.
  *
  * @api
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GraphQl implements FrontControllerInterface
 {
@@ -125,8 +127,9 @@ public function dispatch(RequestInterface $request) : ResponseInterface
                     isset($data['variables']) ? $data['variables'] : []
                 );
             } else {
+                $errorMessage = __('Mutation requests allowed only for POST requests');
                 $result['errors'] = [
-                    __('Mutation requests allowed only for POST requests')
+                    $this->graphQlError->create(new GraphQlRequestException($errorMessage))
                 ];
                 $statusCode = ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS;
             }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
index f55b981a04a94..d1a6356d78fba 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -6,6 +6,7 @@
 namespace Magento\TestFramework\TestCase;
 
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http;
 
 /**
  * Test case for Web API functional tests for Graphql.
@@ -43,16 +44,16 @@ public function graphQlQuery(
         array $variables = [],
         string $operationName = '',
         array $headers = [],
-        string $requestType = 'POST'
+        string $requestType = Http::METHOD_POST
     ) {
-        if ($requestType === 'POST') {
+        if ($requestType === Http::METHOD_POST) {
             $response = $this->getGraphQlClient()->postQuery(
                 $query,
                 $variables,
                 $operationName,
                 $this->composeHeaders($headers)
             );
-        } elseif ($requestType === 'GET') {
+        } elseif ($requestType === Http::METHOD_GET) {
             $response = $this->getGraphQlClient()->getQuery(
                 $query,
                 $variables,
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
index d60281a6cf413..ef1dea1c18f54 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
@@ -35,6 +35,10 @@ public function testMutation()
         $this->assertEquals([4, 5, 6], $testItem['integer_list']);
     }
 
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Mutation requests allowed only for POST requests
+     */
     public function testMutationIsNotAllowedViaGetRequest()
     {
         $id = 3;
@@ -49,8 +53,6 @@ public function testMutationIsNotAllowedViaGetRequest()
 }
 MUTATION;
 
-        self::expectException(\Exception::class);
-
         $this->graphQlQuery($query, [], '', [], 'GET');
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index 6e8d60a177c5d..a83e644c6e171 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -177,7 +177,8 @@ public function testMutationWithHttpGet()
         $response = $this->graphql->dispatch($request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
         $this->assertArrayHasKey('errors', $output);
-        $this->assertEquals('Mutation requests allowed only for POST requests', $output['errors'][0]);
+        $errorMessage = $output['errors'][0]['message'];
+        $this->assertEquals('Mutation requests allowed only for POST requests', $errorMessage);
     }
 
     /** Test request is dispatched and response generated when using GET request with parameterized query string
@@ -191,19 +192,17 @@ public function testDispatchGetWithParameterizedVariables() : void
 
         /** @var ProductInterface $product */
         $product = $productRepository->get('simple1');
-        $query1 =  <<<'QUERY'
-                
- query GetProducts($filterInput:ProductFilterInput){
- products(
-  filter:$filterInput
-){
-  items{
-   id
-   name
-   sku
-  }  
-}
- 
+        $query = <<<QUERY
+query GetProducts(\$filterInput:ProductFilterInput){
+    products(
+        filter:\$filterInput
+    ){
+        items{
+            id
+            name
+            sku
+        }  
+    }
 }
 QUERY;
         $variables = [
@@ -211,17 +210,17 @@ public function testDispatchGetWithParameterizedVariables() : void
                 'sku' =>['eq' => 'simple1']
             ]
         ];
-        $postData = [
-            'query'         => $query1,
+        $queryParams = [
+            'query'         => $query,
             'variables'     => json_encode($variables),
-            'operationName' => null
+            'operationName' => 'GetProducts'
         ];
 
         /** @var Http $request */
         $request = $this->objectManager->get(Http::class);
         $request->setPathInfo('/graphql');
         $request->setMethod('GET');
-        $request->setParams($postData);
+        $request->setParams($queryParams);
         $response = $this->graphql->dispatch($request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();

From cab46a10c79c62caa9f9109918dc311a200884cd Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Fri, 29 Mar 2019 11:47:32 -0500
Subject: [PATCH 0870/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

---
 .../Exception/GraphQlRequestException.php     | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Exception/GraphQlRequestException.php

diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlRequestException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlRequestException.php
new file mode 100644
index 0000000000000..8fef0a4791081
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlRequestException.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Exception;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Exception for GraphQL to be thrown when user supplies invalid input
+ */
+class GraphQlRequestException extends LocalizedException implements \GraphQL\Error\ClientAware
+{
+    const EXCEPTION_CATEGORY = 'graphql-request';
+
+    /**
+     * @var boolean
+     */
+    private $isSafe;
+
+    /**
+     * Initialize object
+     *
+     * @param Phrase $phrase
+     * @param \Exception $cause
+     * @param int $code
+     * @param boolean $isSafe
+     */
+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0, $isSafe = true)
+    {
+        $this->isSafe = $isSafe;
+        parent::__construct($phrase, $cause, $code);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isClientSafe() : bool
+    {
+        return $this->isSafe;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCategory() : string
+    {
+        return self::EXCEPTION_CATEGORY;
+    }
+}

From b64170a5782be475c6ad3a7df74facd13a78a1ed Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 29 Mar 2019 12:25:58 -0500
Subject: [PATCH 0871/1055] GraphQL-428: Test coverage:
 GetAvailableShippingMethodsTest

---
 .../GetAvailableShippingMethodsTest.php       | 92 +++++++++----------
 .../Guest/GetAvailableShippingMethodsTest.php | 77 ++++++----------
 ...ote_with_simple_product_saved_rollback.php |  4 +-
 .../_files/simple_product_rollback.php        |  2 +-
 .../disable_offline_shipping_methods.php      |  1 +
 ...able_offline_shipping_methods_rollback.php |  1 +
 6 files changed, 80 insertions(+), 97 deletions(-)
 rename dev/tests/integration/testsuite/Magento/{OfflineShipping => GraphQl/Quote}/_files/disable_offline_shipping_methods.php (89%)
 rename dev/tests/integration/testsuite/Magento/{OfflineShipping => GraphQl/Quote}/_files/disable_offline_shipping_methods_rollback.php (86%)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index 5ca3307371d2f..71cf0201951a3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
@@ -7,10 +7,8 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -25,19 +23,9 @@ class GetAvailableShippingMethodsTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var QuoteIdToMaskedQuoteIdInterface
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @inheritdoc
@@ -45,20 +33,22 @@ class GetAvailableShippingMethodsTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
     /**
      * Test case: get available shipping methods from current customer quote
      *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
     public function testGetAvailableShippingMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $response = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response);
@@ -84,40 +74,62 @@ public function testGetAvailableShippingMethods()
         );
     }
 
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     */
+    public function testGetAvailableShippingMethodsFromGuestCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * Test case: get available shipping methods from quote of another customer
      *
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
     public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-
-        $this->graphQlQuery(
-            $this->getQuery($maskedQuoteId),
-            [],
-            '',
-            $this->getHeaderMap('customer2@search.example.com')
-        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
     }
 
     /**
      * Test case: get available shipping methods when all shipping methods are disabled
      *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
      */
-    public function testGetAvailableShippingMethodsIfAllShippingsAreDisabled()
+    public function testGetAvailableShippingMethodsIfShippingMethodsAreNotPresent()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $response = $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
 
-        self::assertEquals(0, count($response['cart']['shipping_addresses'][0]['available_shipping_methods']));
+        self::assertEmpty($response['cart']['shipping_addresses'][0]['available_shipping_methods']);
     }
 
     /**
@@ -173,16 +185,4 @@ private function getHeaderMap(string $username = 'customer@example.com', string
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
         return $headerMap;
     }
-
-    /**
-     * @param string $reservedOrderId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 9522d65991cd2..38fda50ba5836 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -7,9 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -19,19 +17,9 @@
 class GetAvailableShippingMethodsTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteIdToMaskedQuoteIdInterface
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @inheritdoc
@@ -39,19 +27,20 @@ class GetAvailableShippingMethodsTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
      * Test case: get available shipping methods from current customer quote
      *
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
     public function testGetAvailableShippingMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $response = $this->graphQlQuery($this->getQuery($maskedQuoteId));
 
         self::assertArrayHasKey('cart', $response);
@@ -61,15 +50,15 @@ public function testGetAvailableShippingMethods()
         self::assertCount(1, $response['cart']['shipping_addresses'][0]['available_shipping_methods']);
 
         $expectedAddressData = [
-            'amount' => 5,
-            'base_amount' => 5,
+            'amount' => 10,
+            'base_amount' => 10,
             'carrier_code' => 'flatrate',
             'carrier_title' => 'Flat Rate',
             'error_message' => '',
             'method_code' => 'flatrate',
             'method_title' => 'Fixed',
-            'price_incl_tax' => 5,
-            'price_excl_tax' => 5,
+            'price_incl_tax' => 10,
+            'price_excl_tax' => 10,
         ];
         self::assertEquals(
             $expectedAddressData,
@@ -78,33 +67,38 @@ public function testGetAvailableShippingMethods()
     }
 
     /**
-     * Test case: get available shipping methods from customer's quote
-     *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
     public function testGetAvailableShippingMethodsFromCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-
         $this->graphQlQuery($this->getQuery($maskedQuoteId));
     }
 
     /**
      * Test case: get available shipping methods when all shipping methods are disabled
      *
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @magentoApiDataFixture Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
      */
-    public function testGetAvailableShippingMethodsIfShippingsAreDisabled()
+    public function testGetAvailableShippingMethodsIfShippingMethodsAreNotPresent()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $response = $this->graphQlQuery($this->getQuery($maskedQuoteId));
 
-        self::assertEquals(0, count($response['cart']['shipping_addresses'][0]['available_shipping_methods']));
+        self::assertEmpty($response['cart']['shipping_addresses'][0]['available_shipping_methods']);
     }
 
     /**
@@ -116,8 +110,9 @@ public function testGetAvailableShippingMethodsIfShippingsAreDisabled()
     public function testGetAvailableShippingMethodsOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
 
-        $this->graphQlQuery($this->getQuery($maskedQuoteId));
+        $this->graphQlQuery($query);
     }
 
     /**
@@ -146,16 +141,4 @@ private function getQuery(string $maskedQuoteId): string
 }
 QUERY;
     }
-
-    /**
-     * @param string $reservedOrderId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
index 2e333bbcb3049..105a981ccfc84 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_saved_rollback.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * Rollback for quote_with_simple_product_saved_rollback.php fixture.
+ * Rollback for quote_with_payment_saved.php fixture.
  *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-require 'simple_product_rollback.php';
-
 /** @var $objectManager \Magento\TestFramework\ObjectManager */
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
index 43beafe822043..d8744873af00c 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/simple_product_rollback.php
@@ -13,7 +13,7 @@
 $registry->register('isSecureArea', true);
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
 try {
     $product = $productRepository->get('simple', false, null, true);
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
similarity index 89%
rename from dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
rename to dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
index 30c64ab7a42a2..c5d0468dbfacb 100644
--- a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
 declare(strict_types=1);
 
 use Magento\Framework\App\Config\Storage\Writer;
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods_rollback.php
similarity index 86%
rename from dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods_rollback.php
rename to dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods_rollback.php
index 31a16f42adfce..384ffbdf51f3c 100644
--- a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/disable_offline_shipping_methods_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/disable_offline_shipping_methods_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
 declare(strict_types=1);
 
 use Magento\Framework\App\Config\Storage\Writer;

From 1f5e89b346677922eeb6fd11a7efd2456be4f226 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Fri, 29 Mar 2019 19:47:54 +0200
Subject: [PATCH 0872/1055] MAGETWO-70996: [GitHub] Customer Address "default
 billing address" Attribute Not Used in Checkout #8777

---
 .../Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index 7f9ba744507bb..cbe71e9cffa60 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -54,7 +54,6 @@
         <element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
         <element name="noQuotes" type="text" selector=".no-quotes-block"/>
         <element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
-        <element name="billingAddressSelect" type="select" selector=".payment-method._active select[name='billing_address_id']"/>
         <element name="billingAddressSelectShared" type="select" selector=".checkout-billing-address select[name='billing_address_id']"/>
     </section>
 </sections>

From 3cd2bd88cba9b5cc80ce26182455577897e9d5c4 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 29 Mar 2019 13:47:44 -0500
Subject: [PATCH 0873/1055] GraphQL-191: Resolve random fails on Bamboo with
 \Magento\GraphQl\Quote\CouponTest::testApplyCouponToCartWithNoItems

---
 .../QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php     | 6 +++++-
 .../testsuite/Magento/GraphQl/Quote/CouponTest.php        | 8 +++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
index 5429d5333b25b..4de0464681186 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ApplyCouponToCart.php
@@ -75,7 +75,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         try {
             $this->couponManagement->set($cartId, $couponCode);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            $message = $e->getMessage();
+            if (preg_match('/The "\d+" Cart doesn\'t contain products/', $message)) {
+                $message = 'Cart does not contain products.';
+            }
+            throw new GraphQlNoSuchEntityException(__($message), $e);
         } catch (CouldNotSaveException $e) {
             throw new LocalizedException(__($e->getMessage()), $e);
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
index 810fc793fb1e2..828784ca27885 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
@@ -89,19 +89,17 @@ public function testApplyCouponTwice()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Cart does not contain products.
      */
     public function testApplyCouponToCartWithNoItems()
     {
         $couponCode = '2?ds5!2d';
 
         $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
-        $cartId = (int)$this->quote->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute($cartId);
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
 
-        self::expectExceptionMessage(
-            'The "' . $cartId . '" Cart doesn\'t contain products.'
-        );
         $this->graphQlQuery($query);
     }
 

From 79f9244a847c1553533b04c4aabba36c8e096d09 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Fri, 29 Mar 2019 22:20:24 +0200
Subject: [PATCH 0874/1055] magento/graphql-ce#502: Add missed rollback

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

diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php
new file mode 100644
index 0000000000000..64330be259fca
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Integration\Model\Oauth\Token\RequestThrottler;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$customersToRemove = [
+    'customer@search.example.com',
+    'customer2@search.example.com',
+    'customer3@search.example.com',
+];
+
+/**
+ * @var Magento\Customer\Api\CustomerRepositoryInterface
+ */
+$customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+/**
+ * @var RequestThrottler $throttler
+ */
+$throttler = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(RequestThrottler::class);
+foreach ($customersToRemove as $customerEmail) {
+    try {
+        $customer = $customerRepository->get($customerEmail);
+        $customerRepository->delete($customer);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+        // not found
+    }
+
+    /* Unlock account if it was locked for tokens retrieval */
+    $throttler->resetAuthenticationFailuresCount($customerEmail, RequestThrottler::USER_TYPE_CUSTOMER);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 84a21a4590382a559e4a393559232f03651a576e Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 29 Mar 2019 15:44:30 -0500
Subject: [PATCH 0875/1055] GraphQL-478: [Test Coverage] 'Selected Shipping
 Method' functionality

---
 .../GetSelectedShippingMethodTest.php         | 180 ++++++++++++++
 .../Customer/SelectedShippingMethodTest.php   | 223 ------------------
 .../Guest/GetSelectedShippingMethodTest.php   | 136 +++++++++++
 .../Guest/SelectedShippingMethodTest.php      | 220 -----------------
 4 files changed, 316 insertions(+), 443 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
 delete mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SelectedShippingMethodTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
 delete mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SelectedShippingMethodTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
new file mode 100644
index 0000000000000..8dcba637dc57d
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class GetSelectedShippingMethodTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testGetSelectedShippingMethod()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
+        self::assertCount(1, $response['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['method_code']);
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testGetSelectedShippingMethodFromGuestCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testGetSelectedShippingMethodFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     */
+    public function testGetGetSelectedShippingMethodIfShippingMethodIsNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
+        self::assertCount(1, $response['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
+        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
+        self::assertNull($shippingAddress['selected_shipping_method']['label']);
+        self::assertNull($shippingAddress['selected_shipping_method']['amount']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetGetSelectedShippingMethodOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    shipping_addresses {
+      selected_shipping_method {
+        carrier_code
+        method_code
+        label
+        amount
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SelectedShippingMethodTest.php
deleted file mode 100644
index a3e9188bb82f2..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SelectedShippingMethodTest.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Quote\Customer;
-
-use Magento\TestFramework\TestCase\GraphQlAbstract;
-
-class SelectedShippingMethodTest extends GraphQlAbstract
-{
-    /**
-     * @var \Magento\TestFramework\ObjectManager
-     */
-    private $objectManager;
-
-    /**
-     * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var \Magento\Framework\Api\SortOrderBuilder
-     */
-    private $sortOrderBuilder;
-
-    /**
-     * @var \Magento\Framework\Api\FilterBuilder
-     */
-    private $filterBuilder;
-
-    /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote
-     */
-    private $quoteResource;
-
-    /**
-     * @var \Magento\Quote\Model\QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var \Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var \Magento\Integration\Api\CustomerTokenServiceInterface
-     */
-    private $customerTokenService;
-
-    /**
-     * @param $response
-     * @return mixed
-     */
-    public function getSelectedShippingMethod($response)
-    {
-        return $response['cart']['shipping_addresses'][0]['selected_shipping_method'];
-    }
-
-    protected function setUp()
-    {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        $this->filterBuilder = $this->objectManager->create(
-            \Magento\Framework\Api\FilterBuilder::class
-        );
-        $this->sortOrderBuilder = $this->objectManager->create(
-            \Magento\Framework\Api\SortOrderBuilder::class
-        );
-        $this->searchCriteriaBuilder = $this->objectManager->create(
-            \Magento\Framework\Api\SearchCriteriaBuilder::class
-        );
-        $this->quoteResource = $this->objectManager->get(
-            \Magento\Quote\Model\ResourceModel\Quote::class
-        );
-        $this->quoteFactory = $this->objectManager->get(
-            \Magento\Quote\Model\QuoteFactory::class
-        );
-        $this->quoteIdToMaskedId = $this->objectManager->get(
-            \Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface::class
-        );
-        $this->customerTokenService = $this->objectManager->get(
-            \Magento\Integration\Api\CustomerTokenServiceInterface::class
-        );
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
-     */
-    public function testGetCartWithShippingMethod()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-
-        self::assertArrayHasKey('cart', $response);
-        self::assertInternalType(
-            'array',
-            $response['cart']['shipping_addresses'][0]['selected_shipping_method'],
-            'There are no selected shipping method for customer cart!'
-        );
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
-     */
-    public function testGetShippingMethodFromCustomerCart()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-
-        self::assertArrayHasKey('cart', $response);
-
-        $selectedShippingMethod = $this->getSelectedShippingMethod($response);
-
-        self::assertEquals('flatrate', $selectedShippingMethod['carrier_code']);
-        self::assertEquals('flatrate', $selectedShippingMethod['method_code']);
-        self::assertEquals('Flat Rate - Fixed', $selectedShippingMethod['label']);
-        self::assertEquals(0, $selectedShippingMethod['amount']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
-     */
-    public function testGetShippingMethodIfShippingMethodIsNotSet()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $query = $this->getQuery($maskedQuoteId);
-
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-
-        self::assertArrayHasKey('cart', $response);
-
-        $selectedShippingMethod = $this->getSelectedShippingMethod($response);
-
-        self::assertNull($selectedShippingMethod['carrier_code']);
-        self::assertNull($selectedShippingMethod['method_code']);
-        self::assertNull($selectedShippingMethod['label']);
-        self::assertNull($selectedShippingMethod['amount']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
-     */
-    public function testGetShippingMethodOfNonExistentCart()
-    {
-        $query = $this->getQuery('nonExistentCart');
-        self::expectException(\Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException::class);
-        self::expectExceptionMessage(
-            'GraphQL response contains errors: Could not find a cart with ID "nonExistentCart"'
-        );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * Retrieve quote by given reserved order ID
-     *
-     * @param string $reservedOrderId
-     * @return \Magento\Quote\Model\Quote
-     * @throws \InvalidArgumentException
-     */
-    protected function getCart($reservedOrderId)
-    {
-        /** @var $cart \Magento\Quote\Model\Quote */
-        $cart = $this->objectManager->get(\Magento\Quote\Model\Quote::class);
-        $cart->load($reservedOrderId, 'reserved_order_id');
-        if (!$cart->getId()) {
-            throw new \InvalidArgumentException('There is no quote with provided reserved order ID.');
-        }
-        return $cart;
-    }
-
-    /**
-     * @param string $reservedOrderId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
-    /**
-     * @param string $username
-     * @param string $password
-     * @return array
-     */
-    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-    {
-        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        return $headerMap;
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @return string
-     */
-    private function getQuery(
-        string $maskedQuoteId
-    ): string {
-        return <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    shipping_addresses {
-      selected_shipping_method {
-        carrier_code
-        method_code
-        label
-        amount
-      }
-    }
-  }
-}
-QUERY;
-    }
-}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
new file mode 100644
index 0000000000000..e00f79b1a99a0
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class GetSelectedShippingMethodTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testGetSelectedShippingMethod()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
+        self::assertCount(1, $response['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['method_code']);
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testGetSelectedShippingMethodFromCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     */
+    public function testGetGetSelectedShippingMethodIfShippingMethodIsNotSet()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('shipping_addresses', $response['cart']);
+        self::assertCount(1, $response['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertNull($shippingAddress['selected_shipping_method']['carrier_code']);
+        self::assertNull($shippingAddress['selected_shipping_method']['method_code']);
+        self::assertNull($shippingAddress['selected_shipping_method']['label']);
+        self::assertNull($shippingAddress['selected_shipping_method']['amount']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetSelectedShippingMethodOfNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+{
+  cart(cart_id: "$maskedQuoteId") {
+    shipping_addresses {
+      selected_shipping_method {
+        carrier_code
+        method_code
+        label
+        amount
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SelectedShippingMethodTest.php
deleted file mode 100644
index 3e52abfbe7d58..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SelectedShippingMethodTest.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Quote\Guest;
-
-use Magento\TestFramework\TestCase\GraphQlAbstract;
-
-class SelectedShippingMethodTest extends GraphQlAbstract
-{
-    /**
-     * @var \Magento\TestFramework\ObjectManager
-     */
-    private $objectManager;
-
-    /**
-     * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-
-    /**
-     * @var \Magento\Framework\Api\SortOrderBuilder
-     */
-    private $sortOrderBuilder;
-
-    /**
-     * @var \Magento\Framework\Api\FilterBuilder
-     */
-    private $filterBuilder;
-
-    /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote
-     */
-    private $quoteResource;
-
-    /**
-     * @var \Magento\Quote\Model\QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var \Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @param $response
-     * @return mixed
-     */
-    public function getSelectedShippingMethod($response)
-    {
-        $selectedShippingMethod = $response['cart']['shipping_addresses'][0]['selected_shipping_method'];
-        return $selectedShippingMethod;
-    }
-
-    protected function setUp()
-    {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        $this->filterBuilder = $this->objectManager->create(
-            \Magento\Framework\Api\FilterBuilder::class
-        );
-        $this->sortOrderBuilder = $this->objectManager->create(
-            \Magento\Framework\Api\SortOrderBuilder::class
-        );
-        $this->searchCriteriaBuilder = $this->objectManager->create(
-            \Magento\Framework\Api\SearchCriteriaBuilder::class
-        );
-        $this->quoteResource = $this->objectManager->get(
-            \Magento\Quote\Model\ResourceModel\Quote::class
-        );
-        $this->quoteFactory = $this->objectManager->get(
-            \Magento\Quote\Model\QuoteFactory::class
-        );
-        $this->quoteIdToMaskedId = $this->objectManager->get(
-            \Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface::class
-        );
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
-     */
-    public function testGetCartWithShippingMethod()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $this->unAssignCustomerFromQuote('test_order_1');
-        $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('cart', $response);
-        self::assertInternalType(
-            'array',
-            $response['cart']['shipping_addresses'][0]['selected_shipping_method'],
-            'There are no selected shipping method for customer cart!'
-        );
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
-     */
-    public function testGetShippingMethodFromCustomerCart()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $this->unAssignCustomerFromQuote('test_order_1');
-        $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('cart', $response);
-
-        $selectedShippingMethod = $this->getSelectedShippingMethod($response);
-
-        self::assertEquals('flatrate', $selectedShippingMethod['carrier_code']);
-        self::assertEquals('flatrate', $selectedShippingMethod['method_code']);
-        self::assertEquals('Flat Rate - Fixed', $selectedShippingMethod['label']);
-        self::assertEquals(0, $selectedShippingMethod['amount']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
-     */
-    public function testGetShippingMethodIfShippingMethodIsNotSet()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
-        $query = $this->getQuery($maskedQuoteId);
-        $this->unAssignCustomerFromQuote('test_order_1');
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('cart', $response);
-
-        $selectedShippingMethod = $this->getSelectedShippingMethod($response);
-
-        self::assertNull($selectedShippingMethod['carrier_code']);
-        self::assertNull($selectedShippingMethod['method_code']);
-        self::assertNull($selectedShippingMethod['label']);
-        self::assertNull($selectedShippingMethod['amount']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address.php
-     */
-    public function testGetShippingMethodOfNonExistentCart()
-    {
-        $query = $this->getQuery('nonExistentCart');
-        self::expectException(\Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException::class);
-        self::expectExceptionMessage(
-            'GraphQL response contains errors: Could not find a cart with ID "nonExistentCart"'
-        );
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * Retrieve quote by given reserved order ID
-     *
-     * @param string $reservedOrderId
-     * @return \Magento\Quote\Model\Quote
-     * @throws \InvalidArgumentException
-     */
-    protected function getCart($reservedOrderId)
-    {
-        /** @var $cart \Magento\Quote\Model\Quote */
-        $cart = $this->objectManager->get(\Magento\Quote\Model\Quote::class);
-        $cart->load($reservedOrderId, 'reserved_order_id');
-        if (!$cart->getId()) {
-            throw new \InvalidArgumentException('There is no quote with provided reserved order ID.');
-        }
-        return $cart;
-    }
-
-    /**
-     * @param string $reservedOrderId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @return string
-     */
-    private function getQuery(
-        string $maskedQuoteId
-    ): string {
-        return <<<QUERY
-{
-  cart(cart_id: "$maskedQuoteId") {
-    shipping_addresses {
-      selected_shipping_method {
-        carrier_code
-        method_code
-        label
-        amount
-      }
-    }
-  }
-}
-QUERY;
-    }
-
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function unAssignCustomerFromQuote(
-        string $reversedQuoteId
-    ): string {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-        $quote->setCustomerId(0);
-        $this->quoteResource->save($quote);
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-}

From df001b8c171055f2d4ced89f93ca7306c98e5a11 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 29 Mar 2019 15:58:25 -0500
Subject: [PATCH 0876/1055] MC-13709: Create configurable product with out of
 stock child product, display out of stock products = yes

- This test fails when extensions are enabled. I'm pulling it out of this weeks pr for now.
---
 ...eProductWithOutOfStockChildProductTest.xml | 123 ------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithOutOfStockChildProductTest.xml

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithOutOfStockChildProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithOutOfStockChildProductTest.xml
deleted file mode 100644
index 9331b1f18fc5c..0000000000000
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithOutOfStockChildProductTest.xml
+++ /dev/null
@@ -1,123 +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="AdminCreateConfigurableProductWithOutOfStockChildProductTest">
-        <annotations>
-            <features value="ConfigurableProduct"/>
-            <stories value="Create configurable product"/>
-            <title value="Create configurable product with out of stock child product, display out of stock products = yes"/>
-            <description value="Admin should be able to create configurable product with one new out of stock child product, assigned to category"/>
-            <testCaseId value="MC-13709"/>
-            <severity value="CRITICAL"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <!-- Create attribute with one options -->
-            <createData entity="productAttributeWithTwoOptionsNotVisible" stepKey="createConfigProductAttribute"/>
-            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </createData>
-            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </createData>
-            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </getData>
-
-            <!-- Create the child that will be a part of the configurable product -->
-            <createData entity="ApiSimpleOutOfStock" stepKey="createSimpleProduct">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-                <requiredEntity createDataKey="getConfigAttributeOption"/>
-            </createData>
-            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-        </before>
-        <after>
-            <!-- Don't display out of stock product -->
-            <actionGroup ref="noDisplayOutOfStockProduct" stepKey="revertDisplayOutOfStockProduct"/>
-
-            <!-- Delete configurable product -->
-            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-                <argument name="product" value="ApiConfigurableProduct"/>
-            </actionGroup>
-
-            <!-- Delete created data -->
-            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-
-            <!-- Log out -->
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-
-        <!-- Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
-        <actionGroup ref="goToCreateProductPage" stepKey="createConfigurableProduct">
-            <argument name="product" value="ApiConfigurableProduct"/>
-        </actionGroup>
-
-        <!-- Fill configurable product values -->
-        <actionGroup ref="fillMainProductForm" stepKey="fillConfigurableProductValues">
-            <argument name="product" value="ApiConfigurableProduct"/>
-        </actionGroup>
-
-        <!-- Create product configurations and add attribute and select all options -->
-        <actionGroup ref="generateConfigurationsByAttributeCode" stepKey="generateConfigurationsByAttributeCode" after="fillConfigurableProductValues">
-            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
-        </actionGroup>
-
-        <!-- Add configurable product to category -->
-        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory" after="fillConfigurableProductValues"/>
-
-        <!-- Add child product to configurations grid -->
-        <actionGroup ref="addProductToConfigurationsGrid" stepKey="addSimpleProduct">
-            <argument name="sku" value="$$createSimpleProduct.sku$$"/>
-            <argument name="name" value="$$createConfigProductAttributeOption.option[store_labels][1][label]$$"/>
-        </actionGroup>
-
-        <!-- Save configurable product -->
-        <actionGroup ref="saveProductForm" stepKey="saveConfigurableProduct"/>
-
-        <!-- Find configurable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
-        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedConfigurableProduct">
-            <argument name="product" value="ApiConfigurableProduct"/>
-        </actionGroup>
-
-        <!-- Assert configurable product on admin product page -->
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <actionGroup ref="assertConfigurableProductOnAdminProductPage" stepKey="assertConfigurableProductOnAdminProductPage">
-            <argument name="product" value="ApiConfigurableProduct"/>
-        </actionGroup>
-
-        <!-- Assert configurable attributes block is present on product page -->
-        <seeElement selector="{{AdminProductFormConfigurationsSection.createdConfigurationsBlock}}" stepKey="seeCreatedConfigurations"/>
-
-        <!-- Display out of stock product -->
-        <actionGroup ref="displayOutOfStockProduct" stepKey="displayOutOfStockProduct"/>
-
-        <!-- Flash cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-
-        <!--Assert configurable product in category -->
-        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-        <actionGroup ref="StorefrontCheckCategoryOutOfStockConfigurableProduct" stepKey="assertConfigurableProductInCategory">
-            <argument name="product" value="ApiConfigurableProduct"/>
-        </actionGroup>
-
-        <!-- Assert configurable product is out of stock-->
-        <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see stepKey="checkForOutOfStock" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="OUT OF STOCK"/>
-    </test>
-</tests>

From aa5b19e7c2371e3af787c1afe1ae96348eb21377 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Fri, 29 Mar 2019 17:12:56 -0500
Subject: [PATCH 0877/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../TestFramework/Dependency/DiRule.php       |  1 +
 .../Integrity/DeclarativeDependencyTest.php   |  3 ++-
 .../DeclarativeSchemaDependencyProvider.php   |  5 ++---
 .../Magento/Test/Integrity/DependencyTest.php | 22 +++++++++++--------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
index 8eda14dd28165..b3ee0a2880308 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
@@ -77,6 +77,7 @@ private function getPattern()
      */
     public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
     {
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
         if (pathinfo($file, PATHINFO_BASENAME) !== 'di.xml') {
             return [];
         }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
index b19caa650e5e7..87cc5afd5ecb3 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
@@ -88,7 +88,7 @@ function ($file) {
                         $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules) . "\n";
                     }
                 }
-                if (count($result)) {
+                if (!empty($result)) {
                     $this->fail(
                         'Module ' . $moduleName . ' has undeclared dependencies: ' . "\n" . implode("\t\n", $result)
                     );
@@ -170,6 +170,7 @@ private function readJsonFile(string $file, bool $asArray = false)
     {
         $decodedJson = json_decode(file_get_contents($file), $asArray);
         if (null == $decodedJson) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception("Invalid Json: $file");
         }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
index f406291603757..965bc6184144b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -174,6 +174,7 @@ private function readJsonFile(string $file, bool $asArray = false)
     {
         $decodedJson = json_decode(file_get_contents($file), $asArray);
         if (null == $decodedJson) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception("Invalid Json: $file");
         }
 
@@ -304,10 +305,8 @@ private function resolveEntityDependencies(string $tableName, string $entityType
             case self::SCHEMA_ENTITY_INDEX:
                 return $this->getDeclarativeSchema()
                 [self::SCHEMA_ENTITY_TABLE][$tableName][$entityType][$entityName]['modules'];
-                break;
             case self::SCHEMA_ENTITY_TABLE:
                 return $this->getDeclarativeSchema()[self::SCHEMA_ENTITY_TABLE][$tableName]['modules'];
-                break;
             default:
                 return [];
         }
@@ -593,7 +592,7 @@ public static function decodeDependencyId(string $id): array
      */
     private function collectDependencies($currentModuleName, $dependencies = [])
     {
-        if (!count($dependencies)) {
+        if (empty($dependencies)) {
             return [];
         }
         foreach ($dependencies as $dependencyName => $dependency) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index 3e50103445987..35819ff212954 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -221,6 +221,7 @@ protected static function _initThemes()
         $defaultThemes = [];
         foreach (self::$_listConfigXml as $file) {
             $config = simplexml_load_file($file);
+            //phpcs:ignore Generic.PHP.NoSilencedErrors
             $nodes = @($config->xpath("/config/*/design/theme/full_name") ?: []);
             foreach ($nodes as $node) {
                 $defaultThemes[] = (string)$node;
@@ -237,6 +238,7 @@ protected static function _initRules()
         $replaceFilePattern = str_replace('\\', '/', realpath(__DIR__)) . '/_files/dependency_test/tables_*.php';
         $dbRuleTables = [];
         foreach (glob($replaceFilePattern) as $fileName) {
+            //phpcs:ignore Generic.PHP.NoSilencedErrors
             $dbRuleTables = array_merge($dbRuleTables, @include $fileName);
         }
         self::$_rulesInstances = [
@@ -339,12 +341,12 @@ function ($fileType, $file) {
                 $result = [];
                 foreach ($undeclaredDependency as $type => $modules) {
                     $modules = array_unique($modules);
-                    if (!count($modules)) {
+                    if (empty($modules)) {
                         continue;
                     }
                     $result[] = sprintf("%s [%s]", $type, implode(', ', $modules));
                 }
-                if (count($result)) {
+                if (!empty($result)) {
                     $this->fail('Module ' . $module . ' has undeclared dependencies: ' . implode(', ', $result));
                 }
             },
@@ -473,7 +475,7 @@ public function testRedundant()
         foreach (array_keys(self::$mapDependencies) as $module) {
             $result = [];
             $redundant = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT);
-            if (count($redundant)) {
+            if (!empty($redundant)) {
                 $result[] = sprintf(
                     "\r\nModule %s: %s [%s]",
                     $module,
@@ -482,11 +484,11 @@ public function testRedundant()
                 );
             }
 
-            if (count($result)) {
+            if (!empty($result)) {
                 $output[] = implode(', ', $result);
             }
         }
-        if (count($output)) {
+        if (!empty($output)) {
             $this->fail("Redundant dependencies found!\r\n" . implode(' ', $output));
         }
     }
@@ -654,7 +656,7 @@ protected static function _prepareMapLayoutBlocks()
             $area = 'default';
             if (preg_match('/[\/](?<area>adminhtml|frontend)[\/]/', $file, $matches)) {
                 $area = $matches['area'];
-                self::$_mapLayoutBlocks[$area] = @(self::$_mapLayoutBlocks[$area] ?: []);
+                self::$_mapLayoutBlocks[$area] = self::$_mapLayoutBlocks[$area] ?? [];
             }
             if (preg_match('/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)) {
                 $module = $matches['namespace'] . '\\' . $matches['module'];
@@ -664,7 +666,7 @@ protected static function _prepareMapLayoutBlocks()
                     $attributes = $element->attributes();
                     $block = (string)$attributes->name;
                     if (!empty($block)) {
-                        self::$_mapLayoutBlocks[$area][$block] = @(self::$_mapLayoutBlocks[$area][$block] ?: []);
+                        self::$_mapLayoutBlocks[$area][$block] = self::$_mapLayoutBlocks[$area][$block] ?? [];
                         self::$_mapLayoutBlocks[$area][$block][$module] = $module;
                     }
                 }
@@ -682,7 +684,7 @@ protected static function _prepareMapLayoutHandles()
             $area = 'default';
             if (preg_match('/\/(?<area>adminhtml|frontend)\//', $file, $matches)) {
                 $area = $matches['area'];
-                self::$_mapLayoutHandles[$area] = @(self::$_mapLayoutHandles[$area] ?: []);
+                self::$_mapLayoutHandles[$area] = self::$_mapLayoutHandles[$area] ?? [];
             }
             if (preg_match('/app\/code\/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)/', $file, $matches)
             ) {
@@ -691,7 +693,7 @@ protected static function _prepareMapLayoutHandles()
                 foreach ((array)$xml->xpath('/layout/child::*') as $element) {
                     /** @var \SimpleXMLElement $element */
                     $handle = $element->getName();
-                    self::$_mapLayoutHandles[$area][$handle] = @(self::$_mapLayoutHandles[$area][$handle] ?: []);
+                    self::$_mapLayoutHandles[$area][$handle] = self::$_mapLayoutHandles[$area][$handle] ?? [];
                     self::$_mapLayoutHandles[$area][$handle][$module] = $module;
                 }
             }
@@ -751,6 +753,7 @@ protected static function _initDependencies()
             $contents = file_get_contents($file);
             $decodedJson = json_decode($contents);
             if (null == $decodedJson) {
+                //phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new \Exception("Invalid Json: $file");
             }
             $json = new \Magento\Framework\Config\Composer\Package(json_decode($contents));
@@ -839,6 +842,7 @@ private static function getPackageModuleMapping(): array
             $contents = file_get_contents($file);
             $composerJson = json_decode($contents);
             if (null == $composerJson) {
+                //phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new \Exception("Invalid Json: $file");
             }
             $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');

From bd91a205374287b424949955d58f7a0f62444369 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Sat, 30 Mar 2019 00:33:37 +0200
Subject: [PATCH 0878/1055] magento/graphql-ce#480: [Test Coverage]
 'GetBillingAddress' functionality

---
 .../Quote/Customer/GetBillingAddressTest.php  | 21 +++++++++++++------
 .../Quote/Guest/GetBillingAddressTest.php     | 21 +++++++++++++------
 .../_files/guest_quote_with_addresses.php     |  1 -
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
index 208bf97489dfc..7067a32dbb62d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
@@ -52,11 +52,15 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
     public function testGetCartWithBillingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
         $query = $this->getGetBillingAddressQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
@@ -87,11 +91,13 @@ public function testGetCartWithBillingAddress()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testGetBillingAddressFromAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
@@ -104,11 +110,14 @@ public function testGetBillingAddressFromAnotherCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/GiftMessage/_files/quote_with_customer_and_message.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testGetBillingAddressIfBillingAddressIsNotSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('message_order_21');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
         $query = $this->getGetBillingAddressQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
index 3afc8c3ecdd1c..ec8bd398c51d1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
@@ -46,11 +46,14 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
     public function testGetCartWithBillingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('guest_quote');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
         $response = $this->graphQlQuery($this->getGetBillingAddressQuery($maskedQuoteId));
 
         $expectedBillingAddressData = [
@@ -78,11 +81,15 @@ public function testGetCartWithBillingAddress()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
     public function testGetBillingAddressFromAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
         $query = $this->getGetBillingAddressQuery($maskedQuoteId);
 
         $this->expectExceptionMessage(
@@ -93,11 +100,13 @@ public function testGetBillingAddressFromAnotherCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testGetBillingAddressIfBillingAddressIsNotSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
         $query = $this->getGetBillingAddressQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
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
index d1baee478e03d..850e51bb2b5d4 100644
--- 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
@@ -18,7 +18,6 @@
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setName('Simple Product')
     ->setSku('simple-product-guest-quote')
-    ->setUrlKey('simple-product-guest-quote')
     ->setPrice(10)
     ->setTaxClassId(0)
     ->setMetaTitle('meta title')

From 1093d8b60292d59bbaca6095f008321c77bdd9e2 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 29 Mar 2019 17:45:07 -0500
Subject: [PATCH 0879/1055] GraphQL-542: Replace deprecated
 Magento/Checkout/_files/quote_with_address_saved.php fixture in
 SetOfflineShippingMethodsOnCartTest

---
 .../SetOfflineShippingMethodsOnCartTest.php   | 160 +++++++++++++
 .../SetOfflineShippingMethodsOnCartTest.php   | 140 +++++++++++
 .../SetOfflineShippingMethodsOnCartTest.php   | 218 ------------------
 3 files changed, 300 insertions(+), 218 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
 delete mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
new file mode 100644
index 0000000000000..bd147cc4a197e
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for setting offline shipping methods on cart
+ */
+class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @var GetQuoteShippingAddressIdByReservedQuoteId
+     */
+    private $getQuoteShippingAddressIdByReservedQuoteId;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(
+            GetQuoteShippingAddressIdByReservedQuoteId::class
+        );
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
+     *
+     * @param string $carrierCode
+     * @param string $methodCode
+     * @param float $amount
+     * @param string $label
+     * @dataProvider offlineShippingMethodDataProvider
+     */
+    public function testSetOfflineShippingMethod(string $carrierCode, string $methodCode, float $amount, string $label)
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($amount, $shippingAddress['selected_shipping_method']['amount']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($label, $shippingAddress['selected_shipping_method']['label']);
+    }
+
+    /**
+     * @return array
+     */
+    public function offlineShippingMethodDataProvider(): array
+    {
+        return [
+            'flatrate_flatrate' => ['flatrate', 'flatrate', 10, 'Flat Rate - Fixed'],
+            'tablerate_bestway' => ['tablerate', 'bestway', 10, 'Best Way - Table Rate'],
+            'freeshipping_freeshipping' => ['freeshipping', 'freeshipping', 0, 'Free Shipping - Free'],
+        ];
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $shippingMethodCode
+     * @param string $shippingCarrierCode
+     * @param int $shippingAddressId
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId,
+        string $shippingMethodCode,
+        string $shippingCarrierCode,
+        int $shippingAddressId
+    ): string {
+        return <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: 
+    {
+      cart_id: "$maskedQuoteId", 
+      shipping_methods: [{
+        cart_address_id: $shippingAddressId
+        carrier_code: "$shippingCarrierCode"
+        method_code: "$shippingMethodCode"
+      }]
+    }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          amount
+          label
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
new file mode 100644
index 0000000000000..8ed9ef84d6fbd
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for setting offline shipping methods on cart
+ */
+class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @var GetQuoteShippingAddressIdByReservedQuoteId
+     */
+    private $getQuoteShippingAddressIdByReservedQuoteId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(
+            GetQuoteShippingAddressIdByReservedQuoteId::class
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
+     *
+     * @param string $carrierCode
+     * @param string $methodCode
+     * @param float $amount
+     * @param string $label
+     * @dataProvider offlineShippingMethodDataProvider
+     */
+    public function testSetOfflineShippingMethod(string $carrierCode, string $methodCode, float $amount, string $label)
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('amount', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($amount, $shippingAddress['selected_shipping_method']['amount']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($label, $shippingAddress['selected_shipping_method']['label']);
+    }
+
+    /**
+     * @return array
+     */
+    public function offlineShippingMethodDataProvider(): array
+    {
+        return [
+            'flatrate_flatrate' => ['flatrate', 'flatrate', 10, 'Flat Rate - Fixed'],
+            'tablerate_bestway' => ['tablerate', 'bestway', 10, 'Best Way - Table Rate'],
+            'freeshipping_freeshipping' => ['freeshipping', 'freeshipping', 0, 'Free Shipping - Free'],
+        ];
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $shippingMethodCode
+     * @param string $shippingCarrierCode
+     * @param int $shippingAddressId
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId,
+        string $shippingMethodCode,
+        string $shippingCarrierCode,
+        int $shippingAddressId
+    ): string {
+        return <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input: 
+    {
+      cart_id: "$maskedQuoteId", 
+      shipping_methods: [{
+        cart_address_id: $shippingAddressId
+        carrier_code: "$shippingCarrierCode"
+        method_code: "$shippingMethodCode"
+      }]
+    }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+          method_code
+          amount
+          label
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php
deleted file mode 100644
index a88f31f6ca884..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetOfflineShippingMethodsOnCartTest.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * 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\QuoteFactory;
-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 setting offline shipping methods on cart
- */
-class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
-{
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var CustomerTokenServiceInterface
-     */
-    private $customerTokenService;
-
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp()
-    {
-        $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
-     *
-     * @param string $carrierCode
-     * @param string $methodCode
-     * @param float $amount
-     * @param string $label
-     * @dataProvider offlineShippingMethodDataProvider
-     */
-    public function testSetOfflineShippingMethod(string $carrierCode, string $methodCode, float $amount, string $label)
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $quote,
-            'test_quote',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-        $shippingAddressId = (int)$quote->getShippingAddress()->getId();
-
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $shippingAddressId,
-            $carrierCode,
-            $methodCode
-        );
-
-        $response = $this->sendRequestWithToken($query);
-
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        self::assertEquals($addressesInformation[0]['selected_shipping_method']['carrier_code'], $carrierCode);
-        self::assertEquals($addressesInformation[0]['selected_shipping_method']['method_code'], $methodCode);
-        self::assertEquals($addressesInformation[0]['selected_shipping_method']['amount'], $amount);
-        self::assertEquals($addressesInformation[0]['selected_shipping_method']['label'], $label);
-    }
-
-    /**
-     * @return array
-     */
-    public function offlineShippingMethodDataProvider()
-    {
-        return [
-            'flatrate_flatrate' => ['flatrate', 'flatrate', 10, 'Flat Rate - Fixed'],
-            'tablerate_bestway' => ['tablerate', 'bestway', 10, 'Best Way - Table Rate'],
-            'freeshipping_freeshipping' => ['freeshipping', 'freeshipping', 0, 'Free Shipping - Free'],
-        ];
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     */
-    public function testSetShippingMethodTwiceInOneRequest()
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $quote,
-            'test_quote',
-            'reserved_order_id'
-        );
-        $shippingAddress = $quote->getShippingAddress();
-        $shippingAddressId = $shippingAddress->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-
-        $query = <<<QUERY
-mutation {
-  setShippingMethodsOnCart(input: {
-    cart_id: "$maskedQuoteId"
-    shipping_methods: [
-      {
-        cart_address_id: $shippingAddressId
-        carrier_code: "flatrate"
-        method_code: "flatrate"
-      }
-      {
-        cart_address_id: $shippingAddressId
-        carrier_code: "freeshipping"
-        method_code: "freeshipping"
-      }
-    ]
-  }) {
-    cart {
-      shipping_addresses {
-        selected_shipping_method {
-          carrier_code
-          method_code
-          label
-          amount
-        }
-      }
-    } 
-  }
-}
-QUERY;
-        self::expectExceptionMessage('You cannot specify multiple shipping methods.');
-        $this->sendRequestWithToken($query);
-    }
-
-    /**
-     * Generates query for setting the specified shipping method on cart
-     *
-     * @param int $shippingAddressId
-     * @param string $maskedQuoteId
-     * @param string $carrierCode
-     * @param string $methodCode
-     * @return string
-     */
-    private function getQuery(
-        string $maskedQuoteId,
-        int $shippingAddressId,
-        string $carrierCode,
-        string $methodCode
-    ): string {
-        return <<<QUERY
-mutation {
-  setShippingMethodsOnCart(input: {
-    cart_id: "$maskedQuoteId"
-    shipping_methods: [
-      {
-        cart_address_id: $shippingAddressId
-        carrier_code: "$carrierCode"
-        method_code: "$methodCode"
-      }
-    ]
-  }) {
-    cart {
-      shipping_addresses {
-        selected_shipping_method {
-          carrier_code
-          method_code
-          label
-          amount
-        }
-      }
-    } 
-  }
-}        
-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);
-    }
-}

From bd2e5c10d04e37e823c0c3a4917baa6939ff4f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Bajsarowicz?= <lukasz.bajsarowicz@gmail.com>
Date: Fri, 29 Mar 2019 23:01:47 +0000
Subject: [PATCH 0880/1055] PR#21647 Remove another redundant file

---
 .../Test/Mftf/MetaData/url_rewrite-meta.xml    | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml

diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml b/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
deleted file mode 100644
index 0738b17d6e0f0..0000000000000
--- a/app/code/Magento/UrlRewrite/Test/Mftf/MetaData/url_rewrite-meta.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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="CreateUrlRewrite" dataType="urlRewrite" type="create" auth="adminFormKey" url="/admin/url_rewrite/save/" method="POST" successRegex="/messages-message-success/">
-        <field key="store_id">integer</field>
-        <field key="redirect_type">integer</field>
-        <field key="request_path">string</field>
-        <field key="target_path">string</field>
-        <field key="description">string</field>
-    </operation>
-</operations>

From 300e5b46b27a05548e30b33229c483f27dfa1ff2 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 29 Mar 2019 18:07:31 -0500
Subject: [PATCH 0881/1055] GraphQL-502: [Test Coverage] We do not have a
 rollback for Magento/Customer/_files/three_customers.php fixture

---
 .../Magento/Customer/_files/three_customers_rollback.php     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php
index 64330be259fca..8e13c1c25162b 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/three_customers_rollback.php
@@ -32,7 +32,10 @@
         $customer = $customerRepository->get($customerEmail);
         $customerRepository->delete($customer);
     } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-        // not found
+        /**
+         * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+         */
+        continue;
     }
 
     /* Unlock account if it was locked for tokens retrieval */

From 8ab95cffeffee3509cf0e059139ae3c420768512 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 29 Mar 2019 18:12:25 -0500
Subject: [PATCH 0882/1055] GraphQL-527: Category Tree Contains null Leaves

-- fix code style
---
 .../CatalogGraphQl/Model/Category/DepthCalculator.php        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
index 3d30f26be3b61..b5d02511da4e7 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
@@ -26,10 +26,7 @@ public function calculate(FieldNode $fieldNode) : int
         $depth = count($selections) ? 1 : 0;
         $childrenDepth = [0];
         foreach ($selections as $node) {
-            if (
-                $node->kind === 'InlineFragment'
-                || null !== $node->alias
-            ) {
+            if ($node->kind === 'InlineFragment' || null !== $node->alias) {
                 continue;
             }
 

From 2b59efac37e4cdd59eb480e92021fcc7b43bc0c0 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 29 Mar 2019 19:06:32 -0500
Subject: [PATCH 0883/1055] GraphQL-428: Test coverage:
 GetAvailableShippingMethodsTest

-- fix static tests
---
 .../QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php      | 4 ----
 .../GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php  | 3 +++
 .../GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php     | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
index 4104e179160d9..730cf1b0ffee3 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
@@ -7,11 +7,7 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Exception\StateException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
index 8dcba637dc57d..16d085c1d09be 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
@@ -12,6 +12,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
+/**
+ * Test for get selected shipping method
+ */
 class GetSelectedShippingMethodTest extends GraphQlAbstract
 {
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
index e00f79b1a99a0..c31b48ccc1087 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
@@ -11,6 +11,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
+/**
+ * Test for get selected shipping method
+ */
 class GetSelectedShippingMethodTest extends GraphQlAbstract
 {
     /**

From e21b9dc0433cb3c22df8f573a1c8fbe088a5e76c Mon Sep 17 00:00:00 2001
From: "Iskander (Alex) Sharipov" <quasilyte@gmail.com>
Date: Sat, 30 Mar 2019 03:48:39 +0300
Subject: [PATCH 0884/1055] fix strpos args order

---
 .../testsuite/Magento/Analytics/Api/LinkProviderTest.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php b/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
index 6fd7551676660..4bf1335f20667 100644
--- a/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php
@@ -95,6 +95,6 @@ public function testGetAll()
      */
     private function isTestBaseUrlSecure()
     {
-        return strpos('https://', TESTS_BASE_URL) !== false;
+        return strpos(TESTS_BASE_URL, 'https://') !== false;
     }
 }

From f13c1ba7f1647383fa60fed875db969619b2be13 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 29 Mar 2019 21:56:17 -0500
Subject: [PATCH 0885/1055] GraphQL-527: Category Tree Contains null Leaves

-- fix static tests
---
 .../testsuite/Magento/GraphQl/Catalog/CategoryTest.php         | 3 +++
 1 file changed, 3 insertions(+)

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 dc3b348c2706e..b2ce0400f7d83 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -17,6 +17,9 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\TestFramework\ObjectManager;
 
+/**
+ * Test loading of category tree
+ */
 class CategoryTest extends GraphQlAbstract
 {
     /**

From 8d671b20484a35b87224c58031a94dfc5cdc2355 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Sat, 30 Mar 2019 10:23:21 +0530
Subject: [PATCH 0886/1055] Correct spelling

---
 app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
index c75ebc700603b..b117c127dff39 100644
--- a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -88,7 +88,7 @@ public function getMessages()
         $messages = [];
         $quoteItem = $this->getItem();
 
-        // Add basic messages occuring during this page load
+        // Add basic messages occurring during this page load
         $baseMessages = $quoteItem->getMessage(false);
         if ($baseMessages) {
             foreach ($baseMessages as $message) {

From cb015a1dd94ed73623c620fd535e02131d3efb4c Mon Sep 17 00:00:00 2001
From: Ansari <ziyaurrahman@krishtechnolabs.com>
Date: Sat, 30 Mar 2019 11:02:05 +0530
Subject: [PATCH 0887/1055] Spelling Correction

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b86c7b79a0cbd..323116560a7cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -785,7 +785,7 @@ Tests:
     * Refactored controller actions in the Product area
     * Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
 * Data Migration Tool
-    * The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
+    * The Data Migration Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
 * Fixed bugs
     * Fixed an issue where error appeared during placing order with virtual product
     * Fixed an issue where billing and shipping sections didn't contain address information on order print

From 6076fdcd20ebc1b6e9e1f10b5c99ea4e28f46365 Mon Sep 17 00:00:00 2001
From: Jeff Coleman <jeff@jeffcolemanwrites.com>
Date: Sun, 31 Mar 2019 07:10:58 -0700
Subject: [PATCH 0888/1055] Setting initial downloadable item status to
 available if
 \Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS
 is set to 'Pending' (https://github.com/magento/magento2/issues/21753)

---
 .../Observer/SaveDownloadableOrderItemObserver.php         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index 64305cfce9b08..ef763336a6515 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -92,6 +92,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if ($purchasedLink->getId()) {
             return $this;
         }
+        $orderItemStatusToEnable = $this->_scopeConfig->getValue(
+            \Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
+            ScopeInterface::SCOPE_STORE,
+            $orderItem->getOrder()->getStoreId()
+        );
         if (!$product) {
             $product = $this->_createProductModel()->setStoreId(
                 $orderItem->getOrder()->getStoreId()
@@ -150,6 +155,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         )->setNumberOfDownloadsBought(
                             $numberOfDownloads
                         )->setStatus(
+                            1 == $orderItemStatusToEnable ?
+                            \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE :
                             \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING
                         )->setCreatedAt(
                             $orderItem->getCreatedAt()

From d32da36e6cbddc176524ac4b68dc6fb78e1eda90 Mon Sep 17 00:00:00 2001
From: Jeff Coleman <jeff@jeffcolemanwrites.com>
Date: Sun, 31 Mar 2019 08:17:45 -0700
Subject: [PATCH 0889/1055] fix for coding style

---
 .../Observer/SaveDownloadableOrderItemObserver.php            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index ef763336a6515..f2a1e981c2357 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -92,7 +92,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if ($purchasedLink->getId()) {
             return $this;
         }
-        $orderItemStatusToEnable = $this->_scopeConfig->getValue(
+        $statusToEnable = $this->_scopeConfig->getValue(
             \Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
             ScopeInterface::SCOPE_STORE,
             $orderItem->getOrder()->getStoreId()
@@ -155,7 +155,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         )->setNumberOfDownloadsBought(
                             $numberOfDownloads
                         )->setStatus(
-                            1 == $orderItemStatusToEnable ?
+                            1 == $statusToEnable ?
                             \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE :
                             \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING
                         )->setCreatedAt(

From 4ccc97937682e20c7d58a517563ca8e58f4ec7bc Mon Sep 17 00:00:00 2001
From: Valerij Ivashchenko <likemusicdev@gmail.com>
Date: Sun, 31 Mar 2019 18:42:40 +0300
Subject: [PATCH 0890/1055] Add space after asterisk to show as list

On https://devdocs.magento.com/guides/v2.3/mrg/ce/Paypal.html
---
 app/code/Magento/Paypal/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Paypal/README.md b/app/code/Magento/Paypal/README.md
index 8f4453ae0a058..0ed4f2e90291b 100644
--- a/app/code/Magento/Paypal/README.md
+++ b/app/code/Magento/Paypal/README.md
@@ -1,6 +1,6 @@
 Module Magento\PayPal implements integration with the PayPal payment system. Namely, it enables the following payment methods:
-*PayPal Express Checkout
-*PayPal Payments Standard
-*PayPal Payments Pro
-*PayPal Credit
-*PayFlow Payment Gateway
+* PayPal Express Checkout
+* PayPal Payments Standard
+* PayPal Payments Pro
+* PayPal Credit
+* PayFlow Payment Gateway

From 2c166978e48e502ca86c267e07acc075a1720ec7 Mon Sep 17 00:00:00 2001
From: Jeff Coleman <jeff@jeffcolemanwrites.com>
Date: Sun, 31 Mar 2019 15:27:25 -0700
Subject: [PATCH 0891/1055] renamed variable for clarity and used defined
 constant for comparison

---
 .../Observer/SaveDownloadableOrderItemObserver.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index f2a1e981c2357..fb4af4c3443a9 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -92,7 +92,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if ($purchasedLink->getId()) {
             return $this;
         }
-        $statusToEnable = $this->_scopeConfig->getValue(
+        $orderStatusToEnableItem = $this->_scopeConfig->getValue(
             \Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
             ScopeInterface::SCOPE_STORE,
             $orderItem->getOrder()->getStoreId()
@@ -155,10 +155,10 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         )->setNumberOfDownloadsBought(
                             $numberOfDownloads
                         )->setStatus(
-                            1 == $statusToEnable ?
+                            \Magento\Sales\Model\Order\Item::STATUS_PENDING == $orderStatusToEnableItem ?
                             \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE :
                             \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING
-                        )->setCreatedAt(
+                       )->setCreatedAt(
                             $orderItem->getCreatedAt()
                         )->setUpdatedAt(
                             $orderItem->getUpdatedAt()

From d53690cbfe4aeac02d05c2078424698ce1fb7d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20K=C3=B6cke?= <jens@koecke.net>
Date: Mon, 1 Apr 2019 07:21:11 +0200
Subject: [PATCH 0892/1055] Fix unit tests

---
 .../Unit/Console/Command/ConfigSet/DefaultProcessorTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 edb76c067bf35..35b2406b328cb 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
@@ -103,7 +103,7 @@ public function testProcess($path, $value, $scope, $scopeCode)
         $config = $this->createMock(Config::class);
         $this->configFactory->expects($this->once())
             ->method('create')
-            ->with(['scope' => $scope, 'scope_code' => $scopeCode])
+            ->with(['data' => ['scope' => $scope, 'scope_code' => $scopeCode]])
             ->willReturn($config);
         $config->expects($this->once())
             ->method('setDataByPath')

From 81cb7bd14c5843800063564821887cd3f248b704 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 1 Apr 2019 09:32:03 +0300
Subject: [PATCH 0893/1055] MAGETWO-98886: Gift Card Accounts: expiration date
 subtracts one day

---
 .../Magento/Framework/Data/Form/Element/DateTest.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
index a64df0451f9c0..9980f40239f8c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php
@@ -17,7 +17,7 @@ class DateTest extends \PHPUnit\Framework\TestCase
     /**
      * @var ElementFactory
      */
-    protected $_elementFactory;
+    private $elementFactory;
 
     /**
      * @inheritdoc
@@ -25,7 +25,7 @@ class DateTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->_elementFactory = $objectManager->create(ElementFactory::class);
+        $this->elementFactory = $objectManager->create(ElementFactory::class);
     }
 
     /**
@@ -39,7 +39,7 @@ protected function setUp()
     public function testGetValue(array $data, string $expect): void
     {
         /** @var $date Date */
-        $date = $this->_elementFactory->create(Date::class, $data);
+        $date = $this->elementFactory->create(Date::class, $data);
         $this->assertEquals($expect, $date->getValue());
     }
 

From b5b162513843d837292af4111b9fdd5f44cb708d Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 1 Apr 2019 09:54:32 +0300
Subject: [PATCH 0894/1055] MAGETWO-97423: Price column in sales_order_item
 table shows the price including tax when Custom Price is applied on admin
 order

---
 .../Total/Quote/CommonTaxCollectorTest.php    |  4 +-
 .../Tax/Model/Sales/Total/Quote/SetupUtil.php | 58 ++++++++++++++-----
 .../including_tax_with_custom_price.php       |  2 +-
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
index 711ead4625659..50d45ad662bd4 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
@@ -83,7 +83,7 @@ class CommonTaxCollectorTest extends TestCase
     /**
      * @var TaxHelper
      */
-    protected $taxHelper;
+    private $taxHelper;
 
     /**
      * {@inheritdoc}
@@ -152,6 +152,8 @@ protected function setUp()
      * @param bool $useBaseCurrency
      * @param string $shippingTaxClass
      * @param bool $shippingPriceInclTax
+     *
+     * @return void
      * @dataProvider getShippingDataObjectDataProvider
      */
     public function testGetShippingDataObject(
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
index 0ae021b4e9036..985019b687ce0 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
@@ -7,10 +7,15 @@
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Tax\Model\Config;
 use Magento\Tax\Model\Calculation;
 use Magento\Quote\Model\Quote\Item\Updater;
-use \Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\Search\FilterGroup;
+use Magento\Framework\Api\SearchCriteriaInterface;
 
 /**
  * Setup utility for quote
@@ -598,7 +603,7 @@ protected function createCartRule($ruleDataOverride)
      *
      * @param array $quoteData
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-     * @return \Magento\Quote\Model\Quote
+     * @return Quote
      */
     protected function createQuote($quoteData, $customer)
     {
@@ -623,8 +628,8 @@ protected function createQuote($quoteData, $customer)
         $quoteBillingAddress = $this->objectManager->create(\Magento\Quote\Model\Quote\Address::class);
         $quoteBillingAddress->importCustomerAddressData($addressService->getById($billingAddress->getId()));
 
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
         $quote->setStoreId(1)
             ->setIsActive(true)
             ->setIsMultiShipping(false)
@@ -638,7 +643,7 @@ protected function createQuote($quoteData, $customer)
     /**
      * Add products to quote
      *
-     * @param \Magento\Quote\Model\Quote $quote
+     * @param Quote $quote
      * @param array $itemsData
      * @return $this
      */
@@ -661,7 +666,8 @@ protected function addProductToQuote($quote, $itemsData)
      * Create a quote based on given data
      *
      * @param array $quoteData
-     * @return \Magento\Quote\Model\Quote
+     *
+     * @return Quote
      */
     public function setupQuote($quoteData)
     {
@@ -671,16 +677,7 @@ public function setupQuote($quoteData)
 
         $this->addProductToQuote($quote, $quoteData['items']);
         if (isset($quoteData['update_items'])) {
-            $updater = $this->objectManager->get(Updater::class);
-            $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-            foreach ($quoteData['update_items'] as $sku => $updateItem) {
-                $product = $productRepository->get($sku);
-                $quoteItem = $quote->getItemByProduct($product);
-                $updater->update(
-                    $quoteItem,
-                    $updateItem
-                );
-            }
+            $this->updateItems($quote, $quoteData['update_items']);
         }
         //Set shipping amount
         if (isset($quoteData['shipping_method'])) {
@@ -698,4 +695,33 @@ public function setupQuote($quoteData)
 
         return $quote;
     }
+
+    /**
+     * Update quote items
+     *
+     * @param Quote $quote
+     * @param array $items
+     *
+     * @return void
+     */
+    private function updateItems(Quote $quote, array $items): void
+    {
+        $updater = $this->objectManager->get(Updater::class);
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $filter = $this->objectManager->create(Filter::class);
+        $filter->setField('sku')->setValue(array_keys($items));
+        $filterGroup = $this->objectManager->create(FilterGroup::class);
+        $filterGroup->setFilters([$filter]);
+        $searchCriteria = $this->objectManager->create(SearchCriteriaInterface::class);
+        $searchCriteria->setFilterGroups([$filterGroup]);
+        $products = $productRepository->getList($searchCriteria)->getItems();
+        /** @var ProductInterface $product */
+        foreach ($products as $product) {
+            $quoteItem = $quote->getItemByProduct($product);
+            $updater->update(
+                $quoteItem,
+                $items[$product->getSku()]
+            );
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php
index 584b356beb53b..290c133f455f6 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php
@@ -12,7 +12,7 @@
     'config_data' => [
         SetupUtil::CONFIG_OVERRIDES => [
             Config::CONFIG_XML_PATH_PRICE_INCLUDES_TAX => 1,
-            Config::CONFIG_XML_PATH_APPLY_ON => 0
+            Config::CONFIG_XML_PATH_APPLY_ON => 0,
         ],
         SetupUtil::TAX_RATE_OVERRIDES => [
             SetupUtil::TAX_RATE_TX => 8.25,

From 223d8efc62bed0ec5b42e027bb94bacfa38087c4 Mon Sep 17 00:00:00 2001
From: Nazarn96 <nazarn96@gmail.com>
Date: Mon, 1 Apr 2019 11:51:09 +0300
Subject: [PATCH 0895/1055] fix-issue-20186

---
 .../Magento/Sniffs/Annotation/AnnotationFormatValidator.php | 4 ++--
 .../Sniffs/Annotation/ClassAnnotationStructureSniff.php     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
index 49acd039a0960..3f477f7ce5033 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
@@ -301,8 +301,8 @@ public function validateDescriptionFormatStructure(
                 $this->validateShortDescriptionFormat(
                     $phpcsFile,
                     (int) $shortPtr,
-                    $commentStartPtr,
-                    $commentEndPtr,
+                    (int)$commentStartPtr,
+                    (int)$commentEndPtr,
                     $emptyTypeTokens
                 );
             }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php
index 01834ff81e81b..c37f0b500fe39 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php
@@ -97,8 +97,8 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr - 1, 0);
-        $this->validateAnnotationBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr);
-        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0);
+        $this->validateAnnotationBlockExists($phpcsFile, (int)$previousCommentClosePtr, (int)$stackPtr);
+        $commentStartPtr = (int)$phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0);
         $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
         $emptyTypeTokens = [
             T_DOC_COMMENT_WHITESPACE,
@@ -111,7 +111,7 @@ public function process(File $phpcsFile, $stackPtr)
         } else {
             $this->annotationFormatValidator->validateDescriptionFormatStructure(
                 $phpcsFile,
-                $commentStartPtr,
+                (int)$commentStartPtr,
                 (int) $shortPtr,
                 $previousCommentClosePtr,
                 $emptyTypeTokens

From f2faf154dddbcf5217dcc35fdac13f410ed8fe0d Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 1 Apr 2019 12:05:50 +0300
Subject: [PATCH 0896/1055] MAGETWO-97423: Price column in sales_order_item
 table shows the price including tax when Custom Price is applied on admin
 order

---
 .../Tax/Model/Sales/Total/Quote/CommonTaxCollector.php        | 4 ++--
 .../Magento/Tax/_files/tax_calculation_data_aggregated.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index 31d5deb7ea0d5..77b3cfa3a08bb 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -348,7 +348,7 @@ public function mapItems(
         $useBaseCurrency
     ) {
         $items = $shippingAssignment->getItems();
-        if (!count($items)) {
+        if (empty($items)) {
             return [];
         }
 
@@ -478,7 +478,7 @@ protected function prepareQuoteDetails(ShippingAssignmentInterface $shippingAssi
     {
         $items = $shippingAssignment->getItems();
         $address = $shippingAssignment->getShipping()->getAddress();
-        if (!count($items)) {
+        if (empty($items)) {
             return $this->quoteDetailsDataObjectFactory->create();
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
index cdc3b7d135d1d..3c56b1bf815a6 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
@@ -6,12 +6,12 @@
 declare(strict_types=1);
 
 /**
- * Global array that holds test scenarios data
+ * Global array that holds test scenarios data.
  *
  * @var array
  */
 $taxCalculationData = [];
-
+//phpcs:disable Magento2.Security.IncludeFile
 require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_after_discount.php';
 require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_after_discount_discount_tax.php';
 require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_before_discount.php';

From 00cda03062be31d31fe9c4ed1a43242baa1d77d1 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Mon, 1 Apr 2019 12:30:31 +0300
Subject: [PATCH 0897/1055] magento/graphql-ce#480: [Test Coverage]
 'GetBillingAddress' functionality

---
 .../Quote/Customer/GetBillingAddressTest.php  |  7 +--
 .../Quote/Guest/GetBillingAddressTest.php     | 19 ++++----
 .../Quote/_files/set_new_billing_address.php  | 44 +++++++++++++++++++
 .../_files/guest_quote_with_addresses.php     |  5 ++-
 .../guest_quote_with_addresses_rollback.php   |  2 +-
 5 files changed, 64 insertions(+), 13 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
index 7067a32dbb62d..18e33b1b6294b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
@@ -53,10 +53,11 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
      */
     public function testGetCartWithBillingAddress()
     {
@@ -91,7 +92,7 @@ public function testGetCartWithBillingAddress()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -111,7 +112,7 @@ public function testGetBillingAddressFromAnotherCustomerCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
index ec8bd398c51d1..a8a577e3c9288 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
@@ -46,10 +46,11 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
      */
     public function testGetCartWithBillingAddress()
     {
@@ -59,21 +60,21 @@ public function testGetCartWithBillingAddress()
         $expectedBillingAddressData = [
             'firstname' => 'John',
             'lastname' => 'Smith',
-            'company' => null,
+            'company' => 'CompanyName',
             'street' => [
-                'Black str, 48'
+                'Green str, 67'
             ],
-            'city' => 'CityX',
+            'city' => 'CityM',
             'region' => [
                 'code' => 'AL',
                 'label' => 'Alabama',
             ],
-            'postcode' => '47676',
+            'postcode' => '75477',
             'country' => [
                 'code' => 'US',
                 'label' => 'US',
             ],
-            'telephone' => '3234676',
+            'telephone' => '3468676',
             'address_type' => 'BILLING',
         ];
 
@@ -82,10 +83,11 @@ public function testGetCartWithBillingAddress()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
      */
     public function testGetBillingAddressFromAnotherCustomerCart()
     {
@@ -100,9 +102,10 @@ public function testGetBillingAddressFromAnotherCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
     public function testGetBillingAddressIfBillingAddressIsNotSet()
     {
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php
new file mode 100644
index 0000000000000..2e15ef218d0c5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_billing_address.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\BillingAddressManagementInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var AddressInterfaceFactory $quoteAddressFactory */
+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var BillingAddressManagementInterface $billingAddressManagement */
+$billingAddressManagement = Bootstrap::getObjectManager()->get(BillingAddressManagementInterface::class);
+
+$quoteAddressData = [
+    AddressInterface::KEY_TELEPHONE => 3468676,
+    AddressInterface::KEY_POSTCODE => 75477,
+    AddressInterface::KEY_COUNTRY_ID => 'US',
+    AddressInterface::KEY_CITY => 'CityM',
+    AddressInterface::KEY_COMPANY => 'CompanyName',
+    AddressInterface::KEY_STREET => 'Green str, 67',
+    AddressInterface::KEY_LASTNAME => 'Smith',
+    AddressInterface::KEY_FIRSTNAME => 'John',
+    AddressInterface::KEY_REGION_ID => 1,
+];
+$quoteAddress = $quoteAddressFactory->create();
+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$billingAddressManagement->assign($quote->getId(), $quoteAddress);
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
index 850e51bb2b5d4..1d03170d5b1e2 100644
--- 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
@@ -5,12 +5,15 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
 require __DIR__ . '/address_list.php';
 
 \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 
 /** @var \Magento\Catalog\Model\Product $product */
 $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
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
index 40314b84154c4..fd1f20b90b535 100644
--- 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
@@ -25,7 +25,7 @@
 }
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
 try {
     $product = $productRepository->get('simple-product-guest-quote', false, null, true);

From 660f1fc4cf068bd10873197b1cec57f673931484 Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Mon, 1 Apr 2019 12:33:53 +0300
Subject: [PATCH 0898/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 ...AdminCreateApiBundleProductActionGroup.xml |  58 ++++++++++
 ...rontCheckBundleProductOptionTierPrices.xml | 102 +++++-------------
 .../DataProviders/OptionPriceRendererTest.php |  39 +++++--
 .../product_with_simple_tier_pricing.php      |  23 ++--
 4 files changed, 128 insertions(+), 94 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
index ad9a8253e910c..4cd16320d3d78 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
@@ -106,4 +106,62 @@
             <requiredEntity createDataKey="simpleProduct4"/>
         </createData>
     </actionGroup>
+    <actionGroup name="AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup">
+        <arguments>
+            <argument name="productName" defaultValue="Api Dynamic Bundle Product" type="string"/>
+        </arguments>
+        <!-- Create simple products -->
+        <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+            <field key="price">10</field>
+        </createData>
+        <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <field key="price">20</field>
+        </createData>
+        <!-- Create Bundle product -->
+        <createData entity="ApiBundleProduct" stepKey="createBundleProduct">
+            <field key="name">{{productName}}</field>
+        </createData>
+        <createData entity="DropDownBundleOption" stepKey="createDropDownBundleOption">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <field key="title">Drop-down Option</field>
+        </createData>
+        <createData entity="RadioButtonsOption" stepKey="createBundleRadioButtonsOption">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <field key="title">Radio Buttons Option</field>
+        </createData>
+        <createData entity="CheckboxOption" stepKey="createBundleCheckboxOption">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <field key="title">Checkbox Option</field>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct1">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleCheckboxOption"/>
+            <requiredEntity createDataKey="simpleProduct1"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleCheckboxOption"/>
+            <requiredEntity createDataKey="simpleProduct2"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct1">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createDropDownBundleOption"/>
+            <requiredEntity createDataKey="simpleProduct1"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createDropDownBundleOption"/>
+            <requiredEntity createDataKey="simpleProduct2"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct1">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
+            <requiredEntity createDataKey="simpleProduct1"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
+            <requiredEntity createDataKey="simpleProduct2"/>
+        </createData>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
index 23d70c978ecd8..4c39cbc4ab0a4 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
@@ -14,137 +14,91 @@
             <stories value="View bundle products"/>
             <title value="Check tier prices for bundle options"/>
             <testCaseId value="MAGETWO-98968"/>
+            <useCaseId value="MAGETWO-98603"/>
+            <group value="catalog"/>
             <group value="bundle"/>
         </annotations>
         <before>
-            <!-- Create simple products -->
-            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
-                <field key="price">10</field>
-            </createData>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
-                <field key="price">20</field>
-            </createData>
+            <!-- Create Dynamic Bundle product -->
+            <actionGroup ref="AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup" stepKey="createBundleProduct"/>
 
             <!-- Add tier prices to simple products -->
+            <!-- Simple product 1 -->
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct1.id$$)}}" stepKey="openAdminEditPageProduct1"/>
+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct1CreateBundleProduct.id$$)}}" stepKey="openAdminEditPageProduct1"/>
             <actionGroup ref="ProductSetAdvancedPricing" stepKey="addTierPriceProduct1">
                 <argument name="group" value="ALL GROUPS"/>
                 <argument name="quantity" value="5"/>
                 <argument name="price" value="Discount"/>
                 <argument name="amount" value="50"/>
             </actionGroup>
-
-            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct2.id$$)}}" stepKey="openAdminEditPageProduct2"/>
+            <!-- Simple product 2 -->
+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct2CreateBundleProduct.id$$)}}" stepKey="openAdminEditPageProduct2"/>
             <actionGroup ref="ProductSetAdvancedPricing" stepKey="addTierPriceProduct2">
                 <argument name="group" value="ALL GROUPS"/>
                 <argument name="quantity" value="7"/>
                 <argument name="price" value="Discount"/>
                 <argument name="amount" value="25"/>
             </actionGroup>
+            <actionGroup ref="logout" stepKey="logoutAsAdmin"/>
 
-            <!-- Create Bundle product -->
-            <createData entity="ApiBundleProduct" stepKey="createBundleProduct"/>
-            <createData entity="DropDownBundleOption" stepKey="createDropDownBundleOption">
-                <requiredEntity createDataKey="createBundleProduct"/>
-                <field key="title">Drop-down Option</field>
-            </createData>
-            <createData entity="RadioButtonsOption" stepKey="createBundleRadioButtonsOption">
-                <requiredEntity createDataKey="createBundleProduct"/>
-                <field key="title">Radio Buttons Option</field>
-            </createData>
-            <createData entity="CheckboxOption" stepKey="createBundleCheckboxOption">
-                <requiredEntity createDataKey="createBundleProduct"/>
-                <field key="title">Checkbox Option</field>
-            </createData>
-            <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct1">
-                <requiredEntity createDataKey="createBundleProduct"/>
-                <requiredEntity createDataKey="createBundleCheckboxOption"/>
-                <requiredEntity createDataKey="simpleProduct1"/>
-            </createData>
-            <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct2">
-                <requiredEntity createDataKey="createBundleProduct"/>
-                <requiredEntity createDataKey="createBundleCheckboxOption"/>
-                <requiredEntity createDataKey="simpleProduct2"/>
-            </createData>
-            <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct1">
-                <requiredEntity createDataKey="createBundleProduct"/>
-                <requiredEntity createDataKey="createDropDownBundleOption"/>
-                <requiredEntity createDataKey="simpleProduct1"/>
-            </createData>
-            <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct2">
-                <requiredEntity createDataKey="createBundleProduct"/>
-                <requiredEntity createDataKey="createDropDownBundleOption"/>
-                <requiredEntity createDataKey="simpleProduct2"/>
-            </createData>
-            <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct1">
-                <requiredEntity createDataKey="createBundleProduct"/>
-                <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
-                <requiredEntity createDataKey="simpleProduct1"/>
-            </createData>
-            <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct2">
-                <requiredEntity createDataKey="createBundleProduct"/>
-                <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
-                <requiredEntity createDataKey="simpleProduct2"/>
-            </createData>
-
+            <!-- Run reindex -->
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         </before>
         <after>
-            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
+            <deleteData createDataKey="createBundleProductCreateBundleProduct" stepKey="deleteDynamicBundleProduct"/>
+            <deleteData createDataKey="simpleProduct1CreateBundleProduct" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2CreateBundleProduct" stepKey="deleteSimpleProduct2"/>
         </after>
 
         <!-- Go to storefront product page -->
-        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct.custom_attributes[url_key]$$)}}" stepKey="onPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProductCreateBundleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToBundleProductPage"/>
         <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
 
         <!--"Drop-down" type option-->
         <!-- Check Tier Prices for product 1 -->
-        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="selectDropDownOptionProduct1"/>
-        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1.sku$$ +$$$simpleProduct1.price$$.00" stepKey="checkDropDownOptionProduct1"/>
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct1"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct1"/>
         <grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="DropDownTierPriceTextProduct1"/>
         <assertContains stepKey="assertDropDownTierPriceTextProduct1">
             <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
             <actualResult type="variable">DropDownTierPriceTextProduct1</actualResult>
         </assertContains>
         <!-- Check Tier Prices for product 2 -->
-        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="selectDropDownOptionProduct2"/>
-        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2.sku$$ +$$$simpleProduct2.price$$.00" stepKey="checkDropDownOptionProduct2"/>
-        <grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="DropDownTierPriceTextProduct2"/>
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct2"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionOneProducts('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct2"/>
+        <grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="dropDownTierPriceTextProduct2"/>
         <assertContains stepKey="assertDropDownTierPriceTextProduct2">
             <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
-            <actualResult type="variable">DropDownTierPriceTextProduct2</actualResult>
+            <actualResult type="variable">dropDownTierPriceTextProduct2</actualResult>
         </assertContains>
 
         <!--"Radio Buttons" type option-->
         <!-- Check Tier Prices for product 1 -->
-        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct1.sku$$')}}" stepKey="RadioButtonsOptionTierPriceTextProduct1"/>
+        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct1"/>
         <assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct1">
             <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
-            <actualResult type="variable">RadioButtonsOptionTierPriceTextProduct1</actualResult>
+            <actualResult type="variable">radioButtonsOptionTierPriceTextProduct1</actualResult>
         </assertContains>
         <!-- Check Tier Prices for product 2 -->
-        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct2.sku$$')}}" stepKey="RadioButtonsOptionTierPriceTextProduct2"/>
+        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct2"/>
         <assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct2">
             <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
-            <actualResult type="variable">RadioButtonsOptionTierPriceTextProduct2</actualResult>
+            <actualResult type="variable">radioButtonsOptionTierPriceTextProduct2</actualResult>
         </assertContains>
 
         <!--"Checkbox" type option-->
         <!-- Check Tier Prices for product 1 -->
-        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct1.sku$$')}}" stepKey="CheckBoxOptionTierPriceTextProduct1"/>
+        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct1"/>
         <assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct1">
             <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
-            <actualResult type="variable">CheckBoxOptionTierPriceTextProduct1</actualResult>
+            <actualResult type="variable">checkBoxOptionTierPriceTextProduct1</actualResult>
         </assertContains>
         <!-- Check Tier Prices for product 2 -->
-        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct2.sku$$')}}" stepKey="CheckBoxOptionTierPriceTextProduct2"/>
+        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct2"/>
         <assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct2">
             <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
-            <actualResult type="variable">CheckBoxOptionTierPriceTextProduct2</actualResult>
+            <actualResult type="variable">checkBoxOptionTierPriceTextProduct2</actualResult>
         </assertContains>
     </test>
 </tests>
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
index 657803fbb3e2b..320ed7888e8c6 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
@@ -48,26 +48,45 @@ protected function setUp()
         );
     }
 
-    public function testRenderTierPrice()
+    /**
+     * Test to render Tier price html
+     *
+     * @param bool $priceRenderExist
+     * @param string $expectedHtml
+     * @dataProvider renderTierPriceDataProvider
+     */
+    public function testRenderTierPrice(bool $priceRenderExist, string $expectedHtml): void
     {
-        $tierPriceHtml = 'tier price html';
+        $priceRenderer = false;
         $expectedArguments = ['zone' => Render::ZONE_ITEM_OPTION];
-
         $productMock = $this->createMock(Product::class);
-        $blockMock = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
-        $blockMock->expects($this->once())
-            ->method('render')
-            ->with('tier_price', $productMock, $expectedArguments)
-        ->willReturn($tierPriceHtml);
+
+        if ($priceRenderExist) {
+            $priceRenderer = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
+            $priceRenderer->expects($this->once())
+                ->method('render')
+                ->with('tier_price', $productMock, $expectedArguments)
+                ->willReturn($expectedHtml);
+        }
 
         $this->layoutMock->method('getBlock')
             ->with('product.price.render.default')
-            ->willReturn($blockMock);
+            ->willReturn($priceRenderer);
 
         $this->assertEquals(
-            $tierPriceHtml,
+            $expectedHtml,
             $this->renderer->renderTierPrice($productMock),
             'Render Tier price is wrong'
         );
     }
+
+    /**
+     * Data provider for test to render Tier price
+     *
+     * @return array
+     */
+    public function renderTierPriceDataProvider(): array
+    {
+        return [[true, 'tier price html'], [false, '']];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
index b97c1f0208b40..30f0978480701 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
@@ -7,13 +7,11 @@
 
 require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
 
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-$simpleProduct = $productRepository->get('simple');
-
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->setTypeId('bundle')
+/** @var $productFactory Magento\Catalog\Model\ProductFactory */
+$productFactory = $objectManager->create(\Magento\Catalog\Model\ProductFactory::class);
+/** @var $bundleProduct \Magento\Catalog\Model\Product */
+$bundleProduct = $productFactory->create();
+$bundleProduct->setTypeId('bundle')
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([1])
     ->setPriceType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC)
@@ -22,7 +20,12 @@
     ->setSku('bundle-product')
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 100,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+    ])
     ->setBundleOptionsData(
         [
             [
@@ -35,6 +38,6 @@
         ]
     )
     ->setBundleSelectionsData(
-        [[['product_id' => $simpleProduct->getId(), 'selection_qty' => 1, 'delete' => '']]]
+        [[['product_id' => $product->getId(), 'selection_qty' => 1, 'delete' => '']]]
     );
-$productRepository->save($product);
+$productRepository->save($bundleProduct);

From 412a51d3ae7dde247c35398908fb2e227a7135de Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 1 Apr 2019 12:55:16 +0300
Subject: [PATCH 0899/1055] magento/magento2#21896: Static test fix.

---
 .../Magento/Contact/view/frontend/web/css/source/_module.less | 4 ++--
 1 file changed, 2 insertions(+), 2 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 a9454bb6be253..d79806eecbe9b 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
@@ -22,8 +22,8 @@
 }
 
 //
-// Desktop
-// _____________________________________________
+//  Desktop
+//  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .contact-index-index .column:not(.sidebar-additional) .form.contact {

From e630b106cc0ae2c609fb2310a2317f35634abc9e Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Mon, 1 Apr 2019 13:55:43 +0300
Subject: [PATCH 0900/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 .../Magento/Bundle/_files/product_with_simple_tier_pricing.php  | 2 +-
 .../Bundle/_files/product_with_simple_tier_pricing_rollback.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
index 30f0978480701..be0f32bdb4cbd 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+include __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
 
 /** @var $productFactory Magento\Catalog\Model\ProductFactory */
 $productFactory = $objectManager->create(\Magento\Catalog\Model\ProductFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
index aa661c7412d42..6fc56281685aa 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
+include __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
 
 /** @var \Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);

From f265584f334f2392c996b3f02308a562f84e4dfb Mon Sep 17 00:00:00 2001
From: Ievgenii Gryshkun <i.gryshkun@gmail.com>
Date: Mon, 1 Apr 2019 14:47:51 +0300
Subject: [PATCH 0901/1055] Tests data rollback

---
 .../GraphQl/Customer/CreateCustomerTest.php   | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

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 317c0d5d3e3e2..7a11f0a467088 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -24,11 +24,6 @@ class CreateCustomerTest extends GraphQlAbstract
      */
     private $customerRepository;
 
-    /**
-     * @var null|string
-     */
-    private $customerRandomEmail = null;
-
     protected function setUp()
     {
         parent::setUp();
@@ -45,7 +40,7 @@ public function testCreateCustomerAccountWithPassword()
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
         $currentPassword = 'test123#';
-        $this->customerRandomEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+        $newEmail = 'customer_created_random123@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -53,7 +48,7 @@ public function testCreateCustomerAccountWithPassword()
         input: {
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
-            email: "{$this->customerRandomEmail}"
+            email: "{$newEmail}"
             password: "{$currentPassword}"
           	is_subscribed: true
         }
@@ -72,7 +67,7 @@ public function testCreateCustomerAccountWithPassword()
 
         $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
         $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
-        $this->assertEquals($this->customerRandomEmail, $response['createCustomer']['customer']['email']);
+        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
         $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
     }
 
@@ -83,7 +78,7 @@ public function testCreateCustomerAccountWithoutPassword()
     {
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
-        $this->customerRandomEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+        $newEmail = 'customer_created_random123@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -91,7 +86,7 @@ public function testCreateCustomerAccountWithoutPassword()
         input: {
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
-            email: "{$this->customerRandomEmail}"
+            email: "{$newEmail}"
           	is_subscribed: true
         }
     ) {
@@ -109,7 +104,7 @@ public function testCreateCustomerAccountWithoutPassword()
 
         $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
         $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
-        $this->assertEquals($this->customerRandomEmail, $response['createCustomer']['customer']['email']);
+        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
         $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
     }
 
@@ -216,7 +211,7 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
         $currentPassword = 'test123#';
-        $newEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+        $newEmail = 'customer_created_random123@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -245,17 +240,21 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
 
     public function tearDown()
     {
-        if ($this->customerRandomEmail !== null) {
-            $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-            $registry->unregister('isSecureArea');
-            $registry->register('isSecureArea', true);
-            $customer = $this->customerRepository->get($this->customerRandomEmail);
-            if (isset($customer) && $customer->getId()) {
-                $this->customerRepository->delete($customer);
-            }
-            $registry->unregister('isSecureArea');
-            $registry->register('isSecureArea', false);
+        $newEmail = 'customer_created_random123@example.com';
+        try {
+            $customer = $this->customerRepository->get($newEmail);
+
+        } catch (\Exception $exception) {
+            return false;
+        }
+        $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+        if (isset($customer) && $customer->getId()) {
+            $this->customerRepository->delete($customer);
         }
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
         parent::tearDown();
     }
 }

From 4a70baf3f6d68b0f6a2bee884a1f32a775a93c9a Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Mon, 1 Apr 2019 15:05:55 +0300
Subject: [PATCH 0902/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 .../DataProviders/OptionPriceRendererTest.php | 39 +++++++++++--------
 .../product_with_simple_tier_pricing.php      |  2 +-
 ...duct_with_simple_tier_pricing_rollback.php |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
index 320ed7888e8c6..1af73bafc6256 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
@@ -51,23 +51,20 @@ protected function setUp()
     /**
      * Test to render Tier price html
      *
-     * @param bool $priceRenderExist
-     * @param string $expectedHtml
-     * @dataProvider renderTierPriceDataProvider
+     * @return void
      */
-    public function testRenderTierPrice(bool $priceRenderExist, string $expectedHtml): void
+    public function testRenderTierPrice(): void
     {
-        $priceRenderer = false;
+        $expectedHtml = 'tier price html';
         $expectedArguments = ['zone' => Render::ZONE_ITEM_OPTION];
+
         $productMock = $this->createMock(Product::class);
 
-        if ($priceRenderExist) {
-            $priceRenderer = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
-            $priceRenderer->expects($this->once())
-                ->method('render')
-                ->with('tier_price', $productMock, $expectedArguments)
-                ->willReturn($expectedHtml);
-        }
+        $priceRenderer = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
+        $priceRenderer->expects($this->once())
+            ->method('render')
+            ->with('tier_price', $productMock, $expectedArguments)
+            ->willReturn($expectedHtml);
 
         $this->layoutMock->method('getBlock')
             ->with('product.price.render.default')
@@ -81,12 +78,22 @@ public function testRenderTierPrice(bool $priceRenderExist, string $expectedHtml
     }
 
     /**
-     * Data provider for test to render Tier price
+     * Test to render Tier price html when render block is not exists
      *
-     * @return array
+     * @return void
      */
-    public function renderTierPriceDataProvider(): array
+    public function testRenderTierPriceNotExist(): void
     {
-        return [[true, 'tier price html'], [false, '']];
+        $productMock = $this->createMock(Product::class);
+
+        $this->layoutMock->method('getBlock')
+            ->with('product.price.render.default')
+            ->willReturn(false);
+
+        $this->assertEquals(
+            '',
+            $this->renderer->renderTierPrice($productMock),
+            'Render Tier price is wrong'
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
index be0f32bdb4cbd..30f0978480701 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-include __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
 
 /** @var $productFactory Magento\Catalog\Model\ProductFactory */
 $productFactory = $objectManager->create(\Magento\Catalog\Model\ProductFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
index 6fc56281685aa..aa661c7412d42 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-include __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
 
 /** @var \Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);

From 5dd5e3acd8e4d0fc004537effebe6dbd17da5ebb Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Mon, 1 Apr 2019 15:29:04 +0300
Subject: [PATCH 0903/1055] magento/graphql-ce#540: Replace deprecated
 Magento/Checkout/_files/quote_with_address_saved.php fixture in
 SetUpsShippingMethodsOnCartTest

---
 .../Ups/SetUpsShippingMethodsOnCartTest.php   | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index 33f0d4c406020..9ad47319cac1a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -7,9 +7,9 @@
 
 namespace Magento\GraphQl\Ups;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -30,9 +30,9 @@ class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
     const CARRIER_METHOD_CODE_GROUND = 'GND';
 
     /**
-     * @var QuoteFactory
+     * @var Quote
      */
-    private $quoteFactory;
+    private $quote;
 
     /**
      * @var CustomerTokenServiceInterface
@@ -40,14 +40,9 @@ class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @inheritdoc
@@ -55,15 +50,14 @@ class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->quote = $objectManager->create(Quote::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -71,9 +65,9 @@ protected function setUp()
      */
     public function testSetUpsShippingMethod()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $quoteReservedId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
+        $quote = $this->quote->load($quoteReservedId, 'reserved_order_id');
         $shippingAddressId = (int)$quote->getShippingAddress()->getId();
 
         $query = $this->getAddUpsShippingMethodQuery(

From 785d826da1bc42683dae3035a5e6c07d7e9813f3 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 1 Apr 2019 16:09:13 +0300
Subject: [PATCH 0904/1055] magento/magento2#19987: Static test fix.

---
 app/code/Magento/Widget/Model/Widget.php        | 14 +++++---------
 app/code/Magento/Widget/Model/Widget/Config.php |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index 5cfbfbf9cdf41..af038b8876987 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -248,17 +248,13 @@ public function getWidgets($filters = [])
         $result = $widgets;
 
         // filter widgets by params
-        if (is_array($filters) && count($filters) > 0) {
+        if (is_array($filters) && !empty($filters)) {
             foreach ($widgets as $code => $widget) {
-                try {
-                    foreach ($filters as $field => $value) {
-                        if (!isset($widget[$field]) || (string)$widget[$field] != $value) {
-                            throw new \Exception();
-                        }
+                foreach ($filters as $field => $value) {
+                    if (!isset($widget[$field]) || (string)$widget[$field] != $value) {
+                        unset($result[$code]);
+                        break;
                     }
-                } catch (\Exception $e) {
-                    unset($result[$code]);
-                    continue;
                 }
             }
         }
diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
index b259d4e6224be..00b055b35a69d 100644
--- a/app/code/Magento/Widget/Model/Widget/Config.php
+++ b/app/code/Magento/Widget/Model/Widget/Config.php
@@ -159,7 +159,7 @@ public function getWidgetWindowUrl($config)
             }
         }
 
-        if (count($skipped) > 0) {
+        if (!empty($skipped)) {
             $params['skip_widgets'] = $this->encodeWidgetsToQuery($skipped);
         }
         return $this->_backendUrl->getUrl('adminhtml/widget/index', $params);

From a7f03dd4f2ec0927e913c753a9b178394b5cd542 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 1 Apr 2019 16:30:18 +0300
Subject: [PATCH 0905/1055] magento/magento2#21083: Static test fix.

---
 .../ConfigurableProduct/Model/LinkManagement.php       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
index 06b49d356c5ee..75cab12f63562 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,6 +10,9 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 
+/**
+ * Configurable product link management.
+ */
 class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementInterface
 {
     /**
@@ -68,7 +70,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getChildren($sku)
     {
@@ -107,7 +109,7 @@ public function getChildren($sku)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addChild($sku, $childSku)
     {
@@ -150,7 +152,7 @@ public function addChild($sku, $childSku)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function removeChild($sku, $childSku)
     {

From 54818de0b2d4a2ef0564babe1c2a2f79ab2e6c23 Mon Sep 17 00:00:00 2001
From: Aliaksei Yakimovich2 <aliaksei_yakimovich2@epam.com>
Date: Mon, 1 Apr 2019 17:03:46 +0300
Subject: [PATCH 0906/1055] MAGETWO-64838: Unable to create order from store
 front if customer address custom attribute is required.

- Code refactoring;
- Fixed static tests;
---
 .../Magento/Framework/Webapi/ServiceInputProcessor.php     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index f8fe514903ea8..f93d7efda5c8a 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -146,7 +146,6 @@ private function getNameFinder()
      * @param string $serviceMethodName name of the method that we are trying to call
      * @param array $inputArray data to send to method in key-value format
      * @return array list of parameters that can be used to call the service method
-     * @throws InputException if no value is provided for required parameters
      * @throws WebapiException
      */
     public function process($serviceClassName, $serviceMethodName, array $inputArray)
@@ -230,6 +229,7 @@ private function getConstructorData(string $className, array $data): array
      * @param array $data
      * @return object the newly created and populated object
      * @throws \Exception
+     * @throws SerializationException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _createFromArray($className, $data)
@@ -365,10 +365,10 @@ private function getAttributesPreprocessorsMap(): array
     /**
      * Prepare attribute value by loaded attribute preprocessors
      *
-     * @param string $key
+     * @param mixed $key
      * @param mixed $customAttribute
      */
-    private function runCustomAttributePreprocessors(string $key, &$customAttribute)
+    private function runCustomAttributePreprocessors($key, &$customAttribute)
     {
         $preprocessorsMap = $this->getAttributesPreprocessorsMap();
         if ($key && is_array($customAttribute) && array_key_exists($key, $preprocessorsMap)) {
@@ -386,6 +386,7 @@ private function runCustomAttributePreprocessors(string $key, &$customAttribute)
      *
      * @param string[] $customAttribute
      * @return string[]
+     * @throws SerializationException
      */
     private function processCustomAttribute($customAttribute)
     {

From 9a0dda1a545287f81e2fd75eb52cfec3aee628e9 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Mon, 1 Apr 2019 09:24:56 -0500
Subject: [PATCH 0907/1055] MC-5421: Create test to check dependencies between
 modules in Declarative Schema

---
 .../static/testsuite/Magento/Test/Integrity/DependencyTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index 35819ff212954..9c03802602938 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -392,7 +392,7 @@ protected function getDependenciesFromFiles($module, $fileType, $file, $contents
      */
     protected function _collectDependencies($currentModuleName, $dependencies = [])
     {
-        if (!count($dependencies)) {
+        if (empty($dependencies)) {
             return [];
         }
         $undeclared = [];

From b00402dee226e2a1bc463813b1d3c27b1acbf937 Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Mon, 1 Apr 2019 17:53:05 +0300
Subject: [PATCH 0908/1055] Fixed assignment of the guest customer to the guest
 group. This commit fixes the case when guest fills in valid VAT number, then
 returns to the shipping step and removes VAT from the address.

---
 .../Observer/Frontend/Quote/Address/CollectTotalsObserver.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
index 76c9a49b290c5..b5e3f4ae1887b 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
@@ -124,7 +124,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             );
         }
 
-        if ($groupId) {
+        if ($groupId !== null) {
             $address->setPrevQuoteCustomerGroupId($quote->getCustomerGroupId());
             $quote->setCustomerGroupId($groupId);
             $this->customerSession->setCustomerGroupId($groupId);

From fde1788926782f91da6074aa98f7128f3553c0a6 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Mon, 1 Apr 2019 18:18:49 +0300
Subject: [PATCH 0909/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Fix static
---
 .../Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php      | 2 ++
 .../Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php      | 2 ++
 .../Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
index 64e569977429c..48934e24a3795 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Creditmemo/DefaultCreditmemo.php
@@ -70,6 +70,7 @@ public function draw()
         // draw Product name
         $lines[0] = [
             [
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
                 'feed' => 35
             ]
@@ -77,6 +78,7 @@ public function draw()
 
         // draw SKU
         $lines[0][] = [
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
             'feed' => 255,
             'align' => 'right',
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 4a77053521e4a..23c2c00daadc3 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
@@ -70,6 +70,7 @@ public function draw()
         // draw Product name
         $lines[0] = [
             [
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 'text' => $this->string->split(html_entity_decode($item->getName()), 35, true, true),
                 'feed' => 35
             ]
@@ -77,6 +78,7 @@ public function draw()
 
         // draw SKU
         $lines[0][] = [
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             'text' => $this->string->split(html_entity_decode($this->getSku($item)), 17),
             'feed' => 290,
             'align' => 'right',
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
index fd18830e45b6e..a88b508ba0789 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php
@@ -69,6 +69,7 @@ public function draw()
         // draw Product name
         $lines[0] = [
             [
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 'text' => $this->string->split(html_entity_decode($item->getName()), 60, true, true),
                 'feed' => 100
             ]
@@ -79,6 +80,7 @@ public function draw()
 
         // draw SKU
         $lines[0][] = [
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             'text' => $this->string->split(html_entity_decode($this->getSku($item)), 25),
             'feed' => 565,
             'align' => 'right',

From 74173d39fc5ec350804490cbc6216ad35dc8f16b Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Mon, 1 Apr 2019 10:23:36 -0500
Subject: [PATCH 0910/1055] Minor fixes for
 magento/magento-functional-tests-migration#680

 - decompose action group
 - update test annotations
---
 ...isibleOnCustomerAccountInfoActionGroup.xml | 21 +++++++++
 .../CaptchaFormsDisplayingActionGroup.xml     |  2 +-
 ...tomerChangeEmailWithCaptchaActionGroup.xml | 18 +++++++
 .../Captcha/Test/Mftf/Data/CaptchaData.xml    | 14 ++++++
 ...frontCustomerAccountInformationSection.xml |  2 +-
 ...torefrontCaptchaEditCustomerEmailTest.xml} | 47 +++++++++++--------
 ...geCustomerChangeAccountInfoActionGroup.xml | 18 +++++++
 ...orefrontCustomerChangeEmailActionGroup.xml |  9 ++--
 ...CustomerAccountInfoEditPageActionGroup.xml | 15 ++++++
 9 files changed, 118 insertions(+), 28 deletions(-)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailWithCaptchaActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml
 rename app/code/Magento/Captcha/Test/Mftf/Test/{CaptchaEditCustomerTest.xml => StorefrontCaptchaEditCustomerEmailTest.xml} (61%)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerChangeAccountInfoActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountInfoEditPageActionGroup.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml
new file mode 100644
index 0000000000000..ef28705cc7a26
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.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="AssertCaptchaVisibleOnCustomerAccountInfoActionGroup">
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaField"/>
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImage"/>
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageReloaded" />
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaFieldAfterPageReload"/>
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImageAfterPageReload"/>
+        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButtonAfterPageReload"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
index beb2c2bffa135..f3b6eb1d9af84 100644
--- a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CaptchaFormsDisplayingActionGroup">
         <click selector="{{CaptchaFormsDisplayingSection.store}}" stepKey="ClickToGoStores"/>
         <waitForPageLoad stepKey="waitForStoresLoaded"/>
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailWithCaptchaActionGroup.xml
new file mode 100644
index 0000000000000..8aff3d5482f2c
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailWithCaptchaActionGroup.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="StorefrontCustomerChangeEmailWithCaptchaActionGroup" extends="StorefrontCustomerChangeEmailActionGroup">
+        <arguments>
+            <argument name="captcha" type="string" />
+        </arguments>
+
+        <fillField selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" userInput="{{captcha}}" stepKey="fillCaptchaField" after="fillCurrentPassword" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml
new file mode 100644
index 0000000000000..f99bc18f15161
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.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="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+   <entity name="WrongCaptcha">
+        <data key="value" unique="suffix">WrongCAPTCHA</data>
+   </entity>
+</entities>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
index 6a274601e69ed..a273c8d4abd28 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
@@ -13,4 +13,4 @@
         <element name="captchaImg" type="block" selector=".captcha-img"/>
         <element name="captchaReload" type="block" selector=".captcha-reload"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
similarity index 61%
rename from app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
rename to app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
index ad126617611c6..9bcc64e9ccaf5 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaEditCustomerTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
@@ -8,19 +8,20 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="CaptchaEditCustomerEmailTest">
+    <test name="StorefrontCaptchaEditCustomerEmailTest">
         <annotations>
             <features value="Captcha"/>
-            <stories value="Check captcha and lockout customer on the account edit page."/>
-            <title value="Test for checking captcha on the customer account edit page and customer is locked."/>
+            <stories value="Customer Account Info Edit + Captcha"/>
+            <title value="Test for checking captcha on the customer account edit page."/>
             <description value="Test for checking captcha on the customer account edit page and customer is locked."/>
+            <testCaseId value="MC-14013" />
             <severity value="MAJOR"/>
             <group value="captcha"/>
             <group value="mtf_migrated"/>
         </annotations>
         <before>
             <magentoCLI command="config:set customer/captcha/forms user_edit" stepKey="enableUserEditCaptcha"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
             <createData entity="Simple_US_Customer" stepKey="customer"/>
             <!-- Sign in as customer -->
             <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
@@ -31,17 +32,19 @@
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <!-- Revert Captcha forms configurations -->
             <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="revertCaptchaConfigurations"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
         </after>
 
         <!-- Open Customer edit page -->
-        <amOnPage url="{{StorefrontCustomerEditPage.url}}" stepKey="goToCustomerEditPage"/>
-        <waitForPageLoad stepKey="waitForEditPage"/>
+        <actionGroup ref="StorefrontOpenCustomerAccountInfoEditPageActionGroup" stepKey="goToCustomerEditPage" />
 
         <!-- Update email with incorrect password 3 times. -->
         <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailFirstAttempt">
             <argument name="email" value="$$customer.email$$" />
             <argument name="password" value="{{Colorado_US_Customer.password}}" />
+        </actionGroup>
+
+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageFirstAttempt">
             <argument name="message" value="The password doesn't match this account. Verify the password and try again." />
             <argument name="messageType" value="error" />
         </actionGroup>
@@ -49,6 +52,9 @@
         <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailSecondAttempt">
             <argument name="email" value="$$customer.email$$" />
             <argument name="password" value="{{Colorado_US_Customer.password}}" />
+        </actionGroup>
+
+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageSecondAttempt">
             <argument name="message" value="The password doesn't match this account. Verify the password and try again." />
             <argument name="messageType" value="error" />
         </actionGroup>
@@ -56,25 +62,26 @@
         <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailThirdAttempt">
             <argument name="email" value="$$customer.email$$" />
             <argument name="password" value="{{Colorado_US_Customer.password}}" />
+        </actionGroup>
+
+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageThirdAttempt">
             <argument name="message" value="The password doesn't match this account. Verify the password and try again." />
             <argument name="messageType" value="error" />
         </actionGroup>
 
         <!-- Check captcha visibility after incorrect password submit form -->
-        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaField"/>
-        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImage"/>
-        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageReloaded" />
-        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaFieldAfterPageReload"/>
-        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImageAfterPageReload"/>
-        <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButtonAfterPageReload"/>
+        <actionGroup ref="AssertCaptchaVisibleOnCustomerAccountInfoActionGroup" stepKey="assertCaptchaVisible" />
 
         <!-- Try to submit form with incorrect captcha -->
-        <click selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox4"/>
-        <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="incorrectPassword" stepKey="enterWrongPassword4"/>
-        <fillField selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" userInput="wrongCaptcha" stepKey="enterWrongCaptcha"/>
-        <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange4"/>
-        <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage4"/>
+        <actionGroup ref="StorefrontCustomerChangeEmailWithCaptchaActionGroup" stepKey="changeEmailWithIncorrectCaptcha">
+            <argument name="email" value="$$customer.email$$" />
+            <argument name="password" value="{{Colorado_US_Customer.password}}" />
+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
+        </actionGroup>
+
+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageAfterIncorrectCaptcha">
+            <argument name="message" value="Incorrect CAPTCHA" />
+            <argument name="messageType" value="error" />
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerChangeAccountInfoActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerChangeAccountInfoActionGroup.xml
new file mode 100644
index 0000000000000..ab48184ed98a8
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerChangeAccountInfoActionGroup.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="AssertMessageCustomerChangeAccountInfoActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="You saved the account information." />
+            <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+        <see userInput="{{message}}" selector="{{StorefrontCustomerAccountMainSection.messageByType(messageType)}}" stepKey="verifyMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml
index 6500d7800b6a1..844d13aa1fe43 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerChangeEmailActionGroup.xml
@@ -10,10 +10,8 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontCustomerChangeEmailActionGroup">
         <arguments>
-                <argument name="email" type="string" />
-                <argument name="password" type="string" />
-                <argument name="message" type="string" defaultValue="You saved the account information." />
-                <argument name="messageType" type="string" defaultValue="success" />
+            <argument name="email" type="string" />
+            <argument name="password" type="string" />
         </arguments>
         <conditionalClick selector="{{StorefrontCustomerSidebarSection.sidebarTab('Account Information')}}" dependentSelector="{{StorefrontCustomerSidebarSection.sidebarTab('Account Information')}}" visible="true" stepKey="openAccountInfoTab" />
         <waitForPageLoad stepKey="waitForAccountInfoTabOpened" />
@@ -22,6 +20,5 @@
         <fillField selector="{{StorefrontCustomerAccountInformationSection.currentPassword}}" userInput="{{password}}" stepKey="fillCurrentPassword" />
         <click selector="{{StorefrontCustomerAccountInformationSection.saveButton}}" stepKey="saveChange" />
         <waitForPageLoad stepKey="waitForPageLoaded" />
-        <see userInput="{{message}}" selector="{{StorefrontCustomerAccountMainSection.messageByType(messageType)}}" stepKey="verifyMessage" />
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountInfoEditPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountInfoEditPageActionGroup.xml
new file mode 100644
index 0000000000000..c1ea2da8a9519
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountInfoEditPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontOpenCustomerAccountInfoEditPageActionGroup">
+        <amOnPage url="{{StorefrontCustomerEditPage.url}}" stepKey="goToCustomerEditPage"/>
+        <waitForPageLoad stepKey="waitForEditPage"/>
+    </actionGroup>
+</actionGroups>

From bb7be7ada6f64686116df9fbb79bcb64b226bb7a Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <mitry@atwix.com>
Date: Mon, 1 Apr 2019 20:33:17 +0300
Subject: [PATCH 0911/1055] Add API functional tests for ApplyCouponToCart
 functionality

---
 .../Magento/GraphQl/Quote/CouponTest.php      |  85 ----
 .../Quote/Customer/ApplyCouponToCartTest.php  | 416 ++++++++++++++++++
 .../Quote/Guest/ApplyCouponToCartTest.php     | 337 ++++++++++++++
 3 files changed, 753 insertions(+), 85 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
index 828784ca27885..31c03754e048c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
@@ -41,91 +41,6 @@ protected function setUp()
         $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     */
-    public function testApplyCouponToGuestCartWithItems()
-    {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('applyCouponToCart', $response);
-        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     */
-    public function testApplyCouponTwice()
-    {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey("applyCouponToCart", $response);
-        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
-
-        self::expectExceptionMessage('A coupon is already applied to the cart. Please remove it to apply another');
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage Cart does not contain products.
-     */
-    public function testApplyCouponToCartWithNoItems()
-    {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     */
-    public function testGuestCustomerAttemptToChangeCustomerCart()
-    {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-
-        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query);
-    }
-
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
new file mode 100644
index 0000000000000..0a1b7036ef977
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -0,0 +1,416 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\Framework\Exception\AuthenticationException;
+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\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test Apply Coupon to Cart functionality for customer
+ */
+class ApplyCouponToCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var CouponResourceInterface
+     */
+    protected $couponResource;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
+    /**
+     * @var Rule
+     */
+    private $salesRule;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    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->couponResource = $objectManager->get(CouponResourceInterface::class);
+        $this->coupon = $objectManager->create(Coupon::class);
+        $this->salesRule = $objectManager->create(Rule::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testApplyCouponToCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey('applyCouponToCart', $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
+     */
+    public function testApplyCouponTwice()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey("applyCouponToCart", $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Cart does not contain products.
+     */
+    public function testApplyCouponToCartWithoutItems()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToGuestCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToAnotherCustomerCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(2);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyNonExistentCouponToCart()
+    {
+        $couponCode = '1%q#f5';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToNonExistentCart()
+    {
+        $couponCode = '2?ds5!2d';
+        $maskedQuoteId = '1hk3y1842h1n';
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyExpiredCoupon()
+    {
+        $couponCode = '2?ds5!2d';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->coupon->loadByCode($couponCode);
+        $yesterday = new \DateTime();
+        $yesterday->add(\DateInterval::createFromDateString('-1 day'));
+        $this->coupon->setExpirationDate($yesterday->format('Y-m-d'));
+        $this->couponResource->save($this->coupon);
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * Products in cart don't fit to the coupon
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyCouponWhichIsNotApplicable()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->excludeProductPerCoupon($couponCode, 'simple');
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  applyCouponToCart(input: {{$input}}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'coupon_code: "test"',
+                'Required parameter "cart_id" is missing'
+            ],
+            'missed_coupon_code' => [
+                'cart_id: "test"',
+                'Required parameter "coupon_code" is missing'
+            ],
+        ];
+    }
+
+    /**
+     * @param string $couponCode
+     * @param string $sku
+     * @throws \Exception
+     */
+    private function excludeProductPerCoupon(string $couponCode, string $sku)
+    {
+        $this->coupon->loadByCode($couponCode);
+        $ruleId = $this->coupon->getRuleId();
+        $salesRule = $this->salesRule->load($ruleId);
+        $salesRule->getConditions()->loadArray([
+            'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
+            'attribute' => null,
+            'operator' => null,
+            'value' => '1',
+            'is_value_processed' => null,
+            'aggregator' => 'all',
+            'conditions' =>
+                [
+                    [
+                        'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
+                        'attribute' => null,
+                        'operator' => null,
+                        'value' => '1',
+                        'is_value_processed' => null,
+                        'aggregator' => 'all',
+                        'conditions' =>
+                            [
+                                [
+                                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
+                                    'attribute' => 'sku',
+                                    'operator' => '!=',
+                                    'value' => $sku,
+                                    'is_value_processed' => false,
+                                ],
+                            ],
+                    ],
+                ],
+        ]);
+        $this->salesRule->save();
+    }
+
+    /**
+     * Retrieve customer authorization headers
+     *
+     * @param string $email
+     * @param string $password
+     * @return array
+     * @throws AuthenticationException
+     */
+    private function prepareAuthorizationHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $couponCode
+     * @return string
+     */
+    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    {
+        return <<<QUERY
+mutation {
+  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
new file mode 100644
index 0000000000000..5c70fb9637dba
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test Apply Coupon to Cart functionality for guest
+ */
+class ApplyCouponToCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var CouponResourceInterface
+     */
+    protected $couponResource;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
+    /**
+     * @var Rule
+     */
+    private $salesRule;
+
+    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->couponResource = $objectManager->get(CouponResourceInterface::class);
+        $this->coupon = $objectManager->create(Coupon::class);
+        $this->salesRule = $objectManager->create(Rule::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testApplyCouponToCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('applyCouponToCart', $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
+     */
+    public function testApplyCouponTwice()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey("applyCouponToCart", $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Cart does not contain products.
+     */
+    public function testApplyCouponToCartWithoutItems()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToCustomerCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyNonExistentCouponToCart()
+    {
+        $couponCode = '1%q#f5';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToNonExistentCart()
+    {
+        $couponCode = '2?ds5!2d';
+        $maskedQuoteId = '1hk3y1842h1n';
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyExpiredCoupon()
+    {
+        $couponCode = '2?ds5!2d';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->coupon->loadByCode($couponCode);
+
+        $yesterday = new \DateTime();
+        $yesterday->add(\DateInterval::createFromDateString('-1 day'));
+        $this->coupon->setExpirationDate($yesterday->format('Y-m-d'));
+        $this->couponResource->save($this->coupon);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Products in cart don't fit to the coupon
+     *
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyCouponWhichIsNotApplicable()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->excludeProductPerCoupon($couponCode, 'simple');
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @expectedException \Exception
+     */
+    public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  applyCouponToCart(input: {{$input}}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'coupon_code: "test"',
+                'Required parameter "cart_id" is missing'
+            ],
+            'missed_coupon_code' => [
+                'cart_id: "test"',
+                'Required parameter "coupon_code" is missing'
+            ],
+        ];
+    }
+
+    /**
+     * @param string $couponCode
+     * @param string $sku
+     * @throws \Exception
+     */
+    private function excludeProductPerCoupon(string $couponCode, string $sku)
+    {
+        $this->coupon->loadByCode($couponCode);
+        $ruleId = $this->coupon->getRuleId();
+        $salesRule = $this->salesRule->load($ruleId);
+        $salesRule->getConditions()->loadArray([
+            'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
+            'attribute' => null,
+            'operator' => null,
+            'value' => '1',
+            'is_value_processed' => null,
+            'aggregator' => 'all',
+            'conditions' =>
+                [
+                    [
+                        'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
+                        'attribute' => null,
+                        'operator' => null,
+                        'value' => '1',
+                        'is_value_processed' => null,
+                        'aggregator' => 'all',
+                        'conditions' =>
+                            [
+                                [
+                                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
+                                    'attribute' => 'sku',
+                                    'operator' => '!=',
+                                    'value' => $sku,
+                                    'is_value_processed' => false,
+                                ],
+                            ],
+                    ],
+                ],
+        ]);
+        $this->salesRule->save();
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $couponCode
+     * @return string
+     */
+    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    {
+        return <<<QUERY
+mutation {
+  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+    }
+}

From 149dec143aa5f884056537e79aea9ce53848cd62 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <mitry@atwix.com>
Date: Mon, 1 Apr 2019 21:00:27 +0300
Subject: [PATCH 0912/1055] Code refactoring

---
 .../Quote/Customer/ApplyCouponToCartTest.php  | 77 ++++++++++---------
 .../Quote/Guest/ApplyCouponToCartTest.php     | 73 +++++++++---------
 2 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index 0a1b7036ef977..2db2e799f9123 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -12,8 +12,10 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
 use Magento\SalesRule\Model\Coupon;
-use Magento\SalesRule\Model\Rule;
 use Magento\SalesRule\Model\Spi\CouponResourceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -49,14 +51,19 @@ class ApplyCouponToCartTest extends GraphQlAbstract
     private $coupon;
 
     /**
-     * @var Rule
+     * @var CustomerTokenServiceInterface
      */
-    private $salesRule;
+    private $customerTokenService;
 
     /**
-     * @var CustomerTokenServiceInterface
+     * @var RuleRepositoryInterface
      */
-    private $customerTokenService;
+    private $ruleRepository;
+
+    /**
+     * @var ConditionInterfaceFactory
+     */
+    private $conditionFactory;
 
     protected function setUp()
     {
@@ -66,8 +73,9 @@ protected function setUp()
         $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
         $this->couponResource = $objectManager->get(CouponResourceInterface::class);
         $this->coupon = $objectManager->create(Coupon::class);
-        $this->salesRule = $objectManager->create(Rule::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+        $this->conditionFactory = $objectManager->get(ConditionInterfaceFactory::class);
     }
 
     /**
@@ -347,37 +355,32 @@ private function excludeProductPerCoupon(string $couponCode, string $sku)
     {
         $this->coupon->loadByCode($couponCode);
         $ruleId = $this->coupon->getRuleId();
-        $salesRule = $this->salesRule->load($ruleId);
-        $salesRule->getConditions()->loadArray([
-            'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
-            'attribute' => null,
-            'operator' => null,
-            'value' => '1',
-            'is_value_processed' => null,
-            'aggregator' => 'all',
-            'conditions' =>
-                [
-                    [
-                        'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
-                        'attribute' => null,
-                        'operator' => null,
-                        'value' => '1',
-                        'is_value_processed' => null,
-                        'aggregator' => 'all',
-                        'conditions' =>
-                            [
-                                [
-                                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
-                                    'attribute' => 'sku',
-                                    'operator' => '!=',
-                                    'value' => $sku,
-                                    'is_value_processed' => false,
-                                ],
-                            ],
-                    ],
-                ],
-        ]);
-        $this->salesRule->save();
+        $salesRule = $this->ruleRepository->getById($ruleId);
+
+        /** @var ConditionInterface $conditionProductSku */
+        $conditionProductSku = $this->conditionFactory->create();
+        $conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
+        $conditionProductSku->setAttributeName('sku');
+        $conditionProductSku->setValue('1');
+        $conditionProductSku->setOperator('!=');
+        $conditionProductSku->setValue($sku);
+
+        /** @var ConditionInterface $conditionProductFound */
+        $conditionProductFound = $this->conditionFactory->create();
+        $conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
+        $conditionProductFound->setValue('1');
+        $conditionProductFound->setAggregatorType('all');
+        $conditionProductFound->setConditions([$conditionProductSku]);
+
+        /** @var ConditionInterface $conditionCombine */
+        $conditionCombine = $this->conditionFactory->create();
+        $conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
+        $conditionCombine->setValue('1');
+        $conditionCombine->setAggregatorType('all');
+        $conditionCombine->setConditions([$conditionProductFound]);
+
+        $salesRule->setCondition($conditionCombine);
+        $this->ruleRepository->save($salesRule);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
index 5c70fb9637dba..51644a9fe8c55 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -10,8 +10,10 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
 use Magento\SalesRule\Model\Coupon;
-use Magento\SalesRule\Model\Rule;
 use Magento\SalesRule\Model\Spi\CouponResourceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -47,9 +49,14 @@ class ApplyCouponToCartTest extends GraphQlAbstract
     private $coupon;
 
     /**
-     * @var Rule
+     * @var RuleRepositoryInterface
      */
-    private $salesRule;
+    private $ruleRepository;
+
+    /**
+     * @var ConditionInterfaceFactory
+     */
+    private $conditionFactory;
 
     protected function setUp()
     {
@@ -59,7 +66,8 @@ protected function setUp()
         $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
         $this->couponResource = $objectManager->get(CouponResourceInterface::class);
         $this->coupon = $objectManager->create(Coupon::class);
-        $this->salesRule = $objectManager->create(Rule::class);
+        $this->ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+        $this->conditionFactory = $objectManager->get(ConditionInterfaceFactory::class);
     }
 
     /**
@@ -282,37 +290,32 @@ private function excludeProductPerCoupon(string $couponCode, string $sku)
     {
         $this->coupon->loadByCode($couponCode);
         $ruleId = $this->coupon->getRuleId();
-        $salesRule = $this->salesRule->load($ruleId);
-        $salesRule->getConditions()->loadArray([
-            'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
-            'attribute' => null,
-            'operator' => null,
-            'value' => '1',
-            'is_value_processed' => null,
-            'aggregator' => 'all',
-            'conditions' =>
-                [
-                    [
-                        'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
-                        'attribute' => null,
-                        'operator' => null,
-                        'value' => '1',
-                        'is_value_processed' => null,
-                        'aggregator' => 'all',
-                        'conditions' =>
-                            [
-                                [
-                                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
-                                    'attribute' => 'sku',
-                                    'operator' => '!=',
-                                    'value' => $sku,
-                                    'is_value_processed' => false,
-                                ],
-                            ],
-                    ],
-                ],
-        ]);
-        $this->salesRule->save();
+        $salesRule = $this->ruleRepository->getById($ruleId);
+
+        /** @var ConditionInterface $conditionProductSku */
+        $conditionProductSku = $this->conditionFactory->create();
+        $conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
+        $conditionProductSku->setAttributeName('sku');
+        $conditionProductSku->setValue('1');
+        $conditionProductSku->setOperator('!=');
+        $conditionProductSku->setValue($sku);
+
+        /** @var ConditionInterface $conditionProductFound */
+        $conditionProductFound = $this->conditionFactory->create();
+        $conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
+        $conditionProductFound->setValue('1');
+        $conditionProductFound->setAggregatorType('all');
+        $conditionProductFound->setConditions([$conditionProductSku]);
+
+        /** @var ConditionInterface $conditionCombine */
+        $conditionCombine = $this->conditionFactory->create();
+        $conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
+        $conditionCombine->setValue('1');
+        $conditionCombine->setAggregatorType('all');
+        $conditionCombine->setConditions([$conditionProductFound]);
+
+        $salesRule->setCondition($conditionCombine);
+        $this->ruleRepository->save($salesRule);
     }
 
     /**

From da239be543be180bdd13799630c3d296860ebcb7 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Mon, 1 Apr 2019 14:29:12 -0500
Subject: [PATCH 0913/1055] MC-15466: Migrate PWA GraphQL scenarios

---
 setup/performance-toolkit/benchmark.jmx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index f8b8244b2f898..c0d57ba0e2cef 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -409,6 +409,11 @@
             <stringProp name="Argument.value">${__P(graphqlGetProductSearchByTextAndCategoryIdPercentage,0)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="graphqlGetSimpleProductDetailsByNamePercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetSimpleProductDetailsByNamePercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetSimpleProductDetailsByNamePercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="graphqlGetSimpleProductDetailsByProductUrlKeyPercentage" elementType="Argument">
             <stringProp name="Argument.name">graphqlGetSimpleProductDetailsByProductUrlKeyPercentage</stringProp>
             <stringProp name="Argument.value">${__P(graphqlGetSimpleProductDetailsByProductUrlKeyPercentage,0)}</stringProp>

From 0375649f139c31edf5acecb5dba11440a945e97a Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 1 Apr 2019 14:32:49 -0500
Subject: [PATCH 0914/1055] GraphQL-469: Tests data rollback for
 `\Magento\GraphQl\Customer\CreateCustomerTest::testCreateCustomerAccountWithPassword`

---
 .../GraphQl/Customer/CreateCustomerTest.php   | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

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 7a11f0a467088..d87d073941666 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -8,16 +8,16 @@
 namespace Magento\GraphQl\Customer;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 class CreateCustomerTest extends GraphQlAbstract
 {
     /**
-     * @var CustomerRegistry
+     * @var Registry
      */
-    private $customerRegistry;
+    private $registry;
 
     /**
      * @var CustomerRepositoryInterface
@@ -28,7 +28,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
         $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
     }
 
@@ -40,7 +40,7 @@ public function testCreateCustomerAccountWithPassword()
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
         $currentPassword = 'test123#';
-        $newEmail = 'customer_created_random123@example.com';
+        $newEmail = 'new_customer@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -50,7 +50,7 @@ public function testCreateCustomerAccountWithPassword()
             lastname: "{$newLastname}"
             email: "{$newEmail}"
             password: "{$currentPassword}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -78,7 +78,7 @@ public function testCreateCustomerAccountWithoutPassword()
     {
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
-        $newEmail = 'customer_created_random123@example.com';
+        $newEmail = 'new_customer@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -87,7 +87,7 @@ public function testCreateCustomerAccountWithoutPassword()
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
             email: "{$newEmail}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -151,7 +151,7 @@ public function testCreateCustomerIfEmailMissed()
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
             password: "{$currentPassword}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -186,7 +186,7 @@ public function testCreateCustomerIfEmailIsNotValid()
             lastname: "{$newLastname}"
             email: "{$newEmail}"
             password: "{$currentPassword}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -211,7 +211,7 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
         $currentPassword = 'test123#';
-        $newEmail = 'customer_created_random123@example.com';
+        $newEmail = 'new_customer@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -222,7 +222,7 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
             test123: "123test123"
             email: "{$newEmail}"
             password: "{$currentPassword}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -240,21 +240,18 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
 
     public function tearDown()
     {
-        $newEmail = 'customer_created_random123@example.com';
+        $newEmail = 'new_customer@example.com';
         try {
             $customer = $this->customerRepository->get($newEmail);
-
         } catch (\Exception $exception) {
-            return false;
-        }
-        $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-        $registry->unregister('isSecureArea');
-        $registry->register('isSecureArea', true);
-        if (isset($customer) && $customer->getId()) {
-            $this->customerRepository->delete($customer);
+            return;
         }
-        $registry->unregister('isSecureArea');
-        $registry->register('isSecureArea', false);
+
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        $this->customerRepository->delete($customer);
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
         parent::tearDown();
     }
 }

From ead2ab834ff52e43e797644a4297ea8b335a24ee Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Mon, 1 Apr 2019 23:18:30 +0300
Subject: [PATCH 0915/1055] Refactoring

---
 ... => StorefrontContactUsCaptchaSection.xml} |  2 +-
 .../Test/Mftf/Test/CaptchaOnContactUsTest.xml | 31 +++++++++----------
 .../Mftf/Page/StorefrontContactUsPage.xml     | 15 +++++++++
 .../StorefrontContactUsFormSection.xml        | 17 ++++++++++
 .../Test/TestCase/CaptchaOnContactUsTest.xml  |  1 +
 5 files changed, 49 insertions(+), 17 deletions(-)
 rename app/code/Magento/Captcha/Test/Mftf/Section/{StorefrontContactUsFormSection.xml => StorefrontContactUsCaptchaSection.xml} (94%)
 create mode 100644 app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml
 create mode 100644 app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml
similarity index 94%
rename from app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
rename to app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml
index 235712b0b5b57..ef7a419194628 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.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="StorefrontContactUsFormSection">
+    <section name="StorefrontContactUsCaptchaSection">
         <element name="captchaField" type="input" selector="#captcha_contact_us"/>
         <element name="captchaImg" type="block" selector=".captcha-img"/>
         <element name="captchaReload" type="block" selector=".captcha-reload"/>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml
index 64978f32aa61a..cd839b0f78400 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml
@@ -20,35 +20,34 @@
         </annotations>
         <before>
             <magentoCLI command="config:set customer/captcha/forms contact_us" stepKey="enableUserEditCaptcha"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
-            <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
         </before>
         <after>
             <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="revertCaptchaConfigurations"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
-            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
         </after>
 
         <!-- Open storefront contact us form -->
-        <amOnPage url="/contact/" stepKey="amOnContactUpPage"/>
-        <waitForPageLoad stepKey="waitForContactUpPage"/>
+        <amOnPage url="{{StorefrontContactUsPage.url}}" stepKey="amOnContactUpPage"/>
+        <waitForPageLoad stepKey="waitForContactUpPageLoad"/>
 
         <!-- Check Captcha items -->
-        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaField}}" stepKey="seeCaptchaField1"/>
-        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaImg}}" stepKey="seeCaptchaImage1"/>
-        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton1"/>
+        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaField}}" stepKey="seeCaptchaFieldFirst"/>
+        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaImg}}" stepKey="seeCaptchaImageFirst"/>
+        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaReload}}" stepKey="seeCaptchaReloadButtonFirst"/>
 
         <!-- Submit Contact Us form -->
-        <fillField selector="{{StorefrontContactUsFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail"/>
-        <fillField selector="{{StorefrontContactUsFormSection.nameField}}"  userInput="$$customer.firstname$$" stepKey="fillName"/>
-        <fillField selector="{{StorefrontContactUsFormSection.commentField}}"  userInput="Lorem ipsum dolor sit amet, ne enim aliquando eam, oblique deserunt no usu." stepKey="fillComment"/>
-        <fillField selector="{{StorefrontContactUsFormSection.captchaField}}" userInput="InvalidCaptcha" stepKey="fillCaptcha" />
+        <fillField selector="{{StorefrontContactUsFormSection.emailField}}"  userInput="{{Simple_US_Customer.email}}" stepKey="fillEmail"/>
+        <fillField selector="{{StorefrontContactUsFormSection.nameField}}"  userInput="{{Simple_US_Customer.firstname}}" stepKey="fillName"/>
+        <fillField selector="{{StorefrontContactUsFormSection.commentField}}"  userInput="Lorem ipsum dolor sit amet, ne enim aliquando eam, oblique deserunt no usu."
+                   stepKey="fillComment"/>
+        <fillField selector="{{StorefrontContactUsCaptchaSection.captchaField}}" userInput="InvalidCaptcha" stepKey="fillCaptcha" />
         <click selector="{{StorefrontContactUsFormSection.submitFormButton}}" stepKey="clickSubmitFormButton"/>
 
         <!-- Check Captcha items after form reload -->
         <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage"/>
-        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaField}}" stepKey="seeCaptchaField2"/>
-        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
-        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
+        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaField}}" stepKey="seeCaptchaFieldSecond"/>
+        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaImg}}" stepKey="seeCaptchaImageSecond"/>
+        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaReload}}" stepKey="seeCaptchaReloadButtonSecond"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml b/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml
new file mode 100644
index 0000000000000..b8d1de812d887
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.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="StorefrontContactUsPage" url="/contact/" area="storefront" module="Magento_Contact">
+        <section name="StorefrontContactUsFormSection"/>
+        <section name="StorefrontContactUsCaptchaSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml
new file mode 100644
index 0000000000000..a73d1ad1297ef
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.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="StorefrontContactUsFormSection">
+        <element name="nameField" type="input" selector="#name"/>
+        <element name="emailField" type="input" selector="#email"/>
+        <element name="commentField" type="textarea" selector="#comment"/>
+        <element name="submitFormButton" type="button" selector=".action.submit.primary" timeout="30"/>
+    </section>
+</sections>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml
index a88cd98e3c31b..1a25afeabc5de 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.xml
@@ -12,6 +12,7 @@
             <data name="comment/data/captcha" xsi:type="string">111</data>
             <data name="comment/data/customer/dataset" xsi:type="string">default</data>
             <data name="configData" xsi:type="string">captcha_storefront_contact_us</data>
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <constraint name="Magento\Contact\Test\Constraint\AssertContactUsSuccessMessage" />
         </variation>
     </testCase>

From 116e11f00e2fde53a6e9c4c3ce92a4458316d135 Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Mon, 1 Apr 2019 23:20:56 +0300
Subject: [PATCH 0916/1055] Refactoring

---
 .../Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml
index ef7a419194628..f587812576ff1 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsCaptchaSection.xml
@@ -12,9 +12,5 @@
         <element name="captchaField" type="input" selector="#captcha_contact_us"/>
         <element name="captchaImg" type="block" selector=".captcha-img"/>
         <element name="captchaReload" type="block" selector=".captcha-reload"/>
-        <element name="nameField" type="input" selector="#name"/>
-        <element name="emailField" type="input" selector="#email"/>
-        <element name="commentField" type="textarea" selector="#comment"/>
-        <element name="submitFormButton" type="button" selector=".action.submit.primary" timeout="30"/>
     </section>
 </sections>

From c380fa0e9b9255e0f1d821e41e67f1fe4dde0da1 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Mon, 1 Apr 2019 15:35:51 -0500
Subject: [PATCH 0917/1055] MC-15439: Deferred loading / parsing of JS

---
 app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index 7bc02164e7a85..19ef31b2a41b4 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -22,7 +22,7 @@ public function beforeSendResponse(\Magento\Framework\App\Response\Http $subject
         $script = [];
         if (strpos($content, '</body') > 0) {
             $content = preg_replace('#<!--(?!\s?/?ko).*?-->#s', '', $content);
-            $pattern = '#<script.*?</script>#is';
+            $pattern = '#<script[^>]*+(?<!text/x-magento-template.)>.*?</script>#is';
             $content = preg_replace_callback(
                 $pattern,
                 function ($matchPart) use (&$script) {

From 7c216c5ceafb17ae4276a22cc077419c8948d6d5 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 1 Apr 2019 15:51:33 -0500
Subject: [PATCH 0918/1055] GraphQL-423: Test coverage:
 SetShippingMethodsOnCartTest for Customer

---
 .../Customer/SetShippingMethodsOnCartTest.php | 634 +++++++++---------
 .../Guest/SetShippingMethodsOnCartTest.php    |   4 +-
 2 files changed, 307 insertions(+), 331 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index e61796fe66fe5..4f0f2efc2447a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -7,57 +7,31 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 
 /**
  * Test for setting shipping methods on cart for customer
  */
 class SetShippingMethodsOnCartTest extends GraphQlAbstract
 {
-    /**
-     * @var CustomerTokenServiceInterface
-     */
-    private $customerTokenService;
-
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-
     /**
      * @var GetMaskedQuoteIdByReservedOrderId
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
+     * @var GetQuoteShippingAddressIdByReservedQuoteId
      */
-    private $quoteFactory;
+    private $getQuoteShippingAddressIdByReservedQuoteId;
 
     /**
-     * @var CartRepositoryInterface
-     */
-    private $quoteRepository;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
+     * @var CustomerTokenServiceInterface
      */
-    private $quoteIdToMaskedId;
+    private $customerTokenService;
 
     /**
      * @inheritdoc
@@ -65,355 +39,381 @@ class SetShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+        $this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(
+            GetQuoteShippingAddressIdByReservedQuoteId::class
+        );
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-     * @throws \Exception
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testShippingMethodWithVirtualProduct()
+    public function testSetShippingMethodOnCartWithSimpleProduct()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $carrierCode = 'flatrate';
+        $methodCode = 'flatrate';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
 
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-
-        $virtualProduct = $this->productRepository->get('virtual-product');
-        $quote->addProduct($virtualProduct, 1);
-        $this->quoteRepository->save($quote);
-
-        $mutation = $this->prepareMutationQuery(
+        $query = $this->getQuery(
             $maskedQuoteId,
-            'freeshipping',
-            'freeshipping',
-            (int)$quote->getShippingAddress()->getId()
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
         );
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
-    }
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
 
-    /**
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     * @throws \Exception
-     */
-    public function testShippingMethodWithSimpleProduct()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
 
-        $mutation = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            'freeshipping',
-            'freeshipping',
-            (int)$quote->getShippingAddress()->getId()
-        );
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
 
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
     }
 
     /**
+     * Shipping address for quote will be created automatically BUT with NULL values (considered that address
+     * is not set)
+     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @throws \Exception
-     */
-    public function testShippingMethodWithSimpleProductWithoutAddress()
-    {
-        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_with_simple_product_without_address', 1);
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-
-        $mutation = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            'flatrate',
-            'flatrate',
-            (int)$quote->getShippingAddress()->getId()
-        );
-
-        self::expectExceptionMessage(
-            'Required parameter "cart_address_id" is missing'
-        );
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @throws \Exception
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
-    public function testSetShippingMethodWithMissedRequiredParameters()
+    public function testSetShippingMethodOnCartWithSimpleProductAndWithoutAddress()
     {
-        $maskedQuoteId = $this->assignQuoteToCustomer('test_order_1', 1);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $carrierCode = 'flatrate';
+        $methodCode = 'flatrate';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
 
-        $mutation = $this->prepareMutationQuery(
+        $query = $this->getQuery(
             $maskedQuoteId,
-            '',
-            '',
-            1
-        );
-
-        self::expectExceptionMessage(
-            'Required parameter "carrier_code" is missing.'
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
         );
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     * @throws \Exception
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
      */
-    public function testSetNonExistentShippingMethod()
+    public function testReSetShippingMethod()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $carrierCode = 'freeshipping';
+        $methodCode = 'freeshipping';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
 
-        $mutation = $this->prepareMutationQuery(
+        $query = $this->getQuery(
             $maskedQuoteId,
-            'non-existed-method-code',
-            'non-existed-carrier-code',
-            (int)$quote->getShippingAddress()->getId()
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
         );
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
-        self::expectExceptionMessage(
-            'Carrier with such method not found: non-existed-carrier-code, non-existed-method-code'
-        );
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
 
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
-    }
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
 
-    /**
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @throws \Exception
-     */
-    public function testSetShippingMethodIfAddressIsNotBelongToCart()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        $mutation = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            'flatrate',
-            'flatrate',
-            2
-        );
-
-        self::expectExceptionMessage(
-            'Could not find a cart address with ID "2"'
-        );
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($carrierCode, $shippingAddress['selected_shipping_method']['carrier_code']);
 
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
     }
 
     /**
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     *
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderSetShippingMethodWithWrongParameters
      * @throws \Exception
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function testSetShippingMethodToNonExistentCart()
+    public function testSetShippingMethodWithWrongParameters(string $input, string $message)
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('Non_existent_cart_reversed_quote_id');
-
-        $mutation = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            'flatrate',
-            'flatrate',
-            80900
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+        $input = str_replace(['cart_id_value', 'cart_address_id_value'], [$maskedQuoteId, $quoteAddressId], $input);
 
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
+        $query = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input:  {
+   {$input}     
+  }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @throws \Exception
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testSetShippingMethodToGuestCart()
+    public function dataProviderSetShippingMethodWithWrongParameters(): array
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('guest_quote');
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'guest_quote', 'reserved_order_id');
-
-        $mutation = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            'flatrate',
-            'flatrate',
-            (int)$quote->getShippingAddress()->getId()
-        );
-
-        $this->graphQlQuery($mutation);
+        return [
+            'missed_cart_id' => [
+                'shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                    method_code: "flatrate"
+                }]',
+                'Required parameter "cart_id" is missing'
+            ],
+            'missed_shipping_methods' => [
+                'cart_id: "cart_id_value"',
+                'Required parameter "shipping_methods" is missing'
+            ],
+            'shipping_methods_are_empty' => [
+                'cart_id: "cart_id_value" shipping_methods: []',
+                'Required parameter "shipping_methods" is missing'
+            ],
+            'missed_cart_address_id' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    carrier_code: "flatrate"
+                    method_code: "flatrate"
+                }]',
+                'Required parameter "cart_address_id" is missing.'
+            ],
+            'non_existent_cart_address_id' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: -1
+                    carrier_code: "flatrate"
+                    method_code: "flatrate"
+                }]',
+                'Could not find a cart address with ID "-1"'
+            ],
+            'missed_carrier_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    method_code: "flatrate"
+                }]',
+                'Field ShippingMethodInput.carrier_code of required type String! was not provided.'
+            ],
+            'empty_carrier_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: ""
+                    method_code: "flatrate"
+                }]',
+                'Required parameter "carrier_code" is missing.'
+            ],
+            'non_existent_carrier_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "wrong-carrier-code"
+                    method_code: "flatrate"
+                }]',
+                'Carrier with such method not found: wrong-carrier-code, flatrate'
+            ],
+            'missed_method_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                }]',
+                'Required parameter "method_code" is missing.'
+            ],
+            'empty_method_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                    method_code: ""
+                }]',
+                'Required parameter "method_code" is missing.'
+            ],
+            'non_existent_method_code' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                    method_code: "wrong-carrier-code"
+                }]',
+                'Carrier with such method not found: flatrate, wrong-carrier-code'
+            ],
+            'non_existent_shopping_cart' => [
+                'cart_id: "non_existent_masked_id", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "flatrate"
+                    method_code: "flatrate"
+                }]',
+                'Could not find a cart with ID "non_existent_masked_id"'
+            ],
+        ];
     }
 
     /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-     * @throws \Exception
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage You cannot specify multiple shipping methods.
      */
-    public function testSetShippingMethodToAnotherCustomerCart()
+    public function testSetMultipleShippingMethods()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_virtual_product');
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-
-        $mutation = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            'flatrate',
-            'flatrate',
-            (int)$quote->getShippingAddress()->getId()
-        );
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
 
-        self::expectExceptionMessage(
-            'Carrier with such method not found: flatrate, flatrate'
-        );
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
+        $query = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input:  {
+   cart_id: "{$maskedQuoteId}", 
+   shipping_methods: [
+        {
+            cart_address_id: {$quoteAddressId}
+            carrier_code: "flatrate"
+            method_code: "flatrate"
+        }
+        {
+            cart_address_id: {$quoteAddressId}
+            carrier_code: "flatrate"
+            method_code: "flatrate"
+        }
+   ]
+  }) {
+    cart {
+      shipping_addresses {
+        selected_shipping_method {
+          carrier_code
+        }
+      }
     }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @throws \Exception
-     */
-    public function testSetShippingMethodToNonExistentCartAddress()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        $mutation = $this->prepareMutationQuery(
-            $maskedQuoteId,
-            'flatrate',
-            'flatrate',
-            16800
-        );
-        self::expectExceptionMessage(
-            'Could not find a cart address with ID "16800"'
-        );
-
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
+  }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
-     * @magentoApiDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
-     * @throws \Exception
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     *
+     * @expectedException \Exception
      */
-    public function testSetShippingMethodToGuestCartAddress()
+    public function testSetShippingMethodToGuestCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('guest_quote');
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'guest_quote', 'reserved_order_id');
-
-        $mutation = $this->prepareMutationQuery(
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $carrierCode = 'flatrate';
+        $methodCode = 'flatrate';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+        $query = $this->getQuery(
             $maskedQuoteId,
-            'flatrate',
-            'flatrate',
-            (int)$quote->getShippingAddress()->getId()
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
         );
 
-        $this->graphQlQuery($mutation);
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
-     * @throws \Exception
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     *
+     * @expectedException \Exception
      */
-    public function testSetShippingMethodToAnotherCustomerCartAddress()
+    public function testSetShippingMethodToAnotherCustomerCart()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_virtual_product');
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-
-        $mutation = $this->prepareMutationQuery(
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $carrierCode = 'flatrate';
+        $methodCode = 'flatrate';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+        $query = $this->getQuery(
             $maskedQuoteId,
-            'flatrate',
-            'flatrate',
-            (int)$quote->getShippingAddress()->getId()
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
         );
 
-        self::expectExceptionMessage(
-            'Carrier with such method not found: flatrate, flatrate'
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_shipping_method.php
-     * @throws \Exception
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/quote_with_address.php
      */
-    public function testSetMultipleShippingMethods()
+    public function testSetShippingMethodIfCustomerIsNotOwnerOfAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-
-        $shippingAddressId = (int)$quote->getShippingAddress()->getId();
-
-        $mutation = <<<MUTATION
-mutation {
-  setShippingMethodsOnCart(input: 
-    {
-      cart_id: "$maskedQuoteId", 
-      shipping_methods: [{
-          cart_address_id: $shippingAddressId
-          method_code: "flatrate"
-          carrier_code: "flatrate"
-        },
-        {
-          cart_address_id: $shippingAddressId
-          method_code: "ups"
-          carrier_code: "ups"
-      }]
-    }
-    ) {
-    cart {
-      shipping_addresses {
-        address_id
-        firstname
-        lastname
-        selected_shipping_method {
-          carrier_code
-          method_code
-          label
-          amount
-        }
-      }
-    }
-  }
-}
-
-MUTATION;
-        self::expectExceptionMessage(
-            'You cannot specify multiple shipping methods.'
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $carrierCode = 'flatrate';
+        $methodCode = 'flatrate';
+        $anotherQuoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('guest_quote_with_address');
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $anotherQuoteAddressId
         );
 
-        $this->graphQlQuery($mutation, [], '', $this->getHeaderMap());
+        $this->expectExceptionMessage(
+            "Cart does not contain address with ID \"{$anotherQuoteAddressId}\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -422,14 +422,13 @@ public function testSetMultipleShippingMethods()
      * @param string $shippingCarrierCode
      * @param int $shippingAddressId
      * @return string
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
-    private function prepareMutationQuery(
+    private function getQuery(
         string $maskedQuoteId,
         string $shippingMethodCode,
         string $shippingCarrierCode,
         int $shippingAddressId
-    ) : string {
+    ): string {
         return <<<QUERY
 mutation {
   setShippingMethodsOnCart(input: 
@@ -437,52 +436,27 @@ private function prepareMutationQuery(
       cart_id: "$maskedQuoteId", 
       shipping_methods: [{
         cart_address_id: $shippingAddressId
-        method_code: "$shippingMethodCode"
         carrier_code: "$shippingCarrierCode"
+        method_code: "$shippingMethodCode"
       }]
-    } ) 
-    {
+    }) {
     cart {
       shipping_addresses {
-        address_id
-        firstname
-        lastname
         selected_shipping_method {
           carrier_code
           method_code
-          label
-          amount
         }
       }
     }
   }
 }
-
 QUERY;
     }
 
-    /**
-     * @param string $reversedOrderId
-     * @param int $customerId
-     * @return string
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
-     */
-    private function assignQuoteToCustomer(
-        string $reversedOrderId,
-        int $customerId
-    ): string {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
-        $quote->setCustomerId($customerId);
-        $this->quoteResource->save($quote);
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
     /**
      * @param string $username
      * @param string $password
      * @return array
-     * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 6289d88de6ee4..7d4decd248bbd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -76,6 +76,9 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
     }
 
     /**
+     * Shipping address for quote will be created automatically BUT with NULL values (considered that address
+     * is not set)
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -343,7 +346,6 @@ public function testSetShippingMethodToCustomerCart()
 
     /**
      * _security
-     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php

From 178892833ce806d8b00565b31e44e537921e7b53 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 1 Apr 2019 15:56:37 -0500
Subject: [PATCH 0919/1055] GraphQL-469: Tests data rollback for
 `\Magento\GraphQl\Customer\CreateCustomerTest::testCreateCustomerAccountWithPassword`

---
 .../testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php  | 3 +++
 1 file changed, 3 insertions(+)

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 d87d073941666..388028c4ca750 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -12,6 +12,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
+/**
+ * Test for create customer functionallity
+ */
 class CreateCustomerTest extends GraphQlAbstract
 {
     /**

From c562b33b5779f159c41996481e0e2bf58620ce6f Mon Sep 17 00:00:00 2001
From: Viktor Tymchynskyi <vtymchynskyi@magento.com>
Date: Mon, 1 Apr 2019 15:57:23 -0500
Subject: [PATCH 0920/1055] MC-15427: Token Abuse in PayPal Payflow module

- Updated composer.lock
---
 composer.lock | 265 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 157 insertions(+), 108 deletions(-)

diff --git a/composer.lock b/composer.lock
index e2d00ad07c79a..06ab71ee75970 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": "825a03a040f3eff4ea6ea537b7530f15",
+    "content-hash": "c43d19692d25afef14dd42eb893eb4ca",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -164,21 +164,21 @@
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
-            "version": "v1.4.0",
+            "version": "v1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc"
+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
-                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4949ca28b86037abb44984c77bab9d0a4e075643",
+                "reference": "4949ca28b86037abb44984c77bab9d0a4e075643",
                 "shasum": ""
             },
             "require": {
                 "colinmollenhour/credis": "~1.6",
-                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0"
+                "php": "^5.5 || ^7.0"
             },
             "type": "library",
             "autoload": {
@@ -197,7 +197,7 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2018-03-29T15:54:15+00:00"
+            "time": "2019-03-18T14:43:14+00:00"
         },
         {
             "name": "composer/ca-bundle",
@@ -337,16 +337,16 @@
         },
         {
             "name": "composer/semver",
-            "version": "1.4.2",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
                 "shasum": ""
             },
             "require": {
@@ -395,28 +395,27 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30T16:08:34+00:00"
+            "time": "2019-03-19T17:25:45+00:00"
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.5.0",
+            "version": "1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2"
+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
-                "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0"
+                "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
-                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
             },
             "type": "library",
             "extra": {
@@ -456,7 +455,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2018-11-01T09:45:54+00:00"
+            "time": "2019-03-26T10:23:26+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -1106,21 +1105,21 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.8.1",
+            "version": "v1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "57bb5ef079d3724148da3d5c99e30695ab17afda"
+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/57bb5ef079d3724148da3d5c99e30695ab17afda",
-                "reference": "57bb5ef079d3724148da3d5c99e30695ab17afda",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/87125d5b265f98c4d1b8d83a1f0726607c229421",
+                "reference": "87125d5b265f98c4d1b8d83a1f0726607c229421",
                 "shasum": ""
             },
             "require": {
                 "paragonie/random_compat": ">=1",
-                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
             },
             "require-dev": {
                 "phpunit/phpunit": "^3|^4|^5"
@@ -1184,7 +1183,7 @@
                 "secret-key cryptography",
                 "side-channel resistant"
             ],
-            "time": "2019-01-03T21:00:55+00:00"
+            "time": "2019-03-20T17:19:05+00:00"
         },
         {
             "name": "pelago/emogrifier",
@@ -1382,16 +1381,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.14",
+            "version": "2.0.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "8ebfcadbf30524aeb75b2c446bc2519d5b321478"
+                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8ebfcadbf30524aeb75b2c446bc2519d5b321478",
-                "reference": "8ebfcadbf30524aeb75b2c446bc2519d5b321478",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
+                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
                 "shasum": ""
             },
             "require": {
@@ -1470,7 +1469,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2019-01-27T19:37:29+00:00"
+            "time": "2019-03-10T16:53:45+00:00"
         },
         {
             "name": "psr/container",
@@ -2127,16 +2126,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+                "reference": "82ebae02209c21113908c229e9883c419720738a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
+                "reference": "82ebae02209c21113908c229e9883c419720738a",
                 "shasum": ""
             },
             "require": {
@@ -2148,7 +2147,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -2170,7 +2169,7 @@
                 },
                 {
                     "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
+                    "email": "backendtea@gmail.com"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -2181,20 +2180,20 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
-                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
                 "shasum": ""
             },
             "require": {
@@ -2206,7 +2205,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -2240,7 +2239,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-21T13:07:52+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/process",
@@ -4965,16 +4964,16 @@
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "2.11.2",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572"
+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/004af26391cd7d1cd04b0ac736dc1324d1b4f572",
-                "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789",
+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789",
                 "shasum": ""
             },
             "require": {
@@ -5057,7 +5056,7 @@
                 }
             ],
             "description": "Initialize Symfony Console commands from annotated command class methods.",
-            "time": "2019-02-02T02:29:53+00:00"
+            "time": "2019-03-08T16:55:03+00:00"
         },
         {
             "name": "consolidation/config",
@@ -5232,16 +5231,16 @@
         },
         {
             "name": "consolidation/output-formatters",
-            "version": "3.4.0",
+            "version": "3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19"
+                "reference": "0881112642ad9059071f13f397f571035b527cb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19",
-                "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/0881112642ad9059071f13f397f571035b527cb9",
+                "reference": "0881112642ad9059071f13f397f571035b527cb9",
                 "shasum": ""
             },
             "require": {
@@ -5251,11 +5250,10 @@
                 "symfony/finder": "^2.5|^3|^4"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^2",
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
                 "phpunit/phpunit": "^5.7.27",
-                "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "^2.7",
-                "symfony/console": "3.2.3",
                 "symfony/var-dumper": "^2.8|^3|^4",
                 "victorjonsson/markdowndocs": "^1.3"
             },
@@ -5264,6 +5262,52 @@
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4.0"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^6"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony3": {
+                        "require": {
+                            "symfony/console": "^3.4",
+                            "symfony/finder": "^3.4",
+                            "symfony/var-dumper": "^3.4"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "5.6.32"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        },
+                        "scenario-options": {
+                            "create-lockfile": "false"
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "3.x-dev"
                 }
@@ -5284,25 +5328,25 @@
                 }
             ],
             "description": "Format text by applying transformations provided by plug-in formatters.",
-            "time": "2018-10-19T22:35:38+00:00"
+            "time": "2019-03-14T03:45:44+00:00"
         },
         {
             "name": "consolidation/robo",
-            "version": "1.4.6",
+            "version": "1.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3"
+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
-                "reference": "d4805a1abbc730e9a6d64ede2eba56f91a2b4eb3",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
                 "shasum": ""
             },
             "require": {
                 "consolidation/annotated-command": "^2.10.2",
-                "consolidation/config": "^1.0.10",
+                "consolidation/config": "^1.2",
                 "consolidation/log": "~1",
                 "consolidation/output-formatters": "^3.1.13",
                 "consolidation/self-update": "^1",
@@ -5392,7 +5436,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2019-02-17T05:32:27+00:00"
+            "time": "2019-03-19T18:07:19+00:00"
         },
         {
             "name": "consolidation/self-update",
@@ -5505,16 +5549,16 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "v1.6.0",
+            "version": "v1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
+                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
-                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/53120e0eb10355388d6ccbe462f1fea34ddadb24",
+                "reference": "53120e0eb10355388d6ccbe462f1fea34ddadb24",
                 "shasum": ""
             },
             "require": {
@@ -5569,38 +5613,40 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2017-12-06T07:11:42+00:00"
+            "time": "2019-03-25T19:12:02+00:00"
         },
         {
             "name": "doctrine/collections",
-            "version": "v1.5.0",
+            "version": "v1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/collections.git",
-                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
+                "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
-                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
+                "reference": "d2ae4ef05e25197343b6a39bae1d3c427a2f6956",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1.3"
             },
             "require-dev": {
-                "doctrine/coding-standard": "~0.1@dev",
-                "phpunit/phpunit": "^5.7"
+                "doctrine/coding-standard": "^6.0",
+                "phpstan/phpstan-shim": "^0.9.2",
+                "phpunit/phpunit": "^7.0",
+                "vimeo/psalm": "^3.2.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "1.6.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Collections\\": "lib/"
+                "psr-4": {
+                    "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5629,38 +5675,41 @@
                     "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "Collections Abstraction library",
-            "homepage": "http://www.doctrine-project.org",
+            "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.",
+            "homepage": "https://www.doctrine-project.org/projects/collections.html",
             "keywords": [
                 "array",
                 "collections",
-                "iterator"
+                "iterators",
+                "php"
             ],
-            "time": "2017-07-22T10:37:32+00:00"
+            "time": "2019-03-25T19:03:48+00:00"
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
+                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
+                "doctrine/coding-standard": "^6.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "squizlabs/php_codesniffer": "^3.0.2"
+                "phpbench/phpbench": "^0.13",
+                "phpstan/phpstan-phpunit": "^0.11",
+                "phpstan/phpstan-shim": "^0.11",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
@@ -5685,12 +5734,12 @@
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
             "keywords": [
                 "constructor",
                 "instantiate"
             ],
-            "time": "2017-07-22T11:58:36+00:00"
+            "time": "2019-03-17T17:37:11+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -6620,16 +6669,16 @@
         },
         {
             "name": "magento/magento-coding-standard",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento-coding-standard.git",
-                "reference": "b79055fdd16e0657c95ee214ebb81466c5f08745"
+                "reference": "489029a285c637825294e272d31c3f4ac00a454e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/b79055fdd16e0657c95ee214ebb81466c5f08745",
-                "reference": "b79055fdd16e0657c95ee214ebb81466c5f08745",
+                "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/489029a285c637825294e272d31c3f4ac00a454e",
+                "reference": "489029a285c637825294e272d31c3f4ac00a454e",
                 "shasum": ""
             },
             "require": {
@@ -6646,7 +6695,7 @@
                 "AFL-3.0"
             ],
             "description": "A set of Magento specific PHP CodeSniffer rules.",
-            "time": "2019-03-27T14:17:16+00:00"
+            "time": "2019-04-01T17:03:33+00:00"
         },
         {
             "name": "magento/magento2-functional-testing-framework",
@@ -9042,16 +9091,16 @@
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
+                "reference": "bc4858fb611bda58719124ca079baff854149c89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
-                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
+                "reference": "bc4858fb611bda58719124ca079baff854149c89",
                 "shasum": ""
             },
             "require": {
@@ -9061,7 +9110,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -9097,20 +9146,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-21T06:26:08+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
                 "shasum": ""
             },
             "require": {
@@ -9119,7 +9168,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -9152,7 +9201,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-09-21T13:07:52+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/stopwatch",

From 0d5fce3b3ae89385d9d41b6cf20e64f0bfe5fb41 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Mon, 1 Apr 2019 15:52:17 -0500
Subject: [PATCH 0921/1055] Minor fixes for
 magento/magento-functional-tests-migration#681

 - update test annotations
 - provided additional verification of CAPTCHA
---
 ...OnCustomerAccountCreatePageActionGroup.xml | 16 ++++
 ...ountCreationFormWithCaptchaActionGroup.xml | 17 ++++
 .../Test/Mftf/Data/CaptchaConfigData.xml      | 93 +++++++++++++++++++
 .../Captcha/Test/Mftf/Data/CaptchaData.xml    | 11 ++-
 .../Mftf/Data/CaptchaFormsDisplayingData.xml  |  2 +-
 .../StorefrontCustomerCreateFormSection.xml   | 16 ++++
 .../Test/CaptchaOnStoreFrontRegisterTest.xml  | 51 ----------
 ...StorefrontCaptchaEditCustomerEmailTest.xml | 23 ++++-
 ...orefrontCaptchaRegisterNewCustomerTest.xml | 68 ++++++++++++++
 ...essageCustomerCreateAccountActionGroup.xml | 18 ++++
 ...CustomerAccountCreationFormActionGroup.xml | 15 +++
 ...CustomerAccountCreationFormActionGroup.xml | 22 +++++
 ...enCustomerAccountCreatePageActionGroup.xml | 15 +++
 .../StorefrontCustomerCreateFormSection.xml   |  3 -
 .../CaptchaOnStoreFrontRegisterTest.xml       |  1 +
 15 files changed, 309 insertions(+), 62 deletions(-)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
 delete mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontRegisterTest.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml
new file mode 100644
index 0000000000000..6c09d1d49381f
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup">
+        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaField}}" stepKey="waitForCaptchaField"/>
+        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaImg}}" stepKey="waitForCaptchaImage"/>
+        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaReload}}" stepKey="waitForCaptchaReloadButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml
new file mode 100644
index 0000000000000..d67ebc1a00768
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup" extends="StorefrontFillCustomerAccountCreationFormActionGroup">
+        <arguments>
+            <argument name="captcha" type="string" />
+        </arguments>
+        <fillField stepKey="fillCaptchaField" after="fillConfirmPassword" userInput="{{captcha}}" selector="{{StorefrontCustomerCreateFormSection.captchaField}}" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
new file mode 100644
index 0000000000000..12bbb5b55dab0
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
@@ -0,0 +1,93 @@
+<?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="StorefrontCustomerCaptchaEnableConfigData">
+        <!-- Magento default value -->
+        <data key="path">customer/captcha/enable</data>
+        <data key="scope_id">0</data>
+        <data key="label">Yes</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="StorefrontCustomerCaptchaDisableConfigData">
+        <data key="path">customer/captcha/enable</data>
+        <data key="scope_id">0</data>
+        <data key="label">No</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="StorefrontCaptchaOnCustomerCreateFormConfigData">
+        <data key="path">customer/captcha/forms</data>
+        <data key="scope_id">0</data>
+        <data key="label">Create user</data>
+        <data key="value">user_create</data>
+    </entity>
+    <entity name="StorefrontCaptchaOnCustomerLoginConfigData">
+        <!-- Magento default value -->
+        <data key="path">customer/captcha/forms</data>
+        <data key="scope_id">0</data>
+        <data key="label">Login</data>
+        <data key="value">user_login</data>
+    </entity>
+    <entity name="StorefrontCaptchaOnCustomerChangePasswordConfigData">
+        <data key="path">customer/captcha/forms</data>
+        <data key="scope_id">0</data>
+        <data key="label">Change password</data>
+        <data key="value">user_edit</data>
+    </entity>
+    <entity name="StorefrontCaptchaOnCustomerForgotPasswordConfigData">
+        <!-- Magento default value -->
+        <data key="path">customer/captcha/forms</data>
+        <data key="scope_id">0</data>
+        <data key="label">Forgot password</data>
+        <data key="value">user_forgotpassword</data>
+    </entity>
+    <entity name="StorefrontCustomerCaptchaModeAlwaysConfigData">
+        <data key="path">customer/captcha/mode</data>
+        <data key="scope_id">0</data>
+        <data key="label">Always</data>
+        <data key="value">always</data>
+    </entity>
+    <entity name="StorefrontCustomerCaptchaModeAfterFailConfigData">
+        <!-- Magento default value -->
+        <data key="path">customer/captcha/mode</data>
+        <data key="scope_id">0</data>
+        <data key="label">After number of attempts to login</data>
+        <data key="value">after_fail</data>
+    </entity>
+    <entity name="StorefrontCustomerCaptchaLength3ConfigData">
+        <data key="path">customer/captcha/length</data>
+        <data key="scope">admin</data>
+        <data key="scope_id">1</data>
+        <data key="label">3</data>
+        <data key="value">3</data>
+    </entity>
+    <entity name="StorefrontCustomerCaptchaSymbols1ConfigData">
+        <data key="path">customer/captcha/symbols</data>
+        <data key="scope">admin</data>
+        <data key="scope_id">1</data>
+        <data key="label">1</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="StorefrontCustomerCaptchaDefaultLengthConfigData">
+        <!-- Magento default value -->
+        <data key="path">customer/captcha/length</data>
+        <data key="scope">admin</data>
+        <data key="scope_id">1</data>
+        <data key="label">4-5</data>
+        <data key="value">4-5</data>
+    </entity>
+    <entity name="StorefrontCustomerCaptchaDefaultSymbolsConfigData">
+        <!-- Magento default value -->
+        <data key="path">customer/captcha/symbols</data>
+        <data key="scope">admin</data>
+        <data key="scope_id">1</data>
+        <data key="label">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
+        <data key="value">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml
index f99bc18f15161..d8fb206b8111c 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaData.xml
@@ -7,8 +7,13 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-   <entity name="WrongCaptcha">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="WrongCaptcha">
         <data key="value" unique="suffix">WrongCAPTCHA</data>
-   </entity>
+    </entity>
+
+    <!-- This CAPTCHA will only work if "StorefrontCustomerCaptchaLength3ConfigData" and "StorefrontCustomerCaptchaSymbols1ConfigData" config is set. -->
+    <entity name="PreconfiguredCaptcha">
+        <data key="value">111</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
index 9db8110c0f64b..57a09219fe4db 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaFormsDisplayingData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
    <entity name="CaptchaData">
        <data key="createUser">Create user</data>
        <data key="login">Login</data>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
new file mode 100644
index 0000000000000..f48e6124cb214
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -0,0 +1,16 @@
+<?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="StorefrontCustomerCreateFormSection">
+        <element name="captchaField" type="input" selector="#captcha_user_create"/>
+        <element name="captchaImg" type="block" selector=".captcha-img"/>
+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontRegisterTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontRegisterTest.xml
deleted file mode 100644
index 86a660563086e..0000000000000
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontRegisterTest.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.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="CaptchaOnStoreFrontRegisterTest">
-        <annotations>
-            <features value="Captcha"/>
-            <stories value="Test creation for customer register with captcha on storefront."/>
-            <title value="Captcha customer registration"/>
-            <description value="Test creation for customer register with captcha on storefront."/>
-            <severity value="MAJOR"/>
-            <group value="captcha"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <!--  Enable captcha for customer. -->
-            <magentoCLI command="config:set customer/captcha/forms user_create" stepKey="enableUserRegistrationCaptcha"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
-        </before>
-        <after>
-            <!-- Set default configuration. -->
-            <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="revertCaptchaConfigurations"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
-        </after>
-
-        <!-- Open Customer registration page -->
-        <amOnPage url="/customer/account/create/" stepKey="goToRegistrationPage"/>
-        <waitForPageLoad stepKey="waitForRegistrationPage"/>
-
-        <!-- Check captcha visibility registration page load -->
-        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaField}}" stepKey="seeCaptchaField"/>
-        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
-        <waitForElementVisible selector="{{StorefrontCustomerCreateFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
-
-        <!-- Submit form with incorrect captcha -->
-        <fillField  selector="{{StorefrontCustomerCreateFormSection.firstnameField}}" userInput="FirstName"  stepKey="fillFirstName"/>
-        <fillField  selector="{{StorefrontCustomerCreateFormSection.lastnameField}}" userInput="LastName" stepKey="fillLastName" />
-        <fillField  stepKey="fillEmail" userInput="email@example.com" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="123123Qq" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
-        <fillField  stepKey="fillConfirmPassword" userInput="123123Qq" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
-        <fillField selector="{{StorefrontCustomerCreateFormSection.captchaField}}" userInput="wrongCaptcha" stepKey="enterWrongCaptcha"/>
-        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
-        <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage4"/>
-    </test>
-</tests>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
index 9bcc64e9ccaf5..99ce58bc3d174 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
@@ -15,13 +15,17 @@
             <title value="Test for checking captcha on the customer account edit page."/>
             <description value="Test for checking captcha on the customer account edit page and customer is locked."/>
             <testCaseId value="MC-14013" />
-            <severity value="MAJOR"/>
+            <severity value="AVERAGE"/>
             <group value="captcha"/>
             <group value="mtf_migrated"/>
         </annotations>
         <before>
-            <magentoCLI command="config:set customer/captcha/forms user_edit" stepKey="enableUserEditCaptcha"/>
+            <!-- Setup CAPTCHA for testing -->
+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerChangePasswordConfigData.path}} {{StorefrontCaptchaOnCustomerChangePasswordConfigData.value}}" stepKey="enableUserEditCaptcha"/>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
             <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+
             <createData entity="Simple_US_Customer" stepKey="customer"/>
             <!-- Sign in as customer -->
             <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
@@ -29,10 +33,13 @@
             </actionGroup>
         </before>
         <after>
-            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <!-- Revert Captcha forms configurations -->
-            <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="revertCaptchaConfigurations"/>
+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
             <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
 
         <!-- Open Customer edit page -->
@@ -83,5 +90,13 @@
             <argument name="message" value="Incorrect CAPTCHA" />
             <argument name="messageType" value="error" />
         </actionGroup>
+
+        <!-- Update customer email correct password and CAPTCHA -->
+        <actionGroup ref="StorefrontCustomerChangeEmailWithCaptchaActionGroup" stepKey="changeEmailCorrectAttempt">
+            <argument name="email" value="$$customer.email$$" />
+            <argument name="password" value="$$customer.password$$" />
+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
+        </actionGroup>
+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertAccountMessageCorrectAttempt" />
     </test>
 </tests>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
new file mode 100644
index 0000000000000..cce8a1570682b
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCaptchaRegisterNewCustomerTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="Create New Customer Account + Captcha"/>
+            <title value="Test creation for customer register with captcha on storefront."/>
+            <description value="Test creation for customer register with captcha on storefront."/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-14805" />
+            <group value="captcha"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!--  Enable captcha for customer. -->
+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerCreateFormConfigData.path}} {{StorefrontCaptchaOnCustomerCreateFormConfigData.value}}" stepKey="enableUserRegistrationCaptcha" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaModeAlwaysConfigData.path}} {{StorefrontCustomerCaptchaModeAlwaysConfigData.value}}" stepKey="alwaysEnableCaptcha" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+        </before>
+        <after>
+            <!-- Set default configuration. -->
+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaModeAfterFailConfigData.path}} {{StorefrontCustomerCaptchaModeAfterFailConfigData.value}}" stepKey="defaultCaptchaMode" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+        </after>
+
+        <!-- Open Customer registration page -->
+        <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="goToCustomerAccountCreatePage" />
+
+        <!-- Check captcha visibility registration page load -->
+        <actionGroup ref="AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup" stepKey="verifyCaptchaVisible" />
+
+        <!-- Submit form with incorrect captcha -->
+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup" stepKey="fillNewCustomerAccountFormWithIncorrectCaptcha">
+            <argument name="customer" value="Simple_US_Customer" />
+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
+        </actionGroup>
+
+        <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="clickCreateAnAccountButton" />
+
+        <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="assertMessage">
+            <argument name="message" value="Incorrect CAPTCHA" />
+            <argument name="messageType" value="error" />
+        </actionGroup>
+
+        <actionGroup ref="AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup" stepKey="verifyCaptchaVisibleAfterFail" />
+
+        <!-- Submit form with correct captcha -->
+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup" stepKey="fillNewCustomerAccountFormWithCorrectCaptcha">
+            <argument name="customer" value="Simple_US_Customer" />
+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
+        </actionGroup>
+        <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="clickCreateAnAccountButtonAfterCorrectCaptcha" />
+        <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="assertSuccessMessage" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountActionGroup.xml
new file mode 100644
index 0000000000000..65c9b025a9c2d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountActionGroup.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="AssertMessageCustomerCreateAccountActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="Thank you for registering with Main Website Store." />
+            <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+        <see userInput="{{message}}" selector="{{StorefrontCustomerAccountMainSection.messageByType(messageType)}}" stepKey="verifyMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup.xml
new file mode 100644
index 0000000000000..dfb9d1b2c259a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup">
+        <click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" />
+        <waitForPageLoad stepKey="waitForCustomerSaved" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormActionGroup.xml
new file mode 100644
index 0000000000000..62d77d4548cce
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerAccountCreationFormActionGroup.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="StorefrontFillCustomerAccountCreationFormActionGroup">
+        <arguments>
+            <argument name="customer" type="entity" />
+        </arguments>
+
+        <fillField  stepKey="fillFirstName" userInput="{{customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}" />
+        <fillField  stepKey="fillLastName"  userInput="{{customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}" />
+        <fillField  stepKey="fillEmail" userInput="{{customer.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
+        <fillField  stepKey="fillPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
+        <fillField  stepKey="fillConfirmPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml
new file mode 100644
index 0000000000000..0ae470d0497ab
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerAccountCreatePageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontOpenCustomerAccountCreatePageActionGroup">
+        <amOnPage url="{{StorefrontCustomerCreatePage.url}}" stepKey="goToCustomerAccountCreatePage"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
index 68851e88ec4b2..8881a2a012ce8 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -17,9 +17,6 @@
         <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"/>
-        <element name="captchaField" type="input" selector="#captcha_user_create"/>
-        <element name="captchaImg" type="block" selector=".captcha-img"/>
-        <element name="captchaReload" type="block" selector=".captcha-reload"/>
     </section>
     <section name="StoreFrontCustomerAdvancedAttributesSection">
         <element name="textFieldAttribute" type="input" selector="//input[@id='{{var}}']" parameterized="true" />
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
index 8e83c189efc2f..b0ce6dfa561ae 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontRegisterTest.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\Captcha\Test\TestCase\CaptchaOnStoreFrontRegisterTest" summary="Check CAPTCHA on StoreFront Register Page" ticketId="MAGETWO-43602">
         <variation name="CaptchaOnStoreFrontRegisterTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customer/dataset" xsi:type="string">register_customer</data>
             <data name="customer/data/captcha" xsi:type="string">111</data>
             <data name="configData" xsi:type="string">captcha_storefront_register</data>

From 0394f371726ad2dffb5ee81d87a73e37824be4b8 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 1 Apr 2019 17:15:19 -0500
Subject: [PATCH 0922/1055] GraphQL-480: [Test Coverage] 'GetBillingAddress'
 functionality

---
 ...php => GetSpecifiedBillingAddressTest.php} | 132 +++++++++---------
 ...php => GetSpecifiedBillingAddressTest.php} | 111 ++++++---------
 .../guest_quote_with_addresses_rollback.php   |   2 +-
 3 files changed, 107 insertions(+), 138 deletions(-)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/{GetBillingAddressTest.php => GetSpecifiedBillingAddressTest.php} (68%)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/{GetBillingAddressTest.php => GetSpecifiedBillingAddressTest.php} (63%)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
similarity index 68%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
index 18e33b1b6294b..acf9a4d60358d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
@@ -7,17 +7,15 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-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 get billing address
+ * Test for get specified billing address
  */
-class GetBillingAddressTest extends GraphQlAbstract
+class GetSpecifiedBillingAddressTest extends GraphQlAbstract
 {
     /**
      * @var CustomerTokenServiceInterface
@@ -25,19 +23,9 @@ class GetBillingAddressTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @inheritdoc
@@ -45,25 +33,25 @@ class GetBillingAddressTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
      */
-    public function testGetCartWithBillingAddress()
+    public function testGeSpecifiedBillingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
-        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('billing_address', $response['cart']);
 
         $expectedBillingAddressData = [
             'firstname' => 'John',
@@ -86,41 +74,23 @@ public function testGetCartWithBillingAddress()
             'address_type' => 'BILLING',
             'customer_notes' => null,
         ];
-
         self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     */
-    public function testGetBillingAddressFromAnotherCustomerCart()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
-        $this->expectExceptionMessage(
-            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-        );
-        $this->graphQlQuery(
-            $this->getGetBillingAddressQuery($maskedQuoteId),
-            [],
-            '',
-            $this->getHeaderMap('customer2@search.example.com')
-        );
-    }
-
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
-    public function testGetBillingAddressIfBillingAddressIsNotSet()
+    public function testGeSpecifiedBillingAddressIfBillingAddressIsNotSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
-        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('billing_address', $response['cart']);
 
         $expectedBillingAddressData = [
             'firstname' => null,
@@ -143,7 +113,6 @@ public function testGetBillingAddressIfBillingAddressIsNotSet()
             'address_type' => 'BILLING',
             'customer_notes' => null,
         ];
-
         self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
     }
 
@@ -152,21 +121,60 @@ public function testGetBillingAddressIfBillingAddressIsNotSet()
      * @expectedException \Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
-    public function testGetBillingAddressOfNonExistentCart()
+    public function testGeSpecifiedBillingAddressOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     */
+    public function testGeSpecifiedBillingAddressFromAnotherGuestCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($this->getQuery($maskedQuoteId), [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     */
+    public function testGeSpecifiedBillingAddressFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($this->getQuery($maskedQuoteId),
+            [],
+            '',
+            $this->getHeaderMap('customer2@search.example.com')
+        );
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getGetBillingAddressQuery(
-        string $maskedQuoteId
-    ): string {
+    private function getQuery(string $maskedQuoteId): string
+    {
         return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
@@ -207,16 +215,4 @@ private function getHeaderMap(string $username = 'customer@example.com', string
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
         return $headerMap;
     }
-
-    /**
-     * @param string $reservedOrderId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
similarity index 63%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
index a8a577e3c9288..0110384b8f605 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
@@ -7,32 +7,19 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Test for get billing address
+ * Test for get specified billing address
  */
-class GetBillingAddressTest extends GraphQlAbstract
+class GetSpecifiedBillingAddressTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @inheritdoc
@@ -40,22 +27,23 @@ class GetBillingAddressTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
      */
-    public function testGetCartWithBillingAddress()
+    public function testGeSpecifiedBillingAddress()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
-        $response = $this->graphQlQuery($this->getGetBillingAddressQuery($maskedQuoteId));
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $response = $this->graphQlQuery($query);
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('billing_address', $response['cart']);
 
         $expectedBillingAddressData = [
             'firstname' => 'John',
@@ -77,41 +65,22 @@ public function testGetCartWithBillingAddress()
             'telephone' => '3468676',
             'address_type' => 'BILLING',
         ];
-
         self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
-     */
-    public function testGetBillingAddressFromAnotherCustomerCart()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
-        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
-
-        $this->expectExceptionMessage(
-            "The current user cannot perform operations on cart \"$maskedQuoteId\""
-        );
-
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      */
-    public function testGetBillingAddressIfBillingAddressIsNotSet()
+    public function testGeSpecifiedBillingAddressIfBillingAddressIsNotSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_quote');
-        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
         $response = $this->graphQlQuery($query);
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('billing_address', $response['cart']);
 
         $expectedBillingAddressData = [
             'firstname' => null,
@@ -133,7 +102,6 @@ public function testGetBillingAddressIfBillingAddressIsNotSet()
             'telephone' => null,
             'address_type' => 'BILLING',
         ];
-
         self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
     }
 
@@ -144,7 +112,25 @@ public function testGetBillingAddressIfBillingAddressIsNotSet()
     public function testGetBillingAddressOfNonExistentCart()
     {
         $maskedQuoteId = 'non_existent_masked_id';
-        $query = $this->getGetBillingAddressQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     */
+    public function testGetBillingAddressFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
         $this->graphQlQuery($query);
     }
 
@@ -152,9 +138,8 @@ public function testGetBillingAddressOfNonExistentCart()
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getGetBillingAddressQuery(
-        string $maskedQuoteId
-    ): string {
+    private function getQuery(string $maskedQuoteId): string
+    {
         return <<<QUERY
 {
   cart(cart_id: "$maskedQuoteId") {
@@ -182,16 +167,4 @@ private function getGetBillingAddressQuery(
 }
 QUERY;
     }
-
-    /**
-     * @param string $reservedOrderId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
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
index fd1f20b90b535..e8992aec3c924 100644
--- 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
@@ -19,7 +19,7 @@
 $quote->load('guest_quote', 'reserved_order_id');
 
 $quoteId = $quote->getId();
-if ($quoteId > 0) {
+if (null !== $quoteId) {
     $quote->delete();
     $quoteIdMask->delete($quoteId);
 }

From ba6c5239689f5b7cfc09f03042284742b00499e7 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Tue, 2 Apr 2019 01:52:56 +0300
Subject: [PATCH 0923/1055] magento/graphql-ce#540: Replace deprecated
 Magento/Checkout/_files/quote_with_address_saved.php fixture in
 SetUpsShippingMethodsOnCartTest

---
 .../Ups/SetUpsShippingMethodsOnCartTest.php       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index 9ad47319cac1a..32e9cbf990523 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -8,8 +8,8 @@
 namespace Magento\GraphQl\Ups;
 
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -30,9 +30,9 @@ class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
     const CARRIER_METHOD_CODE_GROUND = 'GND';
 
     /**
-     * @var Quote
+     * @var GetQuoteShippingAddressIdByReservedQuoteId
      */
-    private $quote;
+    private $getQuoteShippingAddressIdByReservedQuoteId;
 
     /**
      * @var CustomerTokenServiceInterface
@@ -50,9 +50,9 @@ class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quote = $objectManager->create(Quote::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(GetQuoteShippingAddressIdByReservedQuoteId::class);
     }
 
     /**
@@ -67,10 +67,9 @@ public function testSetUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-        $quote = $this->quote->load($quoteReservedId, 'reserved_order_id');
-        $shippingAddressId = (int)$quote->getShippingAddress()->getId();
+        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
-        $query = $this->getAddUpsShippingMethodQuery(
+        $query = $this->getQuery(
             $maskedQuoteId,
             $shippingAddressId,
             self::CARRIER_CODE,
@@ -96,7 +95,7 @@ public function testSetUpsShippingMethod()
      * @param string $methodCode
      * @return string
      */
-    private function getAddUpsShippingMethodQuery(
+    private function getQuery(
         string $maskedQuoteId,
         int $shippingAddressId,
         string $carrierCode,

From 41d6d26e72b106ac9809cfe98cf6ecdc8bfdf793 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Tue, 2 Apr 2019 02:03:27 +0300
Subject: [PATCH 0924/1055] magento/graphql-ce#559: Fix misspelling in
 GetQuoteShippingAddressIdByReservedQuoteId

---
 .../Quote/GetQuoteShippingAddressIdByReservedQuoteId.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php
index fa42ad4d71fb2..a56949b6f563a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteShippingAddressIdByReservedQuoteId.php
@@ -40,13 +40,13 @@ public function __construct(
     /**
      * Get quote shipping address id by reserved order id
      *
-     * @param string $reversedOrderId
+     * @param string $reservedOrderId
      * @return int
      */
-    public function execute(string $reversedOrderId): int
+    public function execute(string $reservedOrderId): int
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
 
         return (int)$quote->getShippingAddress()->getId();
     }

From 7826c4ff2d8b4868aa9f81e367514060cf1ef89b Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 1 Apr 2019 19:36:26 -0500
Subject: [PATCH 0925/1055] GraphQL-423: Test coverage:
 SetShippingMethodsOnCartTest for Customer

---
 .../GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 7d4decd248bbd..ca26f8fe5aaf0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -80,8 +80,10 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
      * is not set)
      *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
      *
      * @expectedException \Exception
      * @expectedExceptionMessage The shipping address is missing. Set the address and try again.

From 346c5144c0227cc0c9c74a325ec17477bff227fd Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 1 Apr 2019 19:43:58 -0500
Subject: [PATCH 0926/1055] GraphQL-480: [Test Coverage] 'GetBillingAddress'
 functionality

---
 .../GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
index acf9a4d60358d..4396f5fbac189 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
@@ -162,7 +162,8 @@ public function testGeSpecifiedBillingAddressFromAnotherCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($this->getQuery($maskedQuoteId),
+        $this->graphQlQuery(
+            $this->getQuery($maskedQuoteId),
             [],
             '',
             $this->getHeaderMap('customer2@search.example.com')

From 0d26a783350f67ace816e172349b0b153344e615 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 1 Apr 2019 23:19:05 -0500
Subject: [PATCH 0927/1055] GraphQL-423: Test coverage:
 SetShippingMethodsOnCartTest for Customer

---
 .../Customer/SetShippingMethodsOnCartTest.php | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 4f0f2efc2447a..29ddbefd8e405 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -83,37 +83,6 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
         self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
     }
 
-    /**
-     * Shipping address for quote will be created automatically BUT with NULL values (considered that address
-     * is not set)
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-     *
-     * @expectedException \Exception
-     * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
-     */
-    public function testSetShippingMethodOnCartWithSimpleProductAndWithoutAddress()
-    {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
-        $carrierCode = 'flatrate';
-        $methodCode = 'flatrate';
-        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
-
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $methodCode,
-            $carrierCode,
-            $quoteAddressId
-        );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php

From 061aa982a7acd99294c67d1187e997f96432bb55 Mon Sep 17 00:00:00 2001
From: Evgeny Petrov <evgeny_petrov@epam.com>
Date: Tue, 2 Apr 2019 08:20:22 +0300
Subject: [PATCH 0928/1055] MAGETWO-58764: [GitHub] Minimal Query Length For
 Catalog Search #6681

---
 .../Adapter/Mysql/Query/Builder/Match.php     | 37 +++++++++++++++++--
 .../Adapter/Mysql/Query/Builder/Match.php     | 12 +-----
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
index f5b06d9715d8d..ffdabdb55bee9 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -9,8 +9,9 @@
 
 use Magento\Framework\DB\Helper\Mysql\Fulltext;
 use Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface;
-use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
 use Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match as BuilderMatch;
+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
+use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Search\Helper\Data;
 
 /**
@@ -23,6 +24,11 @@ class Match extends BuilderMatch
      */
     private $searchHelper;
 
+    /**
+     * @var string[]
+     */
+    private $replaceSymbols = [];
+
     /**
      * @param ResolverInterface $resolver
      * @param Fulltext $fulltextHelper
@@ -44,8 +50,33 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    protected function getMinimalCharacterLength()
+    protected function prepareQuery($queryValue, $conditionType)
     {
-        return $this->searchHelper->getMinQueryLength();
+        $queryValue = str_replace($this->replaceSymbols, ' ', $queryValue);
+        foreach ($this->preprocessors as $preprocessor) {
+            $queryValue = $preprocessor->process($queryValue);
+        }
+
+        $stringPrefix = '';
+        if ($conditionType === BoolExpression::QUERY_CONDITION_MUST) {
+            $stringPrefix = '+';
+        } elseif ($conditionType === BoolExpression::QUERY_CONDITION_NOT) {
+            $stringPrefix = '-';
+        }
+
+        $queryValues = explode(' ', $queryValue);
+
+        foreach ($queryValues as $queryKey => $queryValue) {
+            if (empty($queryValue)) {
+                unset($queryValues[$queryKey]);
+            } else {
+                $stringSuffix = $this->searchHelper->getMinQueryLength() > strlen($queryValue) ? '' : '*';
+                $queryValues[$queryKey] = $stringPrefix . $queryValue . $stringSuffix;
+            }
+        }
+
+        $queryValue = implode(' ', $queryValues);
+
+        return $queryValue;
     }
 }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
index c881dd9b49079..d4c98cda17e12 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -148,7 +148,7 @@ protected function prepareQuery($queryValue, $conditionType)
             if (empty($queryValue)) {
                 unset($queryValues[$queryKey]);
             } else {
-                $stringSuffix = $this->getMinimalCharacterLength() > strlen($queryValue) ? '' : '*';
+                $stringSuffix = self::MINIMAL_CHARACTER_LENGTH > strlen($queryValue) ? '' : '*';
                 $queryValues[$queryKey] = $stringPrefix . $queryValue . $stringSuffix;
             }
         }
@@ -157,14 +157,4 @@ protected function prepareQuery($queryValue, $conditionType)
 
         return $queryValue;
     }
-
-    /**
-     * Retrieves minimal character length
-     *
-     * @return int
-     */
-    protected function getMinimalCharacterLength()
-    {
-        return self::MINIMAL_CHARACTER_LENGTH;
-    }
 }

From 9d0917707b25847598554fdd85d854ade467ce4b Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Tue, 2 Apr 2019 09:24:23 +0300
Subject: [PATCH 0929/1055] MAGETWO-98886: Gift Card Accounts: expiration date
 subtracts one day

---
 lib/internal/Magento/Framework/Data/Form/Element/Date.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
index 28e9a18337c68..6e4e97dbac79d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -101,7 +101,7 @@ public function setValue($value)
         try {
             if (preg_match('/^[0-9]+$/', $value)) {
                 $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
-            } else if (is_string($value) && $this->isDate($value)) {
+            } elseif (is_string($value) && $this->isDate($value)) {
                 $this->_value = new \DateTime($value, new \DateTimeZone($this->localeDate->getConfigTimezone()));
             } else {
                 $this->_value = '';

From 7b6a620b7c3b1b2faf12a190398d7d2f2e3a9644 Mon Sep 17 00:00:00 2001
From: serhii balko <serhii.balko@transoftgroup.com>
Date: Tue, 2 Apr 2019 10:52:23 +0300
Subject: [PATCH 0930/1055] MAGETWO-98335: Unable to find product on product
 grid page using store view level attribute

---
 .../Catalog/Ui/DataProvider/Product/ProductCollection.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
index 37ac5c85c6f67..e5451c8e49847 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
@@ -13,6 +13,8 @@
  * Collection which is used for rendering product list in the backend.
  *
  * Used for product grid and customizes behavior of the default Product collection for grid needs.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {

From 844fc58ba48425d6231a2c55e2f6949102421316 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Tue, 2 Apr 2019 11:18:42 +0300
Subject: [PATCH 0931/1055] magento/graphql-ce#540: Replace deprecated
 Magento/Checkout/_files/quote_with_address_saved.php fixture in
 SetUpsShippingMethodsOnCartTest

---
 .../Ups/SetUpsShippingMethodsOnCartTest.php   | 137 ++++++++++++++++--
 1 file changed, 122 insertions(+), 15 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index 32e9cbf990523..838017b3455df 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -10,7 +10,6 @@
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -20,19 +19,14 @@
 class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
 {
     /**
-     * Defines carrier code for "UPS" shipping method
-     */
-    const CARRIER_CODE = 'ups';
-
-    /**
-     * Defines method code for the "Ground" UPS shipping
+     * Defines carrier label for "UPS" shipping method
      */
-    const CARRIER_METHOD_CODE_GROUND = 'GND';
+    const CARRIER_LABEL = 'United Parcel Service';
 
     /**
-     * @var GetQuoteShippingAddressIdByReservedQuoteId
+     * Defines carrier code for "UPS" shipping method
      */
-    private $getQuoteShippingAddressIdByReservedQuoteId;
+    const CARRIER_CODE = 'ups';
 
     /**
      * @var CustomerTokenServiceInterface
@@ -44,6 +38,11 @@ class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
+    /**
+     * @var GetQuoteShippingAddressIdByReservedQuoteId
+     */
+    private $getQuoteShippingAddressIdByReservedQuoteId;
+
     /**
      * @inheritdoc
      */
@@ -57,13 +56,17 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     *
+     * @param string $carrierMethodCode
+     * @param string $carrierMethodLabel
+     * @dataProvider availableForCartShippingMethods
      */
-    public function testSetUpsShippingMethod()
+    public function testSetAvailableForCartUpsShippingMethod(string $carrierMethodCode, string $carrierMethodLabel)
     {
         $quoteReservedId = 'test_quote';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
@@ -73,19 +76,123 @@ public function testSetUpsShippingMethod()
             $maskedQuoteId,
             $shippingAddressId,
             self::CARRIER_CODE,
-            self::CARRIER_METHOD_CODE_GROUND
+            $carrierMethodCode
         );
 
         $response = $this->sendRequestWithToken($query);
+
         $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
         $expectedResult = [
             'carrier_code' => self::CARRIER_CODE,
-            'method_code' => self::CARRIER_METHOD_CODE_GROUND,
-            'label' => 'United Parcel Service - Ground',
+            'method_code' => $carrierMethodCode,
+            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
         ];
         self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     *
+     * @param string $carrierMethodCode
+     * @param string $carrierMethodLabel
+     * @dataProvider notAvailableForCartShippingMethods
+     */
+    public function testSetNotAvailableForCartUpsShippingMethod(string $carrierMethodCode, string $carrierMethodLabel)
+    {
+        $quoteReservedId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
+        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $shippingAddressId,
+            self::CARRIER_CODE,
+            $carrierMethodCode
+        );
+
+        $this->expectExceptionMessage(
+            "GraphQL response contains errors: Carrier with such method not found: " . self::CARRIER_CODE . ", " . $carrierMethodCode
+        );
+
+        $response = $this->sendRequestWithToken($query);
+
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        $expectedResult = [
+            'carrier_code' => self::CARRIER_CODE,
+            'method_code' => $carrierMethodCode,
+            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
+        ];
+        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+    }
+
+    /**
+     * @return array
+     */
+    public function availableForCartShippingMethods(): array
+    {
+        $shippingMethods = ['1DM', '1DA', '2DA', '3DS', 'GND'];
+
+        return $this->filterShippingMethodsByCodes($shippingMethods);
+    }
+
+    /**
+     * @return array
+     */
+    public function notAvailableForCartShippingMethods(): array
+    {
+        $shippingMethods = ['1DML', '1DAL', '1DAPI', '1DP', '1DPL', '2DM', '2DML', '2DAL', 'GNDCOM', 'GNDRES', 'STD', 'XPR', 'WXS', 'XPRL', 'XDM', 'XDML', 'XPD'];
+
+        return $this->filterShippingMethodsByCodes($shippingMethods);
+    }
+
+    /**
+     * @param array $filter
+     * @return array
+     */
+    private function filterShippingMethodsByCodes(array $filter):array
+    {
+        $result = [];
+        foreach ($this->getAllUpsShippingMethods() as $shippingMethod) {
+            if (in_array($shippingMethod[0], $filter)) {
+                $result[] = $shippingMethod;
+            }
+        }
+        return $result;
+    }
+
+    private function getAllUpsShippingMethods():array
+    {
+        return [
+            ['1DM', 'Next Day Air Early AM'],
+            ['1DML', 'Next Day Air Early AM Letter'],
+            ['1DA', 'Next Day Air'],
+            ['1DAL', 'Next Day Air Letter'],
+            ['1DAPI', 'Next Day Air Intra (Puerto Rico)'],
+            ['1DP', 'Next Day Air Saver'],
+            ['1DPL', 'Next Day Air Saver Letter'],
+            ['2DM', '2nd Day Air AM'],
+            ['2DML', '2nd Day Air AM Letter'],
+            ['2DA', '2nd Day Air'],
+            ['2DAL', '2nd Day Air Letter'],
+            ['3DS', '3 Day Select'],
+            ['GND', 'Ground'],
+            ['GNDCOM', 'Ground Commercial'],
+            ['GNDRES', 'Ground Residential'],
+            ['STD', 'Canada Standard'],
+            ['XPR', 'Worldwide Express'],
+            ['WXS', 'Worldwide Express Saver'],
+            ['XPRL', 'Worldwide Express Letter'],
+            ['XDM', 'Worldwide Express Plus'],
+            ['XDML', 'Worldwide Express Plus Letter'],
+            ['XPD', 'Worldwide Expedited'],
+        ];
+    }
+
     /**
      * Generates query for setting the specified shipping method on cart
      *

From 5b1789ed84192f73d0bb3f04e6d4c9e7db279d03 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Tue, 2 Apr 2019 11:32:13 +0300
Subject: [PATCH 0932/1055] magento/graphql-ce#559: Fix misspelling in
 GetQuoteShippingAddressIdByReservedQuoteId

---
 .../Quote/Customer/SetBillingAddressOnCartTest.php   |  6 +++---
 .../Quote/Customer/SetShippingAddressOnCartTest.php  |  6 +++---
 .../Quote/Customer/SetShippingMethodsOnCartTest.php  | 12 ++++++------
 .../Quote/GetMaskedQuoteIdByReservedOrderId.php      |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 88e7b93dd1d08..46e4fed4c113d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -568,16 +568,16 @@ private function getHeaderMap(string $username = 'customer@example.com', string
     }
 
     /**
-     * @param string $reversedOrderId
+     * @param string $reservedOrderId
      * @param int $customerId
      * @return string
      */
     private function assignQuoteToCustomer(
-        string $reversedOrderId = 'test_order_with_simple_product_without_address',
+        string $reservedOrderId = 'test_order_with_simple_product_without_address',
         int $customerId = 1
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
         $quote->setCustomerId($customerId);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 5ff29d20b34d7..a47aeed1f2fee 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -541,16 +541,16 @@ private function getHeaderMap(string $username = 'customer@example.com', string
     }
 
     /**
-     * @param string $reversedOrderId
+     * @param string $reservedOrderId
      * @param int $customerId
      * @return string
      */
     private function assignQuoteToCustomer(
-        string $reversedOrderId = 'test_order_with_simple_product_without_address',
+        string $reservedOrderId = 'test_order_with_simple_product_without_address',
         int $customerId = 1
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
         $quote->setCustomerId($customerId);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index b5634f51cb366..a01761363e42b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -162,30 +162,30 @@ private function prepareMutationQuery(
     }
 
     /**
-     * @param string $reversedOrderId
+     * @param string $reservedOrderId
      * @return string
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
-    private function getMaskedQuoteIdByReservedOrderId(string $reversedOrderId): string
+    private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }
 
     /**
-     * @param string $reversedOrderId
+     * @param string $reservedOrderId
      * @param int $customerId
      * @return string
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function assignQuoteToCustomer(
-        string $reversedOrderId,
+        string $reservedOrderId,
         int $customerId
     ): string {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
         $quote->setCustomerId($customerId);
         $this->quoteResource->save($quote);
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
index eab362c3a0a6f..9bb9bef9bdb09 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetMaskedQuoteIdByReservedOrderId.php
@@ -50,14 +50,14 @@ public function __construct(
     /**
      * Get masked quote id by reserved order id
      *
-     * @param string $reversedOrderId
+     * @param string $reservedOrderId
      * @return string
      * @throws NoSuchEntityException
      */
-    public function execute(string $reversedOrderId): string
+    public function execute(string $reservedOrderId): string
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
 
         return $this->quoteIdToMaskedId->execute((int)$quote->getId());
     }

From cb0ed4012a022ad32045d80e7e3f7780b4072ba0 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Tue, 2 Apr 2019 11:45:51 +0300
Subject: [PATCH 0933/1055] MAGETWO-58226: Calendar Custom Options are
 displayed broken on Storefront if JS validation is performed

- Fix static
---
 .../Magento/Catalog/Test/Block/Product/View/CustomOptions.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index 99ff9b73b92eb..4e8e0f97d70d5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -149,6 +149,7 @@ public function getOptions(FixtureInterface $product)
         foreach ($dataOptions as $option) {
             $title = $option['title'];
             if (!isset($listCustomOptions[$title])) {
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new \Exception("Can't find option: \"{$title}\"");
             }
 

From 3eb35194059903766b5eb7bb14e7d8d1c67e4f5f Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Tue, 2 Apr 2019 11:58:48 +0300
Subject: [PATCH 0934/1055] MAGETWO-65232: Product name does not display
 special characters properly

- Updated automated test script.
---
 .../Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml   | 2 --
 .../Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml    | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
index 85c54e0942c74..8316f54c15a52 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
@@ -65,10 +65,8 @@
             </actionGroup>
             <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
             <deleteData createDataKey="product" stepKey="deleteFirstProduct"/>
-
             <magentoCLI stepKey="reindex" command="indexer:reindex"/>
             <magentoCLI stepKey="flushCache" command="cache:flush"/>
-            
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index 7c971f3b04457..b90bac7e0881b 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -19,18 +19,15 @@
         <see selector="{{AdminInvoiceOrderInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
         <see selector="{{AdminInvoiceOrderInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
         <see selector="{{AdminInvoiceOrderInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
-
         <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
         <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
         <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country_id}}" stepKey="seeBillingAddressCountry"/>
         <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
-
         <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
         <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
         <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country_id}}" stepKey="seeShippingAddressCountry"/>
         <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
     </actionGroup>
-
     <!--Check that product is in invoice items-->
     <actionGroup name="seeProductInInvoiceItems">
         <arguments>
@@ -38,7 +35,6 @@
         </arguments>
         <see selector="{{AdminInvoiceItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
     </actionGroup>
-
     <!--Admin Fast Create Invoice-->
     <actionGroup name="adminFastCreateInvoice">
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
@@ -50,26 +46,22 @@
         <click selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="openInvoicePage"/>
         <waitForPageLoad stepKey="waitForInvoicePageLoad"/>
     </actionGroup>
-
     <actionGroup name="clearInvoicesGridFilters">
         <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
         <waitForPageLoad stepKey="waitInvoicesGridToLoad"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters" />
         <waitForPageLoad stepKey="waitInvoicesGrid"/>
     </actionGroup>
-
     <actionGroup name="goToInvoiceIntoOrder">
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
         <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeOrderInvoiceUrl"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
     </actionGroup>
-
     <actionGroup name="StartCreateInvoiceFromOrderPage">
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
         <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeNewInvoiceUrl"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoicePageTitle"/>
     </actionGroup>
-
     <actionGroup name="SubmitInvoice">
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
         <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
@@ -77,7 +69,6 @@
         <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPageInvoice"/>
     </actionGroup>
-
     <!--Filter invoices by order id -->
     <actionGroup name="filterInvoiceGridByOrderId">
         <arguments>

From 5fd06db19bdf5cfbf8ea4c7f956b2d4bd200d4d1 Mon Sep 17 00:00:00 2001
From: Aliaksei Yakimovich2 <aliaksei_yakimovich2@epam.com>
Date: Tue, 2 Apr 2019 12:23:11 +0300
Subject: [PATCH 0935/1055] MAGETWO-64838: Unable to create order from store
 front if customer address custom attribute is required.

- Fixed static tests;
---
 lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index f93d7efda5c8a..c253a400bed93 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -275,6 +275,7 @@ protected function _createFromArray($className, $data)
                     } else {
                         $setterValue = $this->convertValue($value, $returnType);
                     }
+                // phpcs:ignore Magento2.Exceptions.ThrowCatch
                 } catch (SerializationException $e) {
                     throw new SerializationException(
                         new Phrase(
@@ -323,6 +324,7 @@ protected function convertCustomAttributeValue($customAttributesValueArray, $dat
             ) {
                 try {
                     $attributeValue = $this->convertValue($customAttributeValue, $type);
+                // phpcs:ignore Magento2.Exceptions.ThrowCatch
                 } catch (SerializationException $e) {
                     throw new SerializationException(
                         new Phrase(

From 1f3d9bc261b6d2038c31737446533c8796777b1f Mon Sep 17 00:00:00 2001
From: Evgeny Petrov <evgeny_petrov@epam.com>
Date: Tue, 2 Apr 2019 14:22:09 +0300
Subject: [PATCH 0936/1055] MAGETWO-58764: [GitHub] Minimal Query Length For
 Catalog Search #6681

---
 .../Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
index e60be3729834a..b9ef37cb4effe 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
@@ -21,7 +21,6 @@
         <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
         <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
         <fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
-        <scrollTo selector="{{AdminConfigCatalogCategoryPermissionsSection.catalogPermissionsTab}}" stepKey="scrollToCatalogPermissionsTab"/>
         <click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForConfigSaved"/>

From a6ef1186bf5003b6e9868eb96ab36d079407b3a9 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 2 Apr 2019 15:03:07 +0300
Subject: [PATCH 0937/1055] magento/magento2#21767: Static test fix.

---
 .../Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
index b339ed55bf691..e6ec123823854 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Event\Test\Unit\Invoker;
 
+/**
+ * Test for Magento\Framework\Event\Invoker\InvokerDefault.
+ */
 class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
 {
     /**

From 3e0836e142b3e48c9d3644e8e1a6044a31aeeaad Mon Sep 17 00:00:00 2001
From: Yuriy <yvechirko@magecom.net>
Date: Tue, 2 Apr 2019 16:13:58 +0300
Subject: [PATCH 0938/1055] Previous scrolling to invalid form element is not
 being canceled on hitting submit multiple times #21715

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

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index a57191fd4aff4..73c5ef4d4f02f 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1958,7 +1958,7 @@
             }
 
             if (firstActive.length) {
-                $('html, body').animate({
+                $('html, body').stop().animate({
                     scrollTop: firstActive.offset().top
                 });
                 firstActive.focus();

From 0c3d6b75e0c45d31e75119e26015e4f6f1e7516d Mon Sep 17 00:00:00 2001
From: Evgeny Petrov <evgeny_petrov@epam.com>
Date: Tue, 2 Apr 2019 16:14:59 +0300
Subject: [PATCH 0939/1055] MAGETWO-58764: [GitHub] Minimal Query Length For
 Catalog Search #6681

---
 .../Model/Search/Adapter/Mysql/Query/Builder/Match.php           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
index ffdabdb55bee9..8f5aa73e9d12c 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -44,6 +44,7 @@ public function __construct(
         array $preprocessors = []
     ) {
         parent::__construct($resolver, $fulltextHelper, $fulltextSearchMode, $preprocessors);
+        $this->replaceSymbols = str_split(self::SPECIAL_CHARACTERS, 1);
         $this->searchHelper = $searchHelper;
     }
 

From a448ee502f8ede1b34e133572ce6fc0e52440846 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Tue, 2 Apr 2019 10:13:42 -0500
Subject: [PATCH 0940/1055] MC-15439: Deferred loading / parsing of JS

---
 app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index 19ef31b2a41b4..a81f29280af96 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -20,8 +20,7 @@ public function beforeSendResponse(\Magento\Framework\App\Response\Http $subject
     {
         $content = $subject->getContent();
         $script = [];
-        if (strpos($content, '</body') > 0) {
-            $content = preg_replace('#<!--(?!\s?/?ko).*?-->#s', '', $content);
+        if (strpos($content, '</body') !== false) {
             $pattern = '#<script[^>]*+(?<!text/x-magento-template.)>.*?</script>#is';
             $content = preg_replace_callback(
                 $pattern,
@@ -36,4 +35,4 @@ function ($matchPart) use (&$script) {
             );
         }
     }
-}
\ No newline at end of file
+}

From 4c002ee963b7ae6e72189412c2c431d138428489 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Tue, 2 Apr 2019 10:45:59 -0500
Subject: [PATCH 0941/1055] Minor fixes for
 magento/magento-functional-tests-migration#686

 - update test annotations
 - provided additional verification of CAPTCHA
---
 ...tVisibleOnCustomerLoginFormActionGroup.xml | 22 ++++++
 ...aVisibleOnCustomerLoginFormActionGroup.xml | 21 +++++
 ...ustomerLoginFormWithCaptchaActionGroup.xml | 17 ++++
 .../StorefrontCustomerSignInFormSection.xml   |  2 +-
 ...orefrontCustomerSignInPopupFormSection.xml | 16 ++++
 .../Test/CaptchaOnStoreFrontLoginTest.xml     | 62 ---------------
 .../StorefrontCaptchaOnCustomerLoginTest.xml  | 79 +++++++++++++++++++
 .../AssertCustomerLoggedInActionGroup.xml     | 17 ++++
 .../AssertMessageCustomerLoginActionGroup.xml | 18 +++++
 ...lickSignOnCustomerLoginFormActionGroup.xml | 15 ++++
 ...efrontFillCustomerLoginFormActionGroup.xml | 19 +++++
 ...efrontOpenCustomerLoginPageActionGroup.xml | 15 ++++
 ...StorefrontCustomerLoginMessagesSection.xml |  1 +
 .../StorefrontCustomerSignInFormSection.xml   |  5 +-
 .../Section/StorefrontPanelHeaderSection.xml  |  3 +
 15 files changed, 245 insertions(+), 67 deletions(-)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInPopupFormSection.xml
 delete mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontLoginTest.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerLoggedInActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerLoginActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignOnCustomerLoginFormActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerLoginPageActionGroup.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.xml
new file mode 100644
index 0000000000000..a371f177e3552
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup.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="AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup">
+        <waitForPageLoad stepKey="waitForPageLoaded" />
+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="dontSeeCaptchaField"/>
+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="dontSeeCaptchaImage"/>
+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="dontSeeCaptchaReloadButton"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageReloaded" />
+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="dontSeeCaptchaFieldAfterPageReload"/>
+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="dontSeeCaptchaImageAfterPageReload"/>
+        <dontSee selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="dontSeeCaptchaReloadButtonAfterPageReload"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.xml
new file mode 100644
index 0000000000000..5616b099c026d
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerLoginFormActionGroup.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="AssertCaptchaVisibleOnCustomerLoginFormActionGroup">
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="waitToSeeCaptchaField"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="waitToSeeCaptchaImage"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButton"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageReloaded" />
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="waitToSeeCaptchaFieldAfterPageReload"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="waitToSeeCaptchaImageAfterPageReload"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButtonAfterPageReload"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml
new file mode 100644
index 0000000000000..5ad727a8fe99d
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormWithCaptchaActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="StorefrontFillCustomerLoginFormWithCaptchaActionGroup" extends="StorefrontFillCustomerLoginFormActionGroup">
+        <arguments>
+            <argument name="captcha" type="string" />
+        </arguments>
+        <fillField stepKey="fillCaptchaField" after="fillPassword" userInput="{{captcha}}" selector="{{StorefrontCustomerSignInFormSection.captchaField}}" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
index 7a0557c4a2744..54aa36d1ca267 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInFormSection.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="StorefrontCustomerSignInPopupFormSection">
+    <section name="StorefrontCustomerSignInFormSection">
         <element name="captchaField" type="input" selector="#captcha_user_login"/>
         <element name="captchaImg" type="block" selector=".captcha-img"/>
         <element name="captchaReload" type="block" selector=".captcha-reload"/>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInPopupFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInPopupFormSection.xml
new file mode 100644
index 0000000000000..7a0557c4a2744
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontCustomerSignInPopupFormSection.xml
@@ -0,0 +1,16 @@
+<?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="StorefrontCustomerSignInPopupFormSection">
+        <element name="captchaField" type="input" selector="#captcha_user_login"/>
+        <element name="captchaImg" type="block" selector=".captcha-img"/>
+        <element name="captchaReload" type="block" selector=".captcha-reload"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontLoginTest.xml
deleted file mode 100644
index 59de69b1d2b0d..0000000000000
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnStoreFrontLoginTest.xml
+++ /dev/null
@@ -1,62 +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="CaptchaOnStoreFrontLoginTest">
-        <annotations>
-            <features value="Captcha"/>
-            <stories value="Check CAPTCHA on Storefront Login Page."/>
-            <title value="Captcha customer login page test"/>
-            <description value="Check CAPTCHA on Storefront Login Page."/>
-            <severity value="MAJOR"/>
-            <group value="captcha"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <createData entity="Simple_US_Customer" stepKey="customer"/>
-        </before>
-        <after>
-            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-        </after>
-
-        <!-- Open storefront login form -->
-        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-        <waitForPageLoad stepKey="waitForStorefrontLoginPage"/>
-
-        <!-- Login with wrong credentials 3 times -->
-        <fillField selector="{{StorefrontCustomerSignInFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail1"/>
-        <fillField selector="{{StorefrontCustomerSignInFormSection.passwordField}}" userInput="$$customer.password$$INVALID" stepKey="fillPassword1" />
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton1"/>
-        <see selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." stepKey="seeErrorMessage1" />
-        <dontSee selector="StorefrontCustomerSignInFormSection.captchaField" stepKey="dontSeeCaptchaInputField1"/>
-
-        <fillField selector="{{StorefrontCustomerSignInFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail2"/>
-        <fillField selector="{{StorefrontCustomerSignInFormSection.passwordField}}" userInput="$$customer.password$$INVALID" stepKey="fillPassword2" />
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton2"/>
-        <see selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." stepKey="seeErrorMessage2" />
-        <dontSee selector="StorefrontCustomerSignInFormSection.captchaField" stepKey="dontSeeCaptchaInputField2"/>
-
-        <fillField selector="{{StorefrontCustomerSignInFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail3"/>
-        <fillField selector="{{StorefrontCustomerSignInFormSection.passwordField}}" userInput="$$customer.password$$INVALID" stepKey="fillPassword3" />
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton3"/>
-        <see selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." stepKey="seeErrorMessage3" />
-
-        <!-- Check captcha visibility on login page  -->
-        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaField}}" stepKey="seeCaptchaField"/>
-        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
-        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
-
-        <!-- Submit form with incorrect captcha -->
-        <fillField selector="{{StorefrontCustomerSignInFormSection.emailField}}"  userInput="$$customer.email$$" stepKey="fillEmail4"/>
-        <fillField selector="{{StorefrontCustomerSignInFormSection.passwordField}}" userInput="$$customer.password$$INVALID" stepKey="fillPassword4" />
-        <fillField selector="{{StorefrontCustomerSignInFormSection.captchaField}}" userInput="InvalidCaptcha" stepKey="fillCaptcha" />
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton4"/>
-        <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage4"/>
-    </test>
-</tests>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
new file mode 100644
index 0000000000000..ea63037b0551d
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.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="StorefrontCaptchaOnCustomerLoginTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="Login with Customer Account + Captcha"/>
+            <title value="Captcha customer login page test"/>
+            <description value="Check CAPTCHA on Storefront Login Page."/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-14010" />
+            <group value="captcha"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!-- Open storefront login form -->
+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage" />
+
+        <!-- Login with wrong credentials 3 times -->
+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormFirstAttempt">
+            <argument name="customer" value="Colorado_US_Customer" />
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFirstAttempt" />
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterFirstAttempt" />
+        <actionGroup ref="AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup" stepKey="dontSeeCaptchaAfterFirstAttempt" />
+
+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormSecondAttempt">
+            <argument name="customer" value="Colorado_US_Customer" />
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonSecondAttempt" />
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterSecondAttempt" />
+        <actionGroup ref="AssertCaptchaNotVisibleOnCustomerLoginFormActionGroup" stepKey="dontSeeCaptchaAfterSecondAttempt" />
+
+        <actionGroup ref="StorefrontFillCustomerLoginFormActionGroup" stepKey="fillLoginFormThirdAttempt">
+            <argument name="customer" value="Colorado_US_Customer" />
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonThirdAttempt" />
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterThirdAttempt" />
+        <actionGroup ref="AssertCaptchaVisibleOnCustomerLoginFormActionGroup" stepKey="dontSeeCaptchaAfterThirdAttempt" />
+
+        <!-- Submit form with incorrect captcha -->
+        <actionGroup ref="StorefrontFillCustomerLoginFormWithCaptchaActionGroup" stepKey="fillLoginFormCorrectAccountIncorrectCaptcha">
+            <argument name="customer" value="$$customer$$" />
+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonCorrectAccountIncorrectCaptcha" />
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterIncorrectCaptcha">
+            <argument name="message" value="Incorrect CAPTCHA" />
+        </actionGroup>
+
+        <actionGroup ref="StorefrontFillCustomerLoginFormWithCaptchaActionGroup" stepKey="fillLoginFormCorrectAccountCorrectCaptcha">
+            <argument name="customer" value="$$customer$$" />
+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonCorrectAccountCorrectCaptcha" />
+        <actionGroup ref="AssertCustomerWelcomeMessageActionGroup" stepKey="assertCustomerLoggedIn">
+            <argument name="customerFullName" value="$$customer.firstname$$ $$customer.lastname$$" />
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerLoggedInActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerLoggedInActionGroup.xml
new file mode 100644
index 0000000000000..d9da950fe7115
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerLoggedInActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="AssertCustomerWelcomeMessageActionGroup">
+        <arguments>
+            <argument name="customerFullName" type="string" />
+        </arguments>
+        <see userInput="Welcome, {{customerFullName}}!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="verifyMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerLoginActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerLoginActionGroup.xml
new file mode 100644
index 0000000000000..6b88661985873
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerLoginActionGroup.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="AssertMessageCustomerLoginActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." />
+            <argument name="messageType" type="string" defaultValue="error" />
+        </arguments>
+        <see userInput="{{message}}" selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignOnCustomerLoginFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignOnCustomerLoginFormActionGroup.xml
new file mode 100644
index 0000000000000..9cd52b841fca4
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontClickSignOnCustomerLoginFormActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontClickSignOnCustomerLoginFormActionGroup">
+        <click stepKey="clickSignInButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" />
+        <waitForPageLoad stepKey="waitForCustomerSignIn" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormActionGroup.xml
new file mode 100644
index 0000000000000..22883ada7c2b1
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillCustomerLoginFormActionGroup.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="StorefrontFillCustomerLoginFormActionGroup">
+        <arguments>
+            <argument name="customer" type="entity" />
+        </arguments>
+
+        <fillField userInput="{{customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField userInput="{{customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerLoginPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerLoginPageActionGroup.xml
new file mode 100644
index 0000000000000..0a5c72265528a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontOpenCustomerLoginPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontOpenCustomerLoginPageActionGroup">
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml
index 078021db062cc..85443e37a6f72 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerLoginMessagesSection.xml
@@ -11,5 +11,6 @@
     <section name="StorefrontCustomerLoginMessagesSection">
         <element name="successMessage" type="text" selector=".message-success"/>
         <element name="errorMessage" type="text" selector=".message-error"/>
+        <element name="messageByType" type="block" selector="#maincontent .message-{{messageType}}" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
index a6f41fb63415c..7bc057b8be7b7 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -12,10 +12,7 @@
         <element name="emailField" type="input" selector="#email"/>
         <element name="passwordField" type="input" selector="#pass"/>
         <element name="signInAccountButton" type="button" selector="#send2" timeout="30"/>
-        <element name="forgotPasswordLink" type="link" selector=".action.remind" timeout="10"/>
-        <element name="captchaField" type="input" selector="#captcha_user_login"/>
-        <element name="captchaImg" type="block" selector=".captcha-img"/>
-        <element name="captchaReload" type="block" selector=".captcha-reload"/>
+        <element name="forgotPasswordLink" type="button" selector=".action.remind" timeout="10"/>
     </section>
     <section name="StorefrontCustomerSignInPopupFormSection">
         <element name="errorMessage" type="input" selector="[data-ui-id='checkout-cart-validationmessages-message-error']"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
index 4d7572aedc59b..dab298f6b416b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -9,7 +9,10 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontPanelHeaderSection">
+        <!-- Element name="WelcomeMessage" Deprecated due to incorrect naming convention please use name="welcomeMessage" -->
         <element name="WelcomeMessage" type="text" selector=".greet.welcome span"/>
+
+        <element name="welcomeMessage" type="text" selector="header>.panel .greet.welcome" />
         <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/a[contains(.,'Create an Account')]" timeout="30"/>
         <element name="notYouLink" type="button" selector=".greet.welcome span a"/>
         <element name="customerWelcome" type="text" selector=".panel.header .customer-welcome"/>

From fe953d687bbb9abb0edb8a4c4a2468ff817a60c8 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 2 Apr 2019 12:59:21 -0500
Subject: [PATCH 0942/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

---
 .../GraphQl/Config/GraphQlReaderTest.php      |  3 +-
 .../Controller/GraphQlControllerTest.php      | 28 -------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
index 10a6b9d8caae4..59f9ad4c00832 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
@@ -185,7 +185,8 @@ enumValues(includeDeprecated: true) {
         $request->setHeaders($headers);
         $response = $this->graphQlController->dispatch($request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
-        $expectedOutput = require __DIR__ . '/../_files/schema_response_sdl_description.php';
+        $expectationFile = __DIR__ . '/../_files/schema_response_sdl_description.php';
+        $expectedOutput = require $expectationFile;
 
         $schemaResponseFields = $output['data']['__schema']['types'];
         $schemaResponseFieldsFirstHalf = array_slice($schemaResponseFields, 0, 25);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index a83e644c6e171..0f7dfa97e8e2e 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -153,34 +153,6 @@ public function testDispatchWithGet() : void
         $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
     }
 
-    /**
-     * Test mutation over GET returns error
-     */
-    public function testMutationWithHttpGet()
-    {
-        $mutation = <<<MUTATION
-mutation {
-  testItem(id: 3) {
-    item_id,
-    name,
-    integer_list
-  }
-}
-MUTATION;
-
-        $request = $this->objectManager->get(Http::class);
-        $request->setPathInfo('/graphql');
-        $request->setMethod('GET');
-        //Http::isSafeMethod() checks $_SERVER which will be set on real HTTP request
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        $request->setQueryValue('query', $mutation);
-        $response = $this->graphql->dispatch($request);
-        $output = $this->jsonSerializer->unserialize($response->getContent());
-        $this->assertArrayHasKey('errors', $output);
-        $errorMessage = $output['errors'][0]['message'];
-        $this->assertEquals('Mutation requests allowed only for POST requests', $errorMessage);
-    }
-
     /** Test request is dispatched and response generated when using GET request with parameterized query string
      *
      * @return void

From b3402d7a4ed4b9a35567a25170fed956bf1316b2 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 2 Apr 2019 14:49:24 -0500
Subject: [PATCH 0943/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

---
 .../Magento/Framework/GraphQl/Config/GraphQlReaderTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
index 59f9ad4c00832..6db1772458bef 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
@@ -185,8 +185,8 @@ enumValues(includeDeprecated: true) {
         $request->setHeaders($headers);
         $response = $this->graphQlController->dispatch($request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
-        $expectationFile = __DIR__ . '/../_files/schema_response_sdl_description.php';
-        $expectedOutput = require $expectationFile;
+        //phpcs:ignore Magento2.Security.IncludeFile.FoundIncludeFile
+        $expectedOutput = require __DIR__ . '/../_files/schema_response_sdl_description.php';
 
         $schemaResponseFields = $output['data']['__schema']['types'];
         $schemaResponseFieldsFirstHalf = array_slice($schemaResponseFields, 0, 25);

From d193913c855ff381a48060e988b675e6ae0f40d6 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 2 Apr 2019 15:39:54 -0500
Subject: [PATCH 0944/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

---
 .../Magento/TestFramework/TestCase/GraphQl/Client.php    | 5 +++++
 .../Magento/TestFramework/TestCase/GraphQlAbstract.php   | 1 +
 .../Framework/GraphQl/Config/GraphQlReaderTest.php       | 4 +++-
 .../Magento/GraphQl/Controller/GraphQlControllerTest.php | 9 +--------
 4 files changed, 10 insertions(+), 9 deletions(-)

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 6ace9b557ff9f..a5b16f454b041 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
@@ -66,12 +66,14 @@ public function postQuery(string $query, array $variables = [], string $operatio
         $responseBodyArray = $this->json->jsonDecode($responseBody);
 
         if (!is_array($responseBodyArray)) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
         }
 
         $this->processErrors($responseBodyArray);
 
         if (!isset($responseBodyArray['data'])) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
         } else {
             return $responseBodyArray['data'];
@@ -101,12 +103,14 @@ public function getQuery(string $query, array $variables = [], string $operation
         $responseBodyArray = $this->json->jsonDecode($responseBody);
 
         if (!is_array($responseBodyArray)) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
         }
 
         $this->processErrors($responseBodyArray);
 
         if (!isset($responseBodyArray['data'])) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
         } else {
             return $responseBodyArray['data'];
@@ -142,6 +146,7 @@ private function processErrors($responseBodyArray)
                     $responseBodyArray
                 );
             }
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('GraphQL responded with an unknown error: ' . json_encode($responseBodyArray));
         }
     }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
index d1a6356d78fba..021bfa35669fb 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -61,6 +61,7 @@ public function graphQlQuery(
                 $this->composeHeaders($headers)
             );
         } else {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception("Unsupported request type");
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
index 6db1772458bef..b96b04eb4e671 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
@@ -45,7 +45,9 @@ protected function setUp()
             \Magento\Framework\Config\FileResolverInterface::class
         )->disableOriginalConstructor()->getMock();
         $fileList = [
+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
             file_get_contents(__DIR__ . '/../_files/schemaA.graphqls'),
+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
             file_get_contents(__DIR__ . '/../_files/schemaB.graphqls')
         ];
         $fileResolverMock->expects($this->any())->method('get')->will($this->returnValue($fileList));
@@ -185,7 +187,7 @@ enumValues(includeDeprecated: true) {
         $request->setHeaders($headers);
         $response = $this->graphQlController->dispatch($request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
-        //phpcs:ignore Magento2.Security.IncludeFile.FoundIncludeFile
+        //phpcs:ignore Magento2.Security.IncludeFile
         $expectedOutput = require __DIR__ . '/../_files/schema_response_sdl_description.php';
 
         $schemaResponseFields = $output['data']['__schema']['types'];
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index 0f7dfa97e8e2e..8a36767d6de2b 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -38,6 +38,7 @@ class GraphQlControllerTest extends \Magento\TestFramework\Indexer\TestCase
     /** @var MetadataPool */
     private $metadataPool;
 
+    //phpcs:ignore Magento2.Functions.StaticFunction
     public static function setUpBeforeClass()
     {
         $db = Bootstrap::getInstance()->getBootstrap()
@@ -265,12 +266,4 @@ public function testError() : void
             }
         }
     }
-
-    /**
-     * teardown
-     */
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
 }

From 92b0e8b1247c2e039046bfc33a6c5930ecf67bbe Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@magento.com>
Date: Tue, 2 Apr 2019 15:46:57 -0500
Subject: [PATCH 0945/1055] MAGETWO-98831: The SKU was not found in the catalog

---
 .../Adminhtml/Order/Create/Search/Grid.php    | 29 +++++++++-
 .../Grid/DataProvider/ProductCollection.php   | 56 +++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
index 4bd2227d4bb1e..5b7c1dee65c39 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Search;
 
+use Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection
+    as ProductCollectionDataProvider;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml sales order create search products block
  *
@@ -42,6 +46,11 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      */
     protected $_productFactory;
 
+    /**
+     * @var ProductCollectionDataProvider $productCollectionProvider
+     */
+    private $productCollectionProvider;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
@@ -50,6 +59,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Model\Session\Quote $sessionQuote
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param array $data
+     * @param ProductCollectionDataProvider|null $productCollectionProvider
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,12 +68,15 @@ public function __construct(
         \Magento\Catalog\Model\Config $catalogConfig,
         \Magento\Backend\Model\Session\Quote $sessionQuote,
         \Magento\Sales\Model\Config $salesConfig,
-        array $data = []
+        array $data = [],
+        ProductCollectionDataProvider $productCollectionProvider = null
     ) {
         $this->_productFactory = $productFactory;
         $this->_catalogConfig = $catalogConfig;
         $this->_sessionQuote = $sessionQuote;
         $this->_salesConfig = $salesConfig;
+        $this->productCollectionProvider = $productCollectionProvider
+            ?: ObjectManager::getInstance()->get(ProductCollectionDataProvider::class);
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -140,8 +153,21 @@ protected function _addColumnFilterToCollection($column)
      */
     protected function _prepareCollection()
     {
+
         $attributes = $this->_catalogConfig->getProductAttributes();
+        $store = $this->getStore();
+
         /* @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
+        $collection = $this->productCollectionProvider->getCollectionForStore($store);
+        $collection->addAttributeToSelect(
+            $attributes
+        );
+        $collection->addAttributeToFilter(
+            'type_id',
+            $this->_salesConfig->getAvailableProductTypes()
+        );
+
+        /*
         $collection = $this->_productFactory->create()->getCollection();
         $collection->setStore(
             $this->getStore()
@@ -155,6 +181,7 @@ protected function _prepareCollection()
         )->addAttributeToSelect(
             'gift_message_available'
         );
+        */
 
         $this->setCollection($collection);
         return parent::_prepareCollection();
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php
new file mode 100644
index 0000000000000..61f30de3a1c51
--- /dev/null
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider;
+
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Store\Model\Store;
+
+/**
+ * Prepares product collection for the grid
+ */
+class ProductCollection
+{
+    /**
+     * @var ProductCollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param ProductCollectionFactory $collectionFactory
+     */
+    public function __construct(
+        ProductCollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Provide products collection filtered with store
+     *
+     * @param Store $store
+     * @return Collection
+     */
+    public function getCollectionForStore(Store $store):Collection
+    {
+        /** @var Collection $collection */
+        $collection = $this->collectionFactory->create();
+
+        $collection->setStore($store);
+        $collection->addAttributeToSelect(
+            'gift_message_available'
+        );
+        $collection->addAttributeToSelect(
+            'sku'
+        );
+        $collection->addStoreFilter();
+
+        return $collection;
+    }
+}
+

From c62b949ddc12cd714ff541f2e6fc11a3e3804751 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 2 Apr 2019 16:03:58 -0500
Subject: [PATCH 0946/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

- This reverts commit d193913c855ff381a48060e988b675e6ae0f40d6.
---
 .../Magento/TestFramework/TestCase/GraphQl/Client.php    | 5 -----
 .../Magento/TestFramework/TestCase/GraphQlAbstract.php   | 1 -
 .../Framework/GraphQl/Config/GraphQlReaderTest.php       | 3 ---
 .../Magento/GraphQl/Controller/GraphQlControllerTest.php | 9 ++++++++-
 4 files changed, 8 insertions(+), 10 deletions(-)

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 a5b16f454b041..6ace9b557ff9f 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
@@ -66,14 +66,12 @@ public function postQuery(string $query, array $variables = [], string $operatio
         $responseBodyArray = $this->json->jsonDecode($responseBody);
 
         if (!is_array($responseBodyArray)) {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
         }
 
         $this->processErrors($responseBodyArray);
 
         if (!isset($responseBodyArray['data'])) {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
         } else {
             return $responseBodyArray['data'];
@@ -103,14 +101,12 @@ public function getQuery(string $query, array $variables = [], string $operation
         $responseBodyArray = $this->json->jsonDecode($responseBody);
 
         if (!is_array($responseBodyArray)) {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
         }
 
         $this->processErrors($responseBodyArray);
 
         if (!isset($responseBodyArray['data'])) {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
         } else {
             return $responseBodyArray['data'];
@@ -146,7 +142,6 @@ private function processErrors($responseBodyArray)
                     $responseBodyArray
                 );
             }
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('GraphQL responded with an unknown error: ' . json_encode($responseBodyArray));
         }
     }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
index 021bfa35669fb..d1a6356d78fba 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -61,7 +61,6 @@ public function graphQlQuery(
                 $this->composeHeaders($headers)
             );
         } else {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception("Unsupported request type");
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
index b96b04eb4e671..10a6b9d8caae4 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
@@ -45,9 +45,7 @@ protected function setUp()
             \Magento\Framework\Config\FileResolverInterface::class
         )->disableOriginalConstructor()->getMock();
         $fileList = [
-            //phpcs:ignore Magento2.Functions.DiscouragedFunction
             file_get_contents(__DIR__ . '/../_files/schemaA.graphqls'),
-            //phpcs:ignore Magento2.Functions.DiscouragedFunction
             file_get_contents(__DIR__ . '/../_files/schemaB.graphqls')
         ];
         $fileResolverMock->expects($this->any())->method('get')->will($this->returnValue($fileList));
@@ -187,7 +185,6 @@ enumValues(includeDeprecated: true) {
         $request->setHeaders($headers);
         $response = $this->graphQlController->dispatch($request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
-        //phpcs:ignore Magento2.Security.IncludeFile
         $expectedOutput = require __DIR__ . '/../_files/schema_response_sdl_description.php';
 
         $schemaResponseFields = $output['data']['__schema']['types'];
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index 8a36767d6de2b..0f7dfa97e8e2e 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -38,7 +38,6 @@ class GraphQlControllerTest extends \Magento\TestFramework\Indexer\TestCase
     /** @var MetadataPool */
     private $metadataPool;
 
-    //phpcs:ignore Magento2.Functions.StaticFunction
     public static function setUpBeforeClass()
     {
         $db = Bootstrap::getInstance()->getBootstrap()
@@ -266,4 +265,12 @@ public function testError() : void
             }
         }
     }
+
+    /**
+     * teardown
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
 }

From 4ebea9626a0226454e1a5e4eb0afac02bdd27323 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 2 Apr 2019 20:57:39 -0500
Subject: [PATCH 0947/1055] GraphQL-481: [Test Coverage] 'RemoveCouponFromCart'
 functionality

---
 .../Model/Resolver/AppliedCoupon.php          |  19 +-
 .../Model/Resolver/RemoveCouponFromCart.php   |   6 +-
 .../Customer/RemoveCouponFromCartTest.php     | 361 +++---------------
 .../Quote/Guest/RemoveCouponFromCartTest.php  | 211 ++--------
 .../discount_10percent_generalusers.php       |   2 +-
 .../GraphQl/Quote/_files/apply_coupon.php     |  22 ++
 .../Quote/_files/apply_coupon_rollback.php    |  22 ++
 7 files changed, 170 insertions(+), 473 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
index ca69b763929be..8251089abcd60 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AppliedCoupon.php
@@ -11,12 +11,27 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CouponManagementInterface;
 
 /**
  * @inheritdoc
  */
 class AppliedCoupon implements ResolverInterface
 {
+    /**
+     * @var CouponManagementInterface
+     */
+    private $couponManagement;
+
+    /**
+     * @param CouponManagementInterface $couponManagement
+     */
+    public function __construct(
+        CouponManagementInterface $couponManagement
+    ) {
+        $this->couponManagement = $couponManagement;
+    }
+
     /**
      * @inheritdoc
      */
@@ -26,9 +41,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new LocalizedException(__('"model" value should be specified'));
         }
         $cart = $value['model'];
+        $cartId = $cart->getId();
 
-        $appliedCoupon = $cart->getCouponCode();
-
+        $appliedCoupon = $this->couponManagement->get($cartId);
         return $appliedCoupon ? ['code' => $appliedCoupon] : null;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
index 5a708ceaedc28..f81ea3020d3d0 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveCouponFromCart.php
@@ -62,7 +62,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         try {
             $this->couponManagement->remove($cartId);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            $message = $e->getMessage();
+            if (preg_match('/The "\d+" Cart doesn\'t contain products/', $message)) {
+                $message = 'Cart does not contain products';
+            }
+            throw new GraphQlNoSuchEntityException(__($message), $e);
         } catch (CouldNotDeleteException $e) {
             throw new LocalizedException(__($e->getMessage()), $e);
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
index b228d315f8890..689b360f724a7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -7,92 +7,50 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
-use Magento\Framework\Exception\AuthenticationException;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 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\SalesRule\Api\CouponRepositoryInterface;
-use Magento\SalesRule\Model\Coupon;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Check removing of the coupon from customer quotes
+ * Check removing of the coupon from customer cart
  */
 class RemoveCouponFromCartTest extends GraphQlAbstract
 {
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var Quote
-     */
-    private $quote;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
     /**
      * @var CustomerTokenServiceInterface
      */
     private $customerTokenService;
 
     /**
-     * @var CouponRepositoryInterface
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $couponRepository;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var Coupon
+     * @inheritdoc
      */
-    private $coupon;
-
     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->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->couponRepository = $objectManager->get(CouponRepositoryInterface::class);
-        $this->coupon = $objectManager->create(Coupon::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
      */
     public function testRemoveCouponFromCart()
     {
-        $couponCode = '2?ds5!2d';
-
-        /* Assign the quote to the customer */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        /* Apply coupon to the customer quote */
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->graphQlQuery($query, [], '', $queryHeaders);
-
-        /* Remove coupon from the quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('removeCouponFromCart', $response);
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
@@ -100,276 +58,92 @@ public function testRemoveCouponFromCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
-    public function testRemoveCouponFromCartTwice()
+    public function testRemoveCouponFromNonExistentCart()
     {
-        $couponCode = '2?ds5!2d';
-
-        /* Assign the quote to the customer */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
 
-        /* Apply coupon to the customer quote */
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->graphQlQuery($query, [], '', $queryHeaders);
-
-        /* Remove coupon from the quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
-
-        self::assertArrayHasKey('removeCouponFromCart', $response);
-        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
-
-        /* Remove coupon from the quote the second time */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
-
-        self::assertArrayHasKey('removeCouponFromCart', $response);
-        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     */
-    public function testRemoveCouponFromCartWithNoCouponApplied()
-    {
-        /* Assign the quote to the customer */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-
-        /* Remove coupon from the quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
-
-        self::assertArrayHasKey('removeCouponFromCart', $response);
-        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Cart does not contain products
      */
     public function testRemoveCouponFromEmptyCart()
     {
-        /* Assign the empty quote to the customer */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        $quoteId = (int)$this->quote->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute($quoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-
-        /* Remove coupon from the empty quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-
-        $this->expectExceptionMessage("The \"$quoteId\" Cart doesn't contain products");
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
-    public function testRemoveCouponFromCartWithoutItems()
+    public function testRemoveCouponFromCartIfCouponWasNotSet()
     {
-        $couponCode = '2?ds5!2d';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        /* Assign the quote to the customer */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-
-        /* Apply coupon to the customer quote */
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->graphQlQuery($query, [], '', $queryHeaders);
-
-        /* Clear the quote */
-        $this->quote->removeAllItems();
-        $this->quoteResource->save($this->quote);
-
-        /* Remove coupon from the customer quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('removeCouponFromCart', $response);
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     */
-    public function testRemoveCouponFromAnotherCustomerCart()
-    {
-        $couponCode = '2?ds5!2d';
-
-        /* Assign the quote to the customer */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-
-        /* Apply coupon to the first customer quote */
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $this->graphQlQuery($query, [], '', $queryHeaders);
-
-        /* Remove coupon from the quote from the second customer */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer_two@example.com', 'password');
-
-        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$maskedQuoteId\"");
-        $this->graphQlQuery($query, [], '', $queryHeaders);
-    }
-
-    /**
+     * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
      */
     public function testRemoveCouponFromGuestCart()
     {
-        $couponCode = '2?ds5!2d';
-
-        /* Apply coupon to the guest quote */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->graphQlQuery($query);
-
-        /* Remove coupon from quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-
-        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$maskedQuoteId\"");
-        $this->graphQlQuery($query, [], '', $queryHeaders);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     */
-    public function testRemoveNonExistentCouponFromCart()
-    {
-        $couponCode = '2?ds5!2d';
-
-        /* Assign the quote to the customer */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-
-        /* Apply coupon to the customer quote */
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $this->graphQlQuery($query, [], '', $queryHeaders);
-
-        /* Remove the coupon */
-        $this->removeCoupon($couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
-        /* Remove the non-existent coupon from the quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
-
-        self::assertArrayHasKey('removeCouponFromCart', $response);
-        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
-     * Remove the given coupon code from the database
-     *
-     * @param string $couponCode
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
      */
-    private function removeCoupon(string $couponCode): void
-    {
-        $this->coupon->loadByCode($couponCode);
-        $couponId = $this->coupon->getCouponId();
-
-        if ($couponId) {
-            $this->couponRepository->deleteById($couponId);
-        }
-    }
-
-    /**
-     * Retrieve customer authorization headers
-     *
-     * @param string $email
-     * @param string $password
-     * @return array
-     * @throws AuthenticationException
-     */
-    private function prepareAuthorizationHeaders(string $email, string $password): array
+    public function testRemoveCouponFromAnotherCustomerCart()
     {
-        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
-        return ['Authorization' => 'Bearer ' . $customerToken];
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
     }
 
     /**
-     * Retrieve add coupon GraphQL query
-     *
      * @param string $maskedQuoteId
-     * @param string $couponCode
      * @return string
      */
-    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    private function getQuery(string $maskedQuoteId): string
     {
         return <<<QUERY
 mutation {
-  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
+  removeCouponFromCart(input: {cart_id: "$maskedQuoteId"}) {
     cart {
       applied_coupon {
         code
@@ -377,28 +151,19 @@ private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $cou
     }
   }
 }
+
 QUERY;
     }
 
     /**
-     * Retrieve remove coupon GraphQL query
-     *
-     * @param string $maskedQuoteId
-     * @return string
+     * @param string $username
+     * @param string $password
+     * @return array
      */
-    private function prepareRemoveCouponRequestQuery(string $maskedQuoteId): string
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
     {
-        return <<<QUERY
-mutation {
-  removeCouponFromCart(input: {cart_id: "$maskedQuoteId"}) {
-    cart {
-      applied_coupon {
-        code
-      }
-    }
-  }
-}
-
-QUERY;
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
index c5929795b534a..a17ef545eba88 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
@@ -7,78 +7,41 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\SalesRule\Api\CouponRepositoryInterface;
-use Magento\SalesRule\Model\Coupon;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Test for getting cart information
+ * Check removing of the coupon from guest cart
  */
 class RemoveCouponFromCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var Quote
+     * @inheritdoc
      */
-    private $quote;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var CouponRepositoryInterface
-     */
-    private $couponRepository;
-
-    /**
-     * @var Coupon
-     */
-    private $coupon;
-
     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->couponRepository = $objectManager->get(CouponRepositoryInterface::class);
-        $this->coupon = $objectManager->create(Coupon::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
      */
     public function testRemoveCouponFromCart()
     {
-        $couponCode = '2?ds5!2d';
-
-        /* Apply coupon to the quote */
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->graphQlQuery($query);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        /* Remove coupon from quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('removeCouponFromCart', $response);
@@ -86,84 +49,40 @@ public function testRemoveCouponFromCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
-    public function testRemoveCouponFromCustomerCart()
-    {
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-
-        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query);
-    }
-
     public function testRemoveCouponFromNonExistentCart()
     {
-        $maskedQuoteId = '1234000000099912';
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
 
-        /* Remove coupon from quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-
-        self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId. '"');
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Cart does not contain products
      */
     public function testRemoveCouponFromEmptyCart()
     {
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        $quoteId = (int)$this->quote->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute($quoteId);
-
-        /* Remove coupon from the empty quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
-        $this->expectExceptionMessage("The \"$quoteId\" Cart doesn't contain products");
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
-    public function testRemoveCouponFromCartWithoutItems()
+    public function testRemoveCouponFromCartIfCouponWasNotSet()
     {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        /* Apply coupon to the guest quote */
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->graphQlQuery($query);
-
-        /* Clear the quote */
-        $this->quote->removeAllItems();
-        $this->quoteResource->save($this->quote);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
-        /* Remove coupon from the guest quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('removeCouponFromCart', $response);
@@ -171,82 +90,32 @@ public function testRemoveCouponFromCartWithoutItems()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/apply_coupon.php
      */
-    public function testRemoveNonExistentCouponFromCart()
+    public function testRemoveCouponFromCustomerCart()
     {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
 
-        /* Apply coupon to the guest quote */
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
         $this->graphQlQuery($query);
-
-        /* Remove the coupon */
-        $this->removeCoupon($couponCode);
-
-        /* Remove the non-existent coupon from the quote */
-        $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('removeCouponFromCart', $response);
-        self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
-    }
-
-    /**
-     * Remove the given coupon code from the database
-     *
-     * @param string $couponCode
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
-     */
-    private function removeCoupon(string $couponCode): void
-    {
-        $this->coupon->loadByCode($couponCode);
-        $couponId = $this->coupon->getCouponId();
-
-        if ($couponId) {
-            $this->couponRepository->deleteById($couponId);
-        }
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @param string $couponCode
-     * @return string
-     */
-    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
-    {
-        return <<<QUERY
-mutation {
-  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
-    cart {
-      applied_coupon {
-        code
-      }
-    }
-  }
-}
-QUERY;
     }
 
     /**
      * @param string $maskedQuoteId
      * @return string
      */
-    private function prepareRemoveCouponRequestQuery(string $maskedQuoteId): string
+    private function getQuery(string $maskedQuoteId): string
     {
         return <<<QUERY
 mutation {
-  removeCouponFromCart(input: {cart_id: "$maskedQuoteId"}) {
+  removeCouponFromCart(input: {cart_id: "{$maskedQuoteId}"}) {
     cart {
       applied_coupon {
         code
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php
index 507f6b755bcda..e66227a60e8f0 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent_generalusers.php
@@ -21,7 +21,7 @@
     ],
     'customer_group_ids' => [1],
     'coupon_type' => \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC,
-    'coupon_code' => uniqid(),
+    'coupon_code' => '2?ds5!2d',
     'simple_action' => \Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION,
     'discount_amount' => 10,
     'discount_step' => 1
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php
new file mode 100644
index 0000000000000..c70efa9a12a5d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CouponManagementInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponManagementInterface $couponManagement */
+$couponManagement = Bootstrap::getObjectManager()->get(CouponManagementInterface::class);
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$couponManagement->set($quote->getId(), '2?ds5!2d');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php
new file mode 100644
index 0000000000000..5431c25b7df53
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/apply_coupon_rollback.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CouponManagementInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponManagementInterface $couponManagement */
+$couponManagement = Bootstrap::getObjectManager()->get(CouponManagementInterface::class);
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$couponManagement->remove($quote->getId());

From 5b0348830b27ab4c9fa1e86b8743c02c4f868b4c Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 2 Apr 2019 21:29:36 -0500
Subject: [PATCH 0948/1055] GraphQL-468: Resolve coupling between objects in
 `\Magento\QuoteGraphQl\Model\Cart\SetBillingAddressOnCart`

---
 .../CreateQuoteAddressByCustomerAddress.php   | 71 -------------------
 .../Model/Cart/QuoteAddressFactory.php        | 25 +++++--
 .../Model/Cart/SetBillingAddressOnCart.php    | 43 +++++++----
 .../Model/Cart/SetShippingAddressesOnCart.php | 15 ++--
 4 files changed, 52 insertions(+), 102 deletions(-)
 delete mode 100644 app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php
deleted file mode 100644
index ba46f5621ee82..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/CreateQuoteAddressByCustomerAddress.php
+++ /dev/null
@@ -1,71 +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\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
-use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-use Magento\Quote\Model\Quote\Address;
-
-/**
- * Creates a quote address based on given context, customer address ID and customer address
- */
-class CreateQuoteAddressByCustomerAddress
-{
-    /**
-     * @var QuoteAddressFactory
-     */
-    private $quoteAddressFactory;
-
-    /**
-     * @var GetCustomer
-     */
-    private $getCustomer;
-
-    /**
-     * @var GetCustomerAddress
-     */
-    private $getCustomerAddress;
-
-    /**
-     * @param QuoteAddressFactory $quoteAddressFactory
-     * @param GetCustomer $getCustomer
-     * @param GetCustomerAddress $getCustomerAddress
-     */
-    public function __construct(
-        QuoteAddressFactory $quoteAddressFactory,
-        GetCustomer $getCustomer,
-        GetCustomerAddress $getCustomerAddress
-    ) {
-        $this->quoteAddressFactory = $quoteAddressFactory;
-        $this->getCustomer = $getCustomer;
-        $this->getCustomerAddress = $getCustomerAddress;
-    }
-
-    /**
-     * @param ContextInterface $context
-     * @param int|string|null $customerAddressId
-     * @param array|null $customerAddress
-     *
-     * @return Address
-     */
-    public function execute(
-        ContextInterface $context,
-        $customerAddressId,
-        $customerAddress
-    ): Address {
-        if (null === $customerAddressId) {
-            return  $this->quoteAddressFactory->createBasedOnInputData($customerAddress);
-        }
-
-        $customer = $this->getCustomer->execute($context);
-        $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
-
-        return $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
-    }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
index 76bdc74611131..582055bc6e13d 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -7,9 +7,11 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Customer\Api\Data\AddressInterface as CustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\Quote\AddressFactory as BaseQuoteAddressFactory;
 
@@ -23,13 +25,21 @@ class QuoteAddressFactory
      */
     private $quoteAddressFactory;
 
+    /**
+     * @var GetCustomerAddress
+     */
+    private $getCustomerAddress;
+
     /**
      * @param BaseQuoteAddressFactory $quoteAddressFactory
+     * @param GetCustomerAddress $getCustomerAddress
      */
     public function __construct(
-        BaseQuoteAddressFactory $quoteAddressFactory
+        BaseQuoteAddressFactory $quoteAddressFactory,
+        GetCustomerAddress $getCustomerAddress
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
+        $this->getCustomerAddress = $getCustomerAddress;
     }
 
     /**
@@ -48,14 +58,19 @@ public function createBasedOnInputData(array $addressInput): QuoteAddress
     }
 
     /**
-     * Create QuoteAddress based on CustomerAddress
+     * Create Quote Address based on Customer Address
      *
-     * @param CustomerAddress $customerAddress
+     * @param int $customerAddressId
+     * @param int $customerId
      * @return QuoteAddress
      * @throws GraphQlInputException
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
      */
-    public function createBasedOnCustomerAddress(CustomerAddress $customerAddress): QuoteAddress
+    public function createBasedOnCustomerAddress(int $customerAddressId, int $customerId): QuoteAddress
     {
+        $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, $customerId);
+
         $quoteAddress = $this->quoteAddressFactory->create();
         try {
             $quoteAddress->importCustomerAddressData($customerAddress);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
index 65afbecb2c3f5..c2bac13c07067 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -7,6 +7,7 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -20,25 +21,33 @@
 class SetBillingAddressOnCart
 {
     /**
-     * @var AssignBillingAddressToCart
+     * @var QuoteAddressFactory
      */
-    private $assignBillingAddressToCart;
+    private $quoteAddressFactory;
 
     /**
-     * @var CreateQuoteAddressByCustomerAddress
+     * @var GetCustomer
      */
-    private $createQuoteAddressByCustomerAddress;
+    private $getCustomer;
+
+    /**
+     * @var AssignBillingAddressToCart
+     */
+    private $assignBillingAddressToCart;
 
     /**
+     * @param QuoteAddressFactory $quoteAddressFactory
+     * @param GetCustomer $getCustomer
      * @param AssignBillingAddressToCart $assignBillingAddressToCart
-     * @param CreateQuoteAddressByCustomerAddress $createQuoteAddressByCustomerAddress
      */
     public function __construct(
-        AssignBillingAddressToCart $assignBillingAddressToCart,
-        CreateQuoteAddressByCustomerAddress $createQuoteAddressByCustomerAddress
+        QuoteAddressFactory $quoteAddressFactory,
+        GetCustomer $getCustomer,
+        AssignBillingAddressToCart $assignBillingAddressToCart
     ) {
+        $this->quoteAddressFactory = $quoteAddressFactory;
+        $this->getCustomer = $getCustomer;
         $this->assignBillingAddressToCart = $assignBillingAddressToCart;
-        $this->createQuoteAddressByCustomerAddress = $createQuoteAddressByCustomerAddress;
     }
 
     /**
@@ -49,9 +58,9 @@ public function __construct(
      * @param array $billingAddressInput
      * @return void
      * @throws GraphQlInputException
-     * @throws GraphQlNoSuchEntityException
-     * @throws GraphQlAuthorizationException
      * @throws GraphQlAuthenticationException
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
      */
     public function execute(ContextInterface $context, CartInterface $cart, array $billingAddressInput): void
     {
@@ -79,11 +88,15 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
             );
         }
 
-        $billingAddress = $this->createQuoteAddressByCustomerAddress->execute(
-            $context,
-            $customerAddressId,
-            $addressInput
-        );
+        if (null === $customerAddressId) {
+            $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
+        } else {
+            $customer = $this->getCustomer->execute($context);
+            $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
+                (int)$customerAddressId,
+                (int)$customer->getId()
+            );
+        }
 
         $this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
     }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index bbca7721754cb..6b0e2a311bf44 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -7,7 +7,6 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
 use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -28,11 +27,6 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
      */
     private $getCustomer;
 
-    /**
-     * @var GetCustomerAddress
-     */
-    private $getCustomerAddress;
-
     /**
      * @var AssignShippingAddressToCart
      */
@@ -41,18 +35,15 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
     /**
      * @param QuoteAddressFactory $quoteAddressFactory
      * @param GetCustomer $getCustomer
-     * @param GetCustomerAddress $getCustomerAddress
      * @param AssignShippingAddressToCart $assignShippingAddressToCart
      */
     public function __construct(
         QuoteAddressFactory $quoteAddressFactory,
         GetCustomer $getCustomer,
-        GetCustomerAddress $getCustomerAddress,
         AssignShippingAddressToCart $assignShippingAddressToCart
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
         $this->getCustomer = $getCustomer;
-        $this->getCustomerAddress = $getCustomerAddress;
         $this->assignShippingAddressToCart = $assignShippingAddressToCart;
     }
 
@@ -86,8 +77,10 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
             $shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
         } else {
             $customer = $this->getCustomer->execute($context);
-            $customerAddress = $this->getCustomerAddress->execute((int)$customerAddressId, (int)$customer->getId());
-            $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress($customerAddress);
+            $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
+                (int)$customerAddressId,
+                (int)$customer->getId()
+            );
         }
 
         $this->assignShippingAddressToCart->execute($cart, $shippingAddress);

From 8a98f208245d381d3fff0bb22c47f757b89f6e07 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 28 Mar 2019 17:28:06 +0200
Subject: [PATCH 0949/1055] Fix wrong interface implementation.

---
 .../Controller/Adminhtml/Dashboard/ProductsViewed.php        | 4 +++-
 .../Controller/Adminhtml/Dashboard/ProductsViewedTest.php    | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
index 216c730ccccc0..a42a44814cb0c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewed.php
@@ -6,10 +6,12 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
 /**
  * Get most viewed products controller.
  */
-class ProductsViewed extends AjaxBlock
+class ProductsViewed extends AjaxBlock implements HttpPostActionInterface
 {
     /**
      * Gets most viewed products list
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
index 595a33344c7e8..bd4dd0c8daf0c 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
@@ -4,8 +4,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
+/**
+ * Test product viewed backend controller.
+ */
 class ProductsViewedTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
@@ -14,6 +18,7 @@ class ProductsViewedTest extends \Magento\TestFramework\TestCase\AbstractBackend
      */
     public function testExecute()
     {
+        $this->getRequest()->setMethod("POST");
         $this->dispatch('backend/admin/dashboard/productsViewed/');
 
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());

From 5410e077c534127f3492d53f8ab3981691bed2e3 Mon Sep 17 00:00:00 2001
From: Jeff Coleman <jeff@jeffcolemanwrites.com>
Date: Wed, 3 Apr 2019 00:42:30 -0700
Subject: [PATCH 0950/1055] fix to call Magento\Sales\Model\Order::getStoreId()
 only once

---
 .../Observer/SaveDownloadableOrderItemObserver.php           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index fb4af4c3443a9..19339e4484ef6 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -92,14 +92,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if ($purchasedLink->getId()) {
             return $this;
         }
+        $storeId = $orderItem->getOrder()->getStoreId();
         $orderStatusToEnableItem = $this->_scopeConfig->getValue(
             \Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
             ScopeInterface::SCOPE_STORE,
-            $orderItem->getOrder()->getStoreId()
+            $storeId
         );
         if (!$product) {
             $product = $this->_createProductModel()->setStoreId(
-                $orderItem->getOrder()->getStoreId()
+                $storeId
             )->load(
                 $orderItem->getProductId()
             );

From cae7e10ca75669cd7658113ec5ed6a9e4902f496 Mon Sep 17 00:00:00 2001
From: Leandry <leandry@atwix.com>
Date: Wed, 3 Apr 2019 11:21:16 +0300
Subject: [PATCH 0951/1055] Refactoring

---
 .../LoginAdminWithCredentialsActionGroup.xml  | 22 ++++++++
 .../Mftf/Test/CaptchaOnAdminLoginTest.xml     | 50 +++++++++++--------
 .../Test/TestCase/CaptchaOnAdminLoginTest.xml |  1 +
 3 files changed, 51 insertions(+), 22 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml
new file mode 100644
index 0000000000000..6aaa612b249b6
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.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="LoginAdminWithCredentialsActionGroup">
+        <arguments>
+            <argument name="adminUser" type="string" />
+            <argument name="adminPassword" type="string" />
+        </arguments>
+        <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser}}" stepKey="fillUsername"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminPassword}}" stepKey="fillPassword"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+        <closeAdminNotification stepKey="closeAdminNotification"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml
index 80f1832200fc1..d830c0723ba89 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml
@@ -29,34 +29,40 @@
         <waitForPageLoad stepKey="waitForPageLoad1" />
 
         <!-- Login as Admin with incorrect credentials 3 times -->
-        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillUsername1"/>
-        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPassword1"/>
-        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin1"/>
-        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." selector="{{AdminLoginFormSection.error}}" stepKey="seeLoginError1"/>
+        <actionGroup ref="LoginAdminWithCredentialsActionGroup" stepKey="failedFirstLoginAdminUser">
+            <argument name="adminUser" value="adminUser" />
+            <argument name="adminPassword" value="INVALIDAdminPassword" />
+        </actionGroup>
+        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."
+             selector="{{AdminLoginFormSection.error}}" stepKey="seeFirstLoginError"/>
 
-        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillUsername2"/>
-        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPassword2"/>
-        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin2"/>
-        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." selector="{{AdminLoginFormSection.error}}" stepKey="seeLoginError2"/>
+        <actionGroup ref="LoginAdminWithCredentialsActionGroup" stepKey="failedSecondLoginAdminUser">
+            <argument name="adminUser" value="adminUser" />
+            <argument name="adminPassword" value="INVALIDAdminPassword" />
+        </actionGroup>
+        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."
+             selector="{{AdminLoginFormSection.error}}" stepKey="seeSecondLoginError"/>
 
-        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillUsername3"/>
-        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPassword3"/>
-        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin3"/>
-        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." selector="{{AdminLoginFormSection.error}}" stepKey="seeLoginError3"/>
+        <actionGroup ref="LoginAdminWithCredentialsActionGroup" stepKey="failedThirdLoginAdminUser">
+            <argument name="adminUser" value="adminUser" />
+            <argument name="adminPassword" value="INVALIDAdminPassword" />
+        </actionGroup>
+        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."
+             selector="{{AdminLoginFormSection.error}}" stepKey="seeThirdLoginError"/>
 
         <!-- Check captcha visibility on admin login page  -->
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeCaptchaField1"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeCaptchaImage1"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton1"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeFirstCaptchaField"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeFirstCaptchaImage"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeFirstCaptchaReloadButton"/>
 
         <!-- Submit form with incorrect captcha -->
-        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillUsername4"/>
-        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPassword4"/>
-        <fillField selector="{{AdminLoginFormSection.captchaField}}" userInput="incorrectCaptcha" stepKey="fillCaptcha4"/>
-        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin4"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillAdminUserNameWithCaptcha"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPasswordWithCaptcha"/>
+        <fillField selector="{{AdminLoginFormSection.captchaField}}" userInput="incorrectCaptcha" stepKey="fillCaptcha"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLoginWithCaptcha"/>
         <see userInput="Incorrect CAPTCHA." selector="{{AdminLoginFormSection.error}}" stepKey="seeCaptchaError"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeCaptchaField2"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeCaptchaImage2"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton2"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeSecondCaptchaField"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeSecondCaptchaImage"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeSecondCaptchaReloadButton"/>
     </test>
 </tests>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml
index 186439bb9f157..9242bfbef2374 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnAdminLoginTest.xml
@@ -12,6 +12,7 @@
             <data name="customAdmin/data/captcha" xsi:type="string">111</data>
             <data name="pageTitle" xsi:type="string">Dashboard</data>
             <data name="configData" xsi:type="string">captcha_backend_login</data>
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
     </testCase>

From c78535dfaa1dbd594d9f6a2bca37f3fb545a1919 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 2 Apr 2019 10:24:26 +0300
Subject: [PATCH 0952/1055] magento/magento2#21083: Static test fix.

---
 .../ConfigurableProduct/Model/LinkManagement.php       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
index 75cab12f63562..2f07f8b90ce7e 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -12,6 +12,8 @@
 
 /**
  * Configurable product link management.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementInterface
 {
@@ -110,6 +112,10 @@ public function getChildren($sku)
 
     /**
      * @inheritdoc
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws StateException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      */
     public function addChild($sku, $childSku)
     {
@@ -153,6 +159,10 @@ public function addChild($sku, $childSku)
 
     /**
      * @inheritdoc
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws StateException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      */
     public function removeChild($sku, $childSku)
     {

From 95760d50f8b7e914fd93d0487a179bb5c015eedc Mon Sep 17 00:00:00 2001
From: Davit_Zakharyan <davit_zakharyan@epam.com>
Date: Wed, 3 Apr 2019 12:26:53 +0400
Subject: [PATCH 0953/1055] MAGETWO-91523: [2.3] Allowed countries restriction
 for a default website is applied to backend customer grid

- Updated automated test script.
---
 ...iteCountryOptionsToDefaultActionGroup.xml} |  2 +-
 .../Mftf/Section/CountryOptionsSection.xml    | 18 ++++++++
 .../SetAccountSharingOptionActionGroup.xml    | 25 -----------
 ...dminStoresCustomerConfigurationSection.xml |  3 --
 .../Test/Mftf/Section/GeneralSection.xml      |  5 ---
 .../Test/Mftf/Data/CustomerConfigData.xml     |  7 ++++
 .../customer_config_account_sharing-meta.xml  | 12 ++++++
 .../Section/AdminCustomerConfigSection.xml    |  3 ++
 .../Section/AdminCustomerFiltersSection.xml   |  1 +
 ...CountriesRestrictionApplyOnBackendTest.xml | 41 +++++++++++--------
 .../Section/AdminDataGridHeaderSection.xml    |  1 -
 11 files changed, 65 insertions(+), 53 deletions(-)
 rename app/code/Magento/{Config/Test/Mftf/ActionGroup/SetMainWebsiteCountryOptionsToDefaultActionGroup.xml => Backend/Test/Mftf/ActionGroup/SetWebsiteCountryOptionsToDefaultActionGroup.xml} (93%)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Section/CountryOptionsSection.xml
 delete mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/SetAccountSharingOptionActionGroup.xml

diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/SetMainWebsiteCountryOptionsToDefaultActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetWebsiteCountryOptionsToDefaultActionGroup.xml
similarity index 93%
rename from app/code/Magento/Config/Test/Mftf/ActionGroup/SetMainWebsiteCountryOptionsToDefaultActionGroup.xml
rename to app/code/Magento/Backend/Test/Mftf/ActionGroup/SetWebsiteCountryOptionsToDefaultActionGroup.xml
index 9b922df0b3e3e..4519648eb1d1b 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/SetMainWebsiteCountryOptionsToDefaultActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetWebsiteCountryOptionsToDefaultActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="SetMainWebsiteCountryOptionsToDefaultActionGroup">
+    <actionGroup name="SetWebsiteCountryOptionsToDefaultActionGroup">
         <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation3"/>
         <waitForElementVisible selector="{{CountryOptionsSection.topDestinations}}" stepKey="waitCheckboxToBeVisible3"/>
         <checkOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="setToDefault1"/>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/CountryOptionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/CountryOptionsSection.xml
new file mode 100644
index 0000000000000..2e2e5aec35ecd
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/CountryOptionsSection.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="CountryOptionsSection">
+        <element name="allowedCountries" type="select" selector="#general_country_allow"/>
+        <element name="notAllowedCountry" type="button" selector="#general_country_allow option:not([selected])"/>
+        <element name="generalCountryAllowInherit" type="checkbox" selector="#general_country_allow_inherit"/>
+        <element name="generalCountryDefaultInherit" type="checkbox" selector="#general_country_default_inherit"/>
+        <element name="generalCountryDefault" type="select" selector="#general_country_default"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/SetAccountSharingOptionActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/SetAccountSharingOptionActionGroup.xml
deleted file mode 100644
index 113383a296d08..0000000000000
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/SetAccountSharingOptionActionGroup.xml
+++ /dev/null
@@ -1,25 +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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="SetAccountSharingOptionActionGroup">
-        <arguments>
-            <argument name="option" defaultValue="Per Website" type="string"/>
-        </arguments>
-        <amOnPage url="{{AdminStoresCustomerConfigurationPage.url}}" stepKey="goToCustomerConfigurationPage"/>
-        <conditionalClick selector="{{AdminStoresCustomerConfigurationSection.accountSharingOptionsTab}}" dependentSelector="{{AdminStoresCustomerConfigurationSection.shareCustomerAccountInherit}}" visible="false" stepKey="expandAccountSharingOptionsTab"/>
-        <waitForElementVisible selector="{{AdminStoresCustomerConfigurationSection.shareCustomerAccountInherit}}" stepKey="waitSystemValueCheckboxToBeVisible"/>
-        <uncheckOption selector="{{AdminStoresCustomerConfigurationSection.shareCustomerAccountInherit}}" stepKey="uncheck"/>
-        <selectOption selector="{{AdminStoresCustomerConfigurationSection.shareCustomerAccount}}" userInput="{{option}}" stepKey="setAccountSharingOption"/>
-        <click selector="{{AdminStoresCustomerConfigurationSection.accountSharingOptionsTab}}" stepKey="collapseTab"/>
-        <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig"/>
-        <waitForPageLoad stepKey="waitConfigToBeSaved"/>
-        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
index 634d3490df05c..823be383ce123 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminStoresCustomerConfigurationSection.xml
@@ -10,8 +10,5 @@
         <element name="createNewAccOpt" type="button" selector="#customer_create_account-head"/>
         <element name="enableAutoAssignCustomerGroup" type="button" selector="#customer_create_account_auto_group_assign"/>
         <element name="groupForValidVATIdIntraUnion" type="select" selector="#customer_create_account_viv_intra_union_group"/>
-        <element name="accountSharingOptionsTab" type="button" selector="#customer_account_share-head"/>
-        <element name="shareCustomerAccountInherit" type="checkbox" selector="#customer_account_share_scope_inherit"/>
-        <element name="shareCustomerAccount" type="select" selector="#customer_account_share_scope"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
index dbec3683cf2d1..d007c860782aa 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
@@ -38,11 +38,6 @@
         <element name="countryOptions" type="button" selector="#general_country-head"/>
         <element name="countryOptionsOpen" type="button" selector="#general_country-head.open"/>
         <element name="topDestinations" type="select" selector="#general_country_destinations"/>
-        <element name="allowedCountries" type="select" selector="#general_country_allow"/>
-        <element name="notAllowedCountry" type="button" selector="#general_country_allow option:not([selected])"/>
-        <element name="generalCountryAllowInherit" type="checkbox" selector="#general_country_allow_inherit"/>
-        <element name="generalCountryDefaultInherit" type="checkbox" selector="#general_country_default_inherit"/>
-        <element name="generalCountryDefault" type="select" selector="#general_country_default"/>
     </section>
     <section name="StateOptionsSection">
         <element name="stateOptions" type="button" selector="#general_region-head"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
index 3cbd70d342824..11a47459ab7b3 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
@@ -21,4 +21,11 @@
     <entity name="GlobalCustomerAccountSharing" type="account_share_scope_value">
         <data key="value">0</data>
     </entity>
+
+    <entity name="CustomerAccountSharingSystemValue" type="customer_account_sharing_config_inherit">
+        <requiredEntity type="account_share_scope_inherit">CustomerAccountSharingInherit</requiredEntity>
+    </entity>
+    <entity name="CustomerAccountSharingInherit" type="account_share_scope_inherit">
+        <data key="inherit">true</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml
index 41701bfac11ad..c3132b5b6a44f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml
@@ -18,4 +18,16 @@
             </object>
         </object>
     </operation>
+    <operation name="CustomerAccountShareConfigInherit" dataType="customer_account_sharing_config_inherit" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/"
+               method="POST">
+        <object key="groups" dataType="customer_account_sharing_config_inherit">
+            <object key="account_share" dataType="customer_account_sharing_config_inherit">
+                <object key="fields" dataType="customer_account_sharing_config_inherit">
+                    <object key="scope" dataType="account_share_scope_inherit">
+                        <field key="inherit">boolean</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
 </operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
index 9e104eb52cf90..a934d71397b8c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerConfigSection.xml
@@ -8,5 +8,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerConfigSection">
         <element name="customerDataLifetime" type="input" selector="#customer_online_customers_section_data_lifetime"/>
+        <element name="accountSharingOptionsTab" type="button" selector="#customer_account_share-head"/>
+        <element name="shareCustomerAccountInherit" type="checkbox" selector="#customer_account_share_scope_inherit"/>
+        <element name="shareCustomerAccount" type="select" selector="#customer_account_share_scope"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
index 25617ca05dd44..17a4a283c2648 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
@@ -18,5 +18,6 @@
         <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
         <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
         <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
+        <element name="countryOptions" type="button" selector=".admin__data-grid-filters select[name=billing_country_id] option"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
index d48320123f82d..ed353403fc15d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -11,7 +11,7 @@
         <annotations>
             <title value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
             <description value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
-            <features value="Module/ Customer"/>
+            <features value="Customer"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-6441"/>
             <useCaseId value="MAGETWO-91523"/>
@@ -23,27 +23,29 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <actionGroup ref="LoginActionGroup" stepKey="login"/>
-
             <!--Create new website,store and store view-->
+            <comment userInput="Create new website,store and store view" stepKey="createWebsite"/>
             <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="goToAdminSystemStorePage"/>
-            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateNewWebsite">
+            <actionGroup ref="AdminCreateWebsite" stepKey="AdminCreateNewWebsite">
                 <argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
                 <argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateNewStore">
+            <actionGroup ref="AdminCreateNewStore" stepKey="AdminCreateNewStore">
                 <argument name="website" value="{{NewWebSiteData.name}}"/>
                 <argument name="storeGroupName" value="{{NewStoreData.name}}"/>
                 <argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateNewStoreView">
+            <actionGroup ref="AdminCreateStoreView" stepKey="AdminCreateNewStoreView">
                 <argument name="StoreGroup" value="NewStoreData"/>
             </actionGroup>
             <!--Set account sharing option - Default value is 'Per Website'-->
-            <actionGroup ref="SetAccountSharingOptionActionGroup" stepKey="setAccountSharingOptionToDefault"/>
+            <comment userInput="Set account sharing option - Default value is 'Per Website'" stepKey="setAccountSharingOption"/>
+            <createData entity="CustomerAccountSharingDefault" stepKey="setToAccountSharingToDefault"/>
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         </before>
         <after>
             <!--delete all created data and set main website country options to default-->
+            <comment userInput="Delete all created data and set main website country options to default" stepKey="resetConfigToDefault"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
@@ -54,22 +56,22 @@
             <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup">
                 <argument name="website" value="_defaultWebsite"/>
             </actionGroup>
-            <actionGroup ref="SetMainWebsiteCountryOptionsToDefaultActionGroup" stepKey="setCountryOptionsToDefault"/>
+            <actionGroup ref="SetWebsiteCountryOptionsToDefaultActionGroup" stepKey="setCountryOptionsToDefault"/>
+            <createData entity="CustomerAccountSharingSystemValue" stepKey="setAccountSharingToSystemValue"/>
             <actionGroup ref="logout" stepKey="logout"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </after>
         <!--Check that all countries are allowed initially and get amount-->
+        <comment userInput="Check that all countries are allowed initially and get amount" stepKey="checkAllCountriesAreAllowed"/>
         <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigGeneralPage"/>
-        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation"/>
-        <waitForElementVisible selector="{{CountryOptionsSection.allowedCountries}}" stepKey="waitTabToExpand"/>
-        <executeJS function="return document.querySelectorAll('{{CountryOptionsSection.allowedCountries}} option').length" stepKey="CountriesAmount"/>
-        <checkOption selector="{{CountryOptionsSection.generalCountryAllowInherit}}" stepKey="markAllCountriesAsAvailable"/>
-        <click selector="{{CountryOptionsSection.countryOptions}}" stepKey="collapseTab"/>
-        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
-        <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
-        <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
+        <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
+        <executeJS function="return document.querySelectorAll('{{CountryOptionsSection.allowedCountries}} option').length" stepKey="countriesAmount"/>
         <!-- Create customer for US -->
+        <comment userInput="Create customer for US" stepKey="createUSCustomer"/>
         <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
-        <!-- Switch to first website, allow only Canada and set Canada as default country-->
+        <!-- Switch to first website, allow only Canada and set Canada as default country -->
+        <comment userInput="Switch to first website, allow only Canada and set Canada as default country" stepKey="setCanadaAsDefaultCountry"/>
         <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup">
             <argument name="website" value="_defaultWebsite"/>
         </actionGroup>
@@ -82,6 +84,7 @@
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig2"/>
         <waitForPageLoad stepKey="waitForSavingSystemConfiguration2"/>
         <!--Switch to second website and allow all countries except Canada-->
+        <comment userInput="Switch to second website and allow all countries except Canada" stepKey="switchToWebsiteAndAllowOnlyCanada"/>
         <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup2">
             <argument name="website" value="NewWebSiteData"/>
         </actionGroup>
@@ -94,6 +97,7 @@
         <amOnPage url="{{AdminEditCustomerPage.url($$createCustomer.id$$)}}" stepKey="goToCustomerEditPage"/>
         <waitForPageLoad stepKey="waitPageToLoad"/>
         <!--Open created customer details page and change US address to Canada address-->
+        <comment userInput="Open created customer details page and change US address to Canada address" stepKey="changeCustomerAddressToCanada"/>
         <actionGroup ref="OpenEditCustomerAddressFromAdminActionGroup" stepKey="editCustomerAddress">
             <argument name="address" value="US_Address_CA"/>
         </actionGroup>
@@ -104,10 +108,11 @@
         <click stepKey="saveCustomer" selector="{{AdminCustomerAccountInformationSection.saveCustomerAndContinueEdit}}"/>
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <!--Go to Customers grid and check that filter countries amount is the same as initial allowed countries amount-->
+        <comment userInput="Go to Customers grid and check that filter countries amount is the same as initial allowed countries amount" stepKey="compareCountriesAmount"/>
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersGrid"/>
         <waitForPageLoad stepKey="waitForCustomersGrid"/>
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomersGrid"/>
-        <executeJS function="var len = document.querySelectorAll('{{AdminDataGridHeaderSection.countryOptions}}').length; return len-1;" stepKey="CountriesAmount2"/>
-        <assertEquals expected='($CountriesAmount)' expectedType="integer" actual="($CountriesAmount2)" stepKey="assertCountryAmounts"/>
+        <executeJS function="var len = document.querySelectorAll('{{AdminCustomerFiltersSection.countryOptions}}').length; return len-1;" stepKey="countriesAmount2"/>
+        <assertEquals expected='($countriesAmount)' expectedType="integer" actual="($countriesAmount2)" stepKey="assertCountryAmounts"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
index f881cf5c05cfc..4ee38e30f98e6 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
@@ -16,7 +16,6 @@
         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
         <element name="filterFieldInput" type="input" selector=".admin__data-grid-filters input[name='{{name}}']" parameterized="true"/>
         <element name="filterFieldSelect" type="select" selector=".admin__data-grid-filters select[name='{{name}}']" parameterized="true"/>
-        <element name="countryOptions" type="button" selector=".admin__data-grid-filters select[name=billing_country_id] option"/>
         <element name="cancelFilters" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>

From 342dc530ba86c6df56b5346139f305cf7cc24736 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Wed, 3 Apr 2019 12:49:16 +0300
Subject: [PATCH 0954/1055] MAGETWO-98620: Shipping quote in cart not persisted
 for Guest customers when Persistent Shopping Cart is enabled

---
 .../Magento/Persistent/Model/QuoteManager.php |  1 +
 .../CheckExpirePersistentQuoteObserver.php    | 10 ++-
 .../SetQuotePersistentDataObserver.php        |  8 +-
 .../ShippingQuotePersistedForGuestTest.xml    | 84 +++++++++++++++++++
 ...CheckExpirePersistentQuoteObserverTest.php | 20 ++++-
 .../SetQuotePersistentDataObserverTest.php    |  4 +-
 6 files changed, 118 insertions(+), 9 deletions(-)
 create mode 100644 app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml

diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index 35c2c70be30dc..34f84aa2c3cfc 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -87,6 +87,7 @@ public function setGuest($checkQuote = false)
                 ->setCustomerLastname(null)
                 ->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID)
                 ->setIsPersistent(false)
+                ->setCustomerIsGuest(true)
                 ->removeAllAddresses();
             //Create guest addresses
             $quote->getShippingAddress();
diff --git a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
index f3720960ca6e5..524cf7638af84 100644
--- a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
+++ b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.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\Event\ObserverInterface;
 
+/**
+ * Observer of expired session
+ */
 class CheckExpirePersistentQuoteObserver implements ObserverInterface
 {
     /**
@@ -107,8 +109,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             !$this->_persistentSession->isPersistent() &&
             !$this->_customerSession->isLoggedIn() &&
             $this->_checkoutSession->getQuoteId() &&
-            !$this->isRequestFromCheckoutPage($this->request)
+            !$this->isRequestFromCheckoutPage($this->request) &&
             // persistent session does not expire on onepage checkout page
+            (
+                $this->_checkoutSession->getQuote()->getIsPersistent() ||
+                $this->_checkoutSession->getQuote()->getCustomerIsGuest()
+            )
         ) {
             $this->_eventManager->dispatch('persistent_session_expired');
             $this->quoteManager->expire();
diff --git a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
index db6b6d1ee370d..d7183bb5a6602 100644
--- a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.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\Event\ObserverInterface;
 
+/**
+ * Observer for setting "is_persistent" value to quote
+ */
 class SetQuotePersistentDataObserver implements ObserverInterface
 {
     /**
@@ -73,8 +75,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         if ((
-                ($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
-                && !$this->_persistentData->isShoppingCartPersist()
+                ($this->_persistentSession->isPersistent())
+                && $this->_persistentData->isShoppingCartPersist()
             )
             && $this->quoteManager->isPersistent()
         ) {
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml
new file mode 100644
index 0000000000000..e5c77ee414362
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml
@@ -0,0 +1,84 @@
+<?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="ShippingQuotePersistedForGuestTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="Guest checkout"/>
+            <title value="Estimate Shipping and Tax block sections on shipping cart saving correctly for Guest."/>
+            <description value="Verify that 'Estimate Shipping and Tax' block sections on shipping cart saving correctly for Guest after switching to another page. And check that the shopping cart is cleared after reset persistent cookie."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-99025"/>
+            <useCaseId value="MAGETWO-98620"/>
+            <group value="persistent"/>
+        </annotations>
+        <before>
+            <!--Enabled The Persistent Shopping Cart feature -->
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <createData entity="PersistentLogoutClearDisable" stepKey="persistentLogoutClearDisable"/>
+            <!--Create simple product-->
+            <createData entity="SimpleProduct2" stepKey="createProduct">
+                <field key="price">150</field>
+            </createData>
+            <!--Create customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer">
+                <field key="firstname">John1</field>
+                <field key="lastname">Doe1</field>
+            </createData>
+        </before>
+        <after>
+            <!--Revert persistent configuration to default-->
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Step 1: Login as a Customer with remember me checked-->
+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeChecked" stepKey="loginToStorefrontAccountWithRememberMeChecked">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!--Step 2: Open the Product Page and add the product to shopping cart-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPageAsLoggedUser"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCartAsLoggedUser">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <!--Step 3: Log out, reset persistent cookie and go to homepage-->
+        <amOnPage url="{{StorefrontCustomerSignOutPage.url}}" stepKey="signOut"/>
+        <waitForLoadingMaskToDisappear stepKey="waitSignOutPage"/>
+        <resetCookie userInput="persistent_shopping_cart" stepKey="resetPersistentCookie"/>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePageAfterResetPersistentCookie"/>
+        <waitForPageLoad stepKey="waitHomePageLoadAfterResetCookie"/>
+        <!--Check that the minicart is empty-->
+        <actionGroup ref="assertMiniCartEmpty" after="waitHomePageLoadAfterResetCookie" stepKey="seeMinicartEmpty"/>
+        <!--Step 4: Add the product to shopping cart and open cart-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPageAsGuestUser"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCartAsGuestUser">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartBeforeChangeShippingAndTaxSection"/>
+        <!--Step 5: Open Estimate Shipping and Tax block and fill the sections-->
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTax" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="selectUSCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="selectCaliforniaRegion"/>
+        <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{US_Address_CA.postcode}}" stepKey="inputPostCode"/>
+        <!--Step 6: Go to Homepage-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePageAfterChangingShippingAndTaxSection"/>
+        <!--Step 7: Go to shopping cart and check "Estimate Shipping and Tax" fields values are saved-->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" after="goToHomePageAfterChangingShippingAndTaxSection" stepKey="goToShoppingCartAfterChangingShippingAndTaxSection"/>
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTaxAfterChanging" />
+        <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>
+            <actualResult type="variable">grabTextPostCode</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
index 46dda1be365d4..b096dd2317a33 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
@@ -1,12 +1,16 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
+use Magento\Quote\Model\Quote;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -54,6 +58,11 @@ class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
      */
     private $requestMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Quote
+     */
+    private $quoteMock;
+
     /**
      * @inheritdoc
      */
@@ -83,6 +92,10 @@ protected function setUp()
             $this->checkoutSessionMock,
             $this->requestMock
         );
+        $this->quoteMock = $this->getMockBuilder(Quote::class)
+        ->setMethods(['getCustomerIsGuest', 'getIsPersistent'])
+        ->disableOriginalConstructor()
+        ->getMock();
     }
 
     public function testExecuteWhenCanNotApplyPersistentData()
@@ -133,6 +146,11 @@ public function testExecuteWhenPersistentIsEnabled(
             ->willReturn(true);
         $this->persistentHelperMock->expects($this->once())->method('isEnabled')->willReturn(true);
         $this->sessionMock->expects($this->once())->method('isPersistent')->willReturn(false);
+        $this->checkoutSessionMock
+            ->method('getQuote')
+            ->willReturn($this->quoteMock);
+        $this->quoteMock->method('getCustomerIsGuest')->willReturn(true);
+        $this->quoteMock->method('getIsPersistent')->willReturn(true);
         $this->customerSessionMock
             ->expects($this->atLeastOnce())
             ->method('isLoggedIn')
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
index 6724743789cea..d74aaa1c90362 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
@@ -83,7 +83,6 @@ public function testExecuteWhenQuoteNotExist()
             ->method('getEvent')
             ->will($this->returnValue($this->eventManagerMock));
         $this->eventManagerMock->expects($this->once())->method('getQuote');
-        $this->customerSessionMock->expects($this->never())->method('isLoggedIn');
         $this->model->execute($this->observerMock);
     }
 
@@ -98,8 +97,7 @@ public function testExecuteWhenSessionIsPersistent()
             ->expects($this->once())
             ->method('getQuote')
             ->will($this->returnValue($this->quoteMock));
-        $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false));
-        $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(false));
+        $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(true));
         $this->quoteManagerMock->expects($this->once())->method('isPersistent')->will($this->returnValue(true));
         $this->quoteMock->expects($this->once())->method('setIsPersistent')->with(true);
         $this->model->execute($this->observerMock);

From a56b9877a86235990c9dcb888c86a32cb251b8b3 Mon Sep 17 00:00:00 2001
From: Jayanka <jayan@codilar.com>
Date: Wed, 3 Apr 2019 15:47:55 +0530
Subject: [PATCH 0955/1055] save_parameters_in_session set to true for admin
 user grid

---
 .../User/view/adminhtml/layout/adminhtml_user_grid_block.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml
index a4bc9aa5ed48b..8289b3e730d5d 100644
--- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml
+++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_user_grid_block.xml
@@ -16,6 +16,7 @@
                     <argument name="default_sort" xsi:type="string">username</argument>
                     <argument name="default_dir" xsi:type="string">asc</argument>
                     <argument name="grid_url" xsi:type="url" path="*/*/roleGrid"/>
+                    <argument name="save_parameters_in_session" xsi:type="boolean">true</argument>
                 </arguments>
                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="permission.user.grid.columnSet">
                     <arguments>

From 6422fb26203140bd15fb86fc2d21ca6b8fc8c055 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Wed, 3 Apr 2019 14:40:50 +0300
Subject: [PATCH 0956/1055] MAGETWO-98620: Shipping quote in cart not persisted
 for Guest customers when Persistent Shopping Cart is enabled

---
 app/code/Magento/Persistent/Model/QuoteManager.php              | 2 ++
 .../Persistent/Observer/CheckExpirePersistentQuoteObserver.php  | 2 ++
 .../Persistent/Observer/SetQuotePersistentDataObserver.php      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index 34f84aa2c3cfc..8ae22e4c26c6f 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -7,6 +7,8 @@
 
 /**
  * Class QuoteManager
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class QuoteManager
 {
diff --git a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
index 524cf7638af84..79fdf44c3c551 100644
--- a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
+++ b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
@@ -9,6 +9,8 @@
 
 /**
  * Observer of expired session
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class CheckExpirePersistentQuoteObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
index d7183bb5a6602..2803bc998dcbe 100644
--- a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
@@ -9,6 +9,8 @@
 
 /**
  * Observer for setting "is_persistent" value to quote
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class SetQuotePersistentDataObserver implements ObserverInterface
 {

From 2d0eecc3e3cab0bd1bf0f2c70d3ff097711d6304 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 3 Apr 2019 15:16:03 +0300
Subject: [PATCH 0957/1055] graphQl-512: added street lines validation

---
 .../Model/Cart/QuoteAddress/Validator.php     | 45 +++++++++++++
 .../Model/Cart/QuoteAddressFactory.php        | 14 +++-
 .../Customer/CreateCustomerAddressTest.php    | 66 +++++++++++++++++++
 .../Customer/SetBillingAddressOnCartTest.php  | 43 ++++++++++++
 .../Customer/SetShippingAddressOnCartTest.php | 46 +++++++++++++
 .../Guest/SetBillingAddressOnCartTest.php     | 43 ++++++++++++
 .../Guest/SetShippingAddressOnCartTest.php    | 44 +++++++++++++
 7 files changed, 300 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php
new file mode 100644
index 0000000000000..8cf2478d8f8b6
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart\QuoteAddress;
+
+use Magento\Customer\Helper\Address as AddressHelper;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+
+/**
+ * Validate Quote Address
+ */
+class Validator
+{
+    /**
+     * @var AddressHelper
+     */
+    private $addressHelper;
+
+    /**
+     * @param AddressHelper $addressHelper
+     */
+    public function __construct(AddressHelper $addressHelper)
+    {
+        $this->addressHelper = $addressHelper;
+    }
+
+    /**
+     * Additional Quote Address validation for the GraphQl endpoint
+     *
+     * @param QuoteAddress $quoteAddress
+     * @throws GraphQlInputException
+     */
+    public function validate(QuoteAddress $quoteAddress)
+    {
+        $maxAllowedLineCount = $this->addressHelper->getStreetLines();
+        if (is_array($quoteAddress->getStreet()) && count($quoteAddress->getStreet()) > $maxAllowedLineCount) {
+            throw new GraphQlInputException(__('"Street Address" cannot contain more than %1 lines.', $maxAllowedLineCount));
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
index 76bdc74611131..734843e1be09b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -12,6 +12,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\Quote\AddressFactory as BaseQuoteAddressFactory;
+use Magento\QuoteGraphQl\Model\Cart\QuoteAddress\Validator;
 
 /**
  * Create QuoteAddress
@@ -22,14 +23,21 @@ class QuoteAddressFactory
      * @var BaseQuoteAddressFactory
      */
     private $quoteAddressFactory;
+    /**
+     * @var Validator
+     */
+    private $quoteAddressValidator;
 
     /**
      * @param BaseQuoteAddressFactory $quoteAddressFactory
+     * @param Validator $quoteAddressValidator
      */
     public function __construct(
-        BaseQuoteAddressFactory $quoteAddressFactory
+        BaseQuoteAddressFactory $quoteAddressFactory,
+        Validator $quoteAddressValidator
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
+        $this->quoteAddressValidator = $quoteAddressValidator;
     }
 
     /**
@@ -44,6 +52,8 @@ public function createBasedOnInputData(array $addressInput): QuoteAddress
 
         $quoteAddress = $this->quoteAddressFactory->create();
         $quoteAddress->addData($addressInput);
+        $this->quoteAddressValidator->validate($quoteAddress);
+
         return $quoteAddress;
     }
 
@@ -62,6 +72,8 @@ public function createBasedOnCustomerAddress(CustomerAddress $customerAddress):
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()), $e);
         }
+        $this->quoteAddressValidator->validate($quoteAddress);
+
         return $quoteAddress;
     }
 }
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 602d969924fbd..4ea19f08e3c1c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -198,6 +198,72 @@ public function testCreateCustomerAddressWithMissingAttribute()
         $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCreateCustomerAddressWithRedundantStreetLine()
+    {
+        $newAddress = [
+            'region' => [
+                'region' => 'Arizona',
+                'region_id' => 4,
+                'region_code' => 'AZ'
+            ],
+            'country_id' => 'US',
+            'street' => ['Line 1 Street', 'Line 2', 'Line 3'],
+            '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' => false
+        ];
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  createCustomerAddress(input: {
+    region: {
+        region: "{$newAddress['region']['region']}"
+        region_id: {$newAddress['region']['region_id']}
+        region_code: "{$newAddress['region']['region_code']}"
+    }
+    country_id: {$newAddress['country_id']}
+    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}","{$newAddress['street'][2]}"]
+    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: true
+    default_billing: false
+  }) {
+    id
+  }
+}
+MUTATION;
+
+        $userName = 'customer@example.com';
+        $password = 'password';
+
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
     /**
      * Verify the fields for Customer address
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 88e7b93dd1d08..2ee5bb6708f4c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -493,6 +493,49 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewBillingAddressWithRedundantStreetLine()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+         address: {
+          firstname: "test firstname"
+          lastname: "test lastname"
+          company: "test company"
+          street: ["test street 1", "test street 2", "test street 3"]
+          city: "test city"
+          region: "test region"
+          postcode: "887766"
+          country_code: "US"
+          telephone: "88776655"
+          save_in_address_book: false
+         }
+      }
+    }
+  ) {
+    cart {
+      billing_address {
+        firstname
+      }
+    }
+  }
+}
+QUERY;
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * @return array
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 5ff29d20b34d7..f765851f2372e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -486,6 +486,52 @@ public function testSetMultipleNewShippingAddresses()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2", "test street 3"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+      }
+    }
+  }
+}
+QUERY;
+
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index ae0a1a0e822ac..5fe0ae05903c5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -313,6 +313,49 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewBillingAddressRedundantStreetLine()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+        address: {
+          firstname: "test firstname"
+          lastname: "test lastname"
+          company: "test company"
+          street: ["test street 1", "test street 2", "test street 3"]
+          city: "test city"
+          region: "test region"
+          postcode: "887766"
+          country_code: "US"
+          telephone: "88776655"
+          save_in_address_book: false
+        }
+      }
+    }
+  ) {
+    cart {
+      billing_address {
+        firstname
+      }
+    }
+  }
+}
+QUERY;
+
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @return array
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index e21d9ed64d491..f86b621497200 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -246,6 +246,50 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2", "test street 3"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+      }
+    }
+  }
+}
+QUERY;
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @return array
      */

From bd04930788146e542ea2b761e4ccc921095cd5c0 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 3 Apr 2019 16:07:15 +0300
Subject: [PATCH 0958/1055] Fix static tests.

---
 .../Framework/Crontab/CrontabManager.php      | 17 ++++---
 .../Crontab/Test/Unit/CrontabManagerTest.php  | 44 ++++++++++---------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/lib/internal/Magento/Framework/Crontab/CrontabManager.php b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
index 37ced978c5567..da81540faf477 100644
--- a/lib/internal/Magento/Framework/Crontab/CrontabManager.php
+++ b/lib/internal/Magento/Framework/Crontab/CrontabManager.php
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+
 namespace Magento\Framework\Crontab;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -40,31 +41,35 @@ public function __construct(
     }
 
     /**
+     * Build tasks block start text.
+     *
      * @return string
      */
     private function getTasksBlockStart()
     {
         $tasksBlockStart = self::TASKS_BLOCK_START;
         if (defined('BP')) {
-            $tasksBlockStart .= ' ' . md5(BP);
+            $tasksBlockStart .= ' ' . hash("sha256", BP);
         }
         return $tasksBlockStart;
     }
 
     /**
+     * Build tasks block end text.
+     *
      * @return string
      */
     private function getTasksBlockEnd()
     {
         $tasksBlockEnd = self::TASKS_BLOCK_END;
         if (defined('BP')) {
-            $tasksBlockEnd .= ' ' . md5(BP);
+            $tasksBlockEnd .= ' ' . hash("sha256", BP);
         }
         return $tasksBlockEnd;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTasks()
     {
@@ -82,7 +87,7 @@ public function getTasks()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function saveTasks(array $tasks)
     {
@@ -118,8 +123,7 @@ public function saveTasks(array $tasks)
     }
 
     /**
-     * {@inheritdoc}
-     * @throws LocalizedException
+     * @inheritdoc
      */
     public function removeTasks()
     {
@@ -203,6 +207,7 @@ private function save($content)
 
         try {
             $this->shell->execute('echo "' . $content . '" | crontab -');
+            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (LocalizedException $e) {
             throw new LocalizedException(
                 new Phrase('Error during saving of crontab: %1', [$e->getPrevious()->getMessage()]),
diff --git a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
index b07703d2bd0ba..f6c863d9d9fad 100644
--- a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
+++ b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+
 namespace Magento\Framework\Crontab\Test\Unit;
 
 use Magento\Framework\Crontab\CrontabManager;
@@ -16,6 +17,9 @@
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Filesystem\DriverPool;
 
+/**
+ * Tests crontab manager functionality.
+ */
 class CrontabManagerTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -88,17 +92,17 @@ public function getTasksDataProvider()
         return [
             [
                 'content' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
                 'tasks' => ['* * * * * /bin/php /var/www/magento/bin/magento cron:run'],
             ],
             [
                 'content' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
                     . '* * * * * /bin/php /var/www/magento/bin/magento setup:cron:run' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
                 'tasks' => [
                     '* * * * * /bin/php /var/www/magento/bin/magento cron:run',
                     '* * * * * /bin/php /var/www/magento/bin/magento setup:cron:run',
@@ -166,17 +170,17 @@ public function removeTasksDataProvider()
         return [
             [
                 'contentBefore' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
                 'contentAfter' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
             ],
             [
                 'contentBefore' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
                     . '* * * * * /bin/php /var/www/magento/bin/magento setup:cron:run' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
                 'contentAfter' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
             ],
             [
@@ -292,9 +296,9 @@ public function testSaveTasks($tasks, $content, $contentToSave)
     public function saveTasksDataProvider()
     {
         $content = '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-            . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+            . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
             . '* * * * * /bin/php /var/www/magento/bin/magento cron:run' . PHP_EOL
-            . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL;
+            . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL;
 
         return [
             [
@@ -303,9 +307,9 @@ public function saveTasksDataProvider()
                 ],
                 'content' => $content,
                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '* * * * * ' . PHP_BINARY . ' run.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
             ],
             [
                 'tasks' => [
@@ -313,9 +317,9 @@ public function saveTasksDataProvider()
                 ],
                 'content' => $content,
                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '1 2 3 4 5 ' . PHP_BINARY . ' run.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
             ],
             [
                 'tasks' => [
@@ -323,10 +327,10 @@ public function saveTasksDataProvider()
                 ],
                 'content' => $content,
                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php >>'
                     . ' /var/www/magento2/var/log/cron.log' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
             ],
             [
                 'tasks' => [
@@ -334,10 +338,10 @@ public function saveTasksDataProvider()
                 ],
                 'content' => $content,
                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php'
                     . ' %% cron:run | grep -v \"Ran \'jobs\' by schedule\"' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
             ],
             [
                 'tasks' => [
@@ -345,10 +349,10 @@ public function saveTasksDataProvider()
                 ],
                 'content' => '* * * * * /bin/php /var/www/cron.php',
                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . md5(BP) . PHP_EOL
+                    . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php'
                     . ' %% cron:run | grep -v \"Ran \'jobs\' by schedule\"' . PHP_EOL
-                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . md5(BP) . PHP_EOL,
+                    . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
             ],
         ];
     }

From c998567f363d14a14edba3a6727bfa6effa0350d Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Wed, 3 Apr 2019 16:16:56 +0300
Subject: [PATCH 0959/1055] MAGETWO-98620: Shipping quote in cart not persisted
 for Guest customers when Persistent Shopping Cart is enabled

---
 .../Test/Unit/Observer/SetQuotePersistentDataObserverTest.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
index d74aaa1c90362..ffa829e8456cc 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
@@ -7,6 +7,9 @@
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
+/**
+ * Observer test for setting "is_persistent" value to quote
+ */
 class SetQuotePersistentDataObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**

From 4ce2497fe539dd4357a295ee5f03864a20f6a223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Ca=C3=A7ador?= <samuelmoreira27@gmail.com>
Date: Wed, 3 Apr 2019 14:20:41 +0100
Subject: [PATCH 0960/1055] Fix broken link in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9e3cf448f99fb..af1d3d4c80404 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento System Requirements
-[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
+[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements.html).
 
 ## Install Magento
 

From c72c82229afd81d0ffbed81fd822c1783e3c8c9b Mon Sep 17 00:00:00 2001
From: Davit_Zakharyan <davit_zakharyan@epam.com>
Date: Wed, 3 Apr 2019 17:38:17 +0400
Subject: [PATCH 0961/1055] MAGETWO-91523: [2.3] Allowed countries restriction
 for a default website is applied to backend customer grid

- Fixed automated test script.
---
 .../Test/AllowedCountriesRestrictionApplyOnBackendTest.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
index ed353403fc15d..d8d77b6564987 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -26,16 +26,16 @@
             <!--Create new website,store and store view-->
             <comment userInput="Create new website,store and store view" stepKey="createWebsite"/>
             <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="goToAdminSystemStorePage"/>
-            <actionGroup ref="AdminCreateWebsite" stepKey="AdminCreateNewWebsite">
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateNewWebsite">
                 <argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
                 <argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateNewStore" stepKey="AdminCreateNewStore">
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateNewStore">
                 <argument name="website" value="{{NewWebSiteData.name}}"/>
                 <argument name="storeGroupName" value="{{NewStoreData.name}}"/>
                 <argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateStoreView" stepKey="AdminCreateNewStoreView">
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateNewStoreView">
                 <argument name="StoreGroup" value="NewStoreData"/>
             </actionGroup>
             <!--Set account sharing option - Default value is 'Per Website'-->

From e29fa3d9b150d81da1caa3484d90ecc3d2156770 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 3 Apr 2019 16:44:50 +0300
Subject: [PATCH 0962/1055] magento/magento2#18440: Static test fix.

---
 .../Block/Product/View/GalleryOptions.php     |   4 +-
 .../Block/Product/View/GalleryOptionsTest.php | 446 +++++++++---------
 2 files changed, 226 insertions(+), 224 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
index dd2c62174a734..0384c9cd9acce 100644
--- a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Catalog\Block\Product\View;
 
 use Magento\Framework\View\Element\Block\ArgumentInterface;
@@ -11,6 +10,9 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Framework\Stdlib\ArrayUtils;
 
+/**
+ * Gallery options block.
+ */
 class GalleryOptions extends AbstractView implements ArgumentInterface
 {
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
index 5ade6af9fac33..7ed8b13fce750 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
@@ -1,223 +1,223 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Test\Unit\Block\Product\View;
-
-use Magento\Catalog\Block\Product\Context;
-use Magento\Catalog\Block\Product\View\Gallery;
-use Magento\Catalog\Block\Product\View\GalleryOptions;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Escaper;
-use Magento\Framework\View\Config;
-use Magento\Framework\Config\View;
-use Magento\Framework\Serialize\Serializer\Json;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class GalleryOptionsTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var GalleryOptions
-     */
-    private $model;
-
-    /**
-     * @var Gallery|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $gallery;
-
-    /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $context;
-
-    /**
-     * @var Json
-     */
-    private $jsonSerializer;
-
-    /**
-     * @var View|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $configView;
-
-    /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $viewConfig;
-
-    /**
-     * @var Escaper
-     */
-    private $escaper;
-
-    protected function setUp()
-    {
-        $objectManager = new ObjectManager($this);
-
-        $this->escaper = $objectManager->getObject(Escaper::class);
-        $this->configView = $this->createMock(View::class);
-
-        $this->viewConfig = $this->createConfiguredMock(
-            Config::class,
-            [
-                'getViewConfig' => $this->configView
-            ]
-        );
-
-        $this->context = $this->createConfiguredMock(
-            Context::class,
-            [
-                'getEscaper' => $this->escaper,
-                'getViewConfig' => $this->viewConfig
-            ]
-        );
-
-        $this->gallery = $this->createMock(Gallery::class);
-
-        $this->jsonSerializer = $objectManager->getObject(
-            Json::class
-        );
-
-        $this->model =  $objectManager->getObject(GalleryOptions::class, [
-            'context' => $this->context,
-            'jsonSerializer' => $this->jsonSerializer,
-            'gallery' => $this->gallery
-        ]);
-    }
-
-    public function testGetOptionsJson()
-    {
-        $configMap = [
-            ['Magento_Catalog', 'gallery/nav', 'thumbs'],
-            ['Magento_Catalog', 'gallery/loop', false],
-            ['Magento_Catalog', 'gallery/keyboard', true],
-            ['Magento_Catalog', 'gallery/arrows', true],
-            ['Magento_Catalog', 'gallery/caption', false],
-            ['Magento_Catalog', 'gallery/allowfullscreen', true],
-            ['Magento_Catalog', 'gallery/navdir', 'horizontal'],
-            ['Magento_Catalog', 'gallery/navarrows', true],
-            ['Magento_Catalog', 'gallery/navtype', 'slides'],
-            ['Magento_Catalog', 'gallery/thumbmargin', '5'],
-            ['Magento_Catalog', 'gallery/transition/effect', 'slide'],
-            ['Magento_Catalog', 'gallery/transition/duration', '500'],
-        ];
-
-        $imageAttributesMap = [
-            ['product_page_image_medium','height',null, 100],
-            ['product_page_image_medium','width',null, 200],
-            ['product_page_image_small','height',null, 300],
-            ['product_page_image_small','width',null, 400]
-        ];
-
-        $this->configView->expects($this->any())
-            ->method('getVarValue')
-            ->will($this->returnValueMap($configMap));
-        $this->gallery->expects($this->any())
-            ->method('getImageAttribute')
-            ->will($this->returnValueMap($imageAttributesMap));
-
-        $json = $this->model->getOptionsJson();
-
-        $decodedJson = $this->jsonSerializer->unserialize($json);
-
-        $this->assertSame('thumbs', $decodedJson['nav']);
-        $this->assertSame(false, $decodedJson['loop']);
-        $this->assertSame(true, $decodedJson['keyboard']);
-        $this->assertSame(true, $decodedJson['arrows']);
-        $this->assertSame(false, $decodedJson['showCaption']);
-        $this->assertSame(true, $decodedJson['allowfullscreen']);
-        $this->assertSame('horizontal', $decodedJson['navdir']);
-        $this->assertSame(true, $decodedJson['navarrows']);
-        $this->assertSame('slides', $decodedJson['navtype']);
-        $this->assertSame(5, $decodedJson['thumbmargin']);
-        $this->assertSame('slide', $decodedJson['transition']);
-        $this->assertSame(500, $decodedJson['transitionduration']);
-        $this->assertSame(100, $decodedJson['height']);
-        $this->assertSame(200, $decodedJson['width']);
-        $this->assertSame(300, $decodedJson['thumbheight']);
-        $this->assertSame(400, $decodedJson['thumbwidth']);
-    }
-
-    public function testGetFSOptionsJson()
-    {
-        $configMap = [
-            ['Magento_Catalog', 'gallery/fullscreen/nav', false],
-            ['Magento_Catalog', 'gallery/fullscreen/loop', true],
-            ['Magento_Catalog', 'gallery/fullscreen/keyboard', true],
-            ['Magento_Catalog', 'gallery/fullscreen/arrows', false],
-            ['Magento_Catalog', 'gallery/fullscreen/caption', true],
-            ['Magento_Catalog', 'gallery/fullscreen/navdir', 'vertical'],
-            ['Magento_Catalog', 'gallery/fullscreen/navarrows', false],
-            ['Magento_Catalog', 'gallery/fullscreen/navtype', 'thumbs'],
-            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', '10'],
-            ['Magento_Catalog', 'gallery/fullscreen/transition/effect', 'dissolve'],
-            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', '300']
-        ];
-
-        $this->configView->expects($this->any())
-            ->method('getVarValue')
-            ->will($this->returnValueMap($configMap));
-
-        $json = $this->model->getFSOptionsJson();
-
-        $decodedJson = $this->jsonSerializer->unserialize($json);
-
-        //Note, this tests the special case for nav variable set to false. It
-        //Should not be converted to boolean.
-        $this->assertSame('false', $decodedJson['nav']);
-        $this->assertSame(true, $decodedJson['loop']);
-        $this->assertSame(false, $decodedJson['arrows']);
-        $this->assertSame(true, $decodedJson['keyboard']);
-        $this->assertSame(true, $decodedJson['showCaption']);
-        $this->assertSame('vertical', $decodedJson['navdir']);
-        $this->assertSame(false, $decodedJson['navarrows']);
-        $this->assertSame(10, $decodedJson['thumbmargin']);
-        $this->assertSame('thumbs', $decodedJson['navtype']);
-        $this->assertSame('dissolve', $decodedJson['transition']);
-        $this->assertSame(300, $decodedJson['transitionduration']);
-    }
-
-    public function testGetOptionsJsonOptionals()
-    {
-        $configMap = [
-            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
-            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
-        ];
-
-        $this->configView->expects($this->any())
-            ->method('getVarValue')
-            ->will($this->returnValueMap($configMap));
-
-        $json = $this->model->getOptionsJson();
-
-        $decodedJson = $this->jsonSerializer->unserialize($json);
-
-        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
-        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
-    }
-
-    public function testGetFSOptionsJsonOptionals()
-    {
-        $configMap = [
-            ['Magento_Catalog', 'gallery/fullscreen/keyboard', false],
-            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
-            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
-        ];
-
-        $this->configView->expects($this->any())
-            ->method('getVarValue')
-            ->will($this->returnValueMap($configMap));
-
-        $json = $this->model->getFSOptionsJson();
-
-        $decodedJson = $this->jsonSerializer->unserialize($json);
-
-        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
-        $this->assertArrayNotHasKey('keyboard', $decodedJson);
-        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
-    }
-}
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Unit\Block\Product\View;
+
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Block\Product\View\Gallery;
+use Magento\Catalog\Block\Product\View\GalleryOptions;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Config;
+use Magento\Framework\Config\View;
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class GalleryOptionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GalleryOptions
+     */
+    private $model;
+
+    /**
+     * @var Gallery|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $gallery;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var View|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configView;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $viewConfig;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->escaper = $objectManager->getObject(Escaper::class);
+        $this->configView = $this->createMock(View::class);
+
+        $this->viewConfig = $this->createConfiguredMock(
+            Config::class,
+            [
+                'getViewConfig' => $this->configView
+            ]
+        );
+
+        $this->context = $this->createConfiguredMock(
+            Context::class,
+            [
+                'getEscaper' => $this->escaper,
+                'getViewConfig' => $this->viewConfig
+            ]
+        );
+
+        $this->gallery = $this->createMock(Gallery::class);
+
+        $this->jsonSerializer = $objectManager->getObject(
+            Json::class
+        );
+
+        $this->model =  $objectManager->getObject(GalleryOptions::class, [
+            'context' => $this->context,
+            'jsonSerializer' => $this->jsonSerializer,
+            'gallery' => $this->gallery
+        ]);
+    }
+
+    public function testGetOptionsJson()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/nav', 'thumbs'],
+            ['Magento_Catalog', 'gallery/loop', false],
+            ['Magento_Catalog', 'gallery/keyboard', true],
+            ['Magento_Catalog', 'gallery/arrows', true],
+            ['Magento_Catalog', 'gallery/caption', false],
+            ['Magento_Catalog', 'gallery/allowfullscreen', true],
+            ['Magento_Catalog', 'gallery/navdir', 'horizontal'],
+            ['Magento_Catalog', 'gallery/navarrows', true],
+            ['Magento_Catalog', 'gallery/navtype', 'slides'],
+            ['Magento_Catalog', 'gallery/thumbmargin', '5'],
+            ['Magento_Catalog', 'gallery/transition/effect', 'slide'],
+            ['Magento_Catalog', 'gallery/transition/duration', '500'],
+        ];
+
+        $imageAttributesMap = [
+            ['product_page_image_medium','height',null, 100],
+            ['product_page_image_medium','width',null, 200],
+            ['product_page_image_small','height',null, 300],
+            ['product_page_image_small','width',null, 400]
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+        $this->gallery->expects($this->any())
+            ->method('getImageAttribute')
+            ->will($this->returnValueMap($imageAttributesMap));
+
+        $json = $this->model->getOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        $this->assertSame('thumbs', $decodedJson['nav']);
+        $this->assertSame(false, $decodedJson['loop']);
+        $this->assertSame(true, $decodedJson['keyboard']);
+        $this->assertSame(true, $decodedJson['arrows']);
+        $this->assertSame(false, $decodedJson['showCaption']);
+        $this->assertSame(true, $decodedJson['allowfullscreen']);
+        $this->assertSame('horizontal', $decodedJson['navdir']);
+        $this->assertSame(true, $decodedJson['navarrows']);
+        $this->assertSame('slides', $decodedJson['navtype']);
+        $this->assertSame(5, $decodedJson['thumbmargin']);
+        $this->assertSame('slide', $decodedJson['transition']);
+        $this->assertSame(500, $decodedJson['transitionduration']);
+        $this->assertSame(100, $decodedJson['height']);
+        $this->assertSame(200, $decodedJson['width']);
+        $this->assertSame(300, $decodedJson['thumbheight']);
+        $this->assertSame(400, $decodedJson['thumbwidth']);
+    }
+
+    public function testGetFSOptionsJson()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/fullscreen/nav', false],
+            ['Magento_Catalog', 'gallery/fullscreen/loop', true],
+            ['Magento_Catalog', 'gallery/fullscreen/keyboard', true],
+            ['Magento_Catalog', 'gallery/fullscreen/arrows', false],
+            ['Magento_Catalog', 'gallery/fullscreen/caption', true],
+            ['Magento_Catalog', 'gallery/fullscreen/navdir', 'vertical'],
+            ['Magento_Catalog', 'gallery/fullscreen/navarrows', false],
+            ['Magento_Catalog', 'gallery/fullscreen/navtype', 'thumbs'],
+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', '10'],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/effect', 'dissolve'],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', '300']
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+
+        $json = $this->model->getFSOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        //Note, this tests the special case for nav variable set to false. It
+        //Should not be converted to boolean.
+        $this->assertSame('false', $decodedJson['nav']);
+        $this->assertSame(true, $decodedJson['loop']);
+        $this->assertSame(false, $decodedJson['arrows']);
+        $this->assertSame(true, $decodedJson['keyboard']);
+        $this->assertSame(true, $decodedJson['showCaption']);
+        $this->assertSame('vertical', $decodedJson['navdir']);
+        $this->assertSame(false, $decodedJson['navarrows']);
+        $this->assertSame(10, $decodedJson['thumbmargin']);
+        $this->assertSame('thumbs', $decodedJson['navtype']);
+        $this->assertSame('dissolve', $decodedJson['transition']);
+        $this->assertSame(300, $decodedJson['transitionduration']);
+    }
+
+    public function testGetOptionsJsonOptionals()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+
+        $json = $this->model->getOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
+        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
+    }
+
+    public function testGetFSOptionsJsonOptionals()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/fullscreen/keyboard', false],
+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+
+        $json = $this->model->getFSOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
+        $this->assertArrayNotHasKey('keyboard', $decodedJson);
+        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
+    }
+}

From 6d99e19ec8ea9463d674606bd3b081a4c4b44739 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 3 Apr 2019 16:17:16 +0200
Subject: [PATCH 0963/1055] Tests refactoring

---
 .../Magento/Catalog/_files/product_simple_with_options.php    | 4 ++--
 .../Catalog/_files/product_simple_with_options_rollback.php   | 4 +++-
 .../testsuite/Magento/Catalog/_files/product_virtual.php      | 2 +-
 .../Magento/Catalog/_files/product_virtual_with_options.php   | 2 +-
 .../Catalog/_files/product_virtual_with_options_rollback.php  | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
index b139f6865a2f4..fa8046fef3975 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
@@ -89,7 +89,7 @@
 $customOptions = [];
 
 /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
-$customOptionFactory = $objectManager->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+$customOptionFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
 
 foreach ($options as $option) {
     /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $customOption */
@@ -102,5 +102,5 @@
 $product->setOptions($customOptions);
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
index 386e98ceedec4..2d783a6d07522 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
@@ -15,9 +15,11 @@
 );
 try {
     $product = $repository->get('simple', false, null, true);
-    $product->delete();
+    $repository->delete($product);
 } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
     //Entity already deleted
+} catch (\Magento\Framework\Exception\StateException $e) {
+
 }
 
 $registry->unregister('isSecureArea');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
index d9db7b72a7a13..8f42436f08a31 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
@@ -28,5 +28,5 @@
         ]
     );
 /** @var ProductResource $productResource */
-$productResource = Bootstrap::getObjectManager()->create(ProductResource::class);
+$productResource = Bootstrap::getObjectManager()->get(ProductResource::class);
 $productResource->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
index eb215df02b35e..c07eb0f35b0fd 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
@@ -89,7 +89,7 @@
 $customOptions = [];
 
 /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
-$customOptionFactory = $objectManager->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+$customOptionFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
 
 foreach ($options as $option) {
     /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $customOption */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
index 0e9b9c4697bdd..070e2890df413 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
@@ -15,9 +15,10 @@
 );
 try {
     $product = $repository->get('virtual', false, null, true);
-    $product->delete();
+    $repository->delete($product);
 } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
     //Entity already deleted
+} catch (\Magento\Framework\Exception\StateException $e) {
 }
 
 $registry->unregister('isSecureArea');

From ed0dd32d536f0c0da85acbfa057fac796b7b6954 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 3 Apr 2019 15:40:17 +0200
Subject: [PATCH 0964/1055] [Checkout coverage] setGuestEmailOnCart mutation

---
 .../Model/Resolver/GuestEmail.php             |  49 +++++++++
 .../Model/Resolver/SetGuestEmailOnCart.php    |  89 +++++++++++++++
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |  11 ++
 .../Customer/SetGuestEmailOnCartTest.php      |  85 +++++++++++++++
 .../Quote/Guest/CartGuestEmailTest.php        |  52 +++++++++
 .../Quote/Guest/SetGuestEmailOnCartTest.php   | 101 ++++++++++++++++++
 .../quote_with_virtual_product_saved.php      |   1 +
 7 files changed, 388 insertions(+)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Resolver/GuestEmail.php
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartGuestEmailTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/GuestEmail.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/GuestEmail.php
new file mode 100644
index 0000000000000..76493c4cebe55
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/GuestEmail.php
@@ -0,0 +1,49 @@
+<?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\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+
+/**
+ * @inheritdoc
+ */
+class GuestEmail implements ResolverInterface
+{
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser
+    ) {
+        $this->getCartForUser = $getCartForUser;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        /** @var Quote $cart */
+        $cart = $value['model'];
+
+        return $cart->getCustomerEmail();
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
new file mode 100644
index 0000000000000..29dc0e759242f
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
@@ -0,0 +1,89 @@
+<?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\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+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\Framework\Validator\EmailAddress as EmailAddressValidator;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+
+/**
+ * @inheritdoc
+ */
+class SetGuestEmailOnCart implements ResolverInterface
+{
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     * @param CartRepositoryInterface $cartRepository
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser,
+        CartRepositoryInterface $cartRepository
+    ) {
+        $this->getCartForUser = $getCartForUser;
+        $this->cartRepository = $cartRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        }
+        $maskedCartId = $args['input']['cart_id'];
+
+        if (!isset($args['input']['email']) || empty($args['input']['email'])) {
+            throw new GraphQlInputException(__('Required parameter "email" is missing'));
+        }
+
+        $guestEmail = $args['input']['email'];
+
+        if (!\Zend_Validate::is($guestEmail, EmailAddressValidator::class)) {
+            throw new GraphQlInputException(__('Invalid email format'));
+        }
+
+        $currentUserId = $context->getUserId();
+
+        if ($currentUserId !== 0) {
+            throw new GraphQlInputException(__('The request is not allowed for logged in customers'));
+        }
+
+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
+        $cart->setCustomerEmail($guestEmail);
+
+        try {
+            $this->cartRepository->save($cart);
+        } catch (CouldNotSaveException $e) {
+            throw new LocalizedException(__($e->getMessage()), $e);
+        }
+
+        return [
+            'cart' => [
+                'model' => $cart,
+                'guest_email' => $guestEmail
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 79cea3855f6f3..bf0d1cfb079cd 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -17,6 +17,7 @@ type Mutation {
     setBillingAddressOnCart(input: SetBillingAddressOnCartInput): SetBillingAddressOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetBillingAddressOnCart")
     setShippingMethodsOnCart(input: SetShippingMethodsOnCartInput): SetShippingMethodsOnCartOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetShippingMethodsOnCart")
     setPaymentMethodOnCart(input: SetPaymentMethodOnCartInput): SetPaymentMethodOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentMethodOnCart")
+    setGuestEmailOnCart(input: SetGuestEmailOnCartInput): SetGuestEmailOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetGuestEmailOnCart")
 }
 
 input AddSimpleProductsToCartInput {
@@ -124,6 +125,11 @@ input PaymentMethodInput {
     purchase_order_number: String @doc(description:"Purchase order number")
 }
 
+input SetGuestEmailOnCartInput {
+    cart_id: String!
+    email: String!
+}
+
 type SetPaymentMethodOnCartOutput {
     cart: Cart!
 }
@@ -147,6 +153,7 @@ type ApplyCouponToCartOutput {
 type Cart {
     items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
     applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon")
+    guest_email: String @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\GuestEmail")
     shipping_addresses: [CartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddresses")
     billing_address: CartAddress! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
     available_payment_methods: [AvailablePaymentMethod]  @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AvailablePaymentMethods") @doc(description: "Available payment methods")
@@ -249,6 +256,10 @@ type RemoveItemFromCartOutput {
     cart: Cart!
 }
 
+type SetGuestEmailOnCartOutput {
+    cart: Cart!
+}
+
 type SimpleCartItem implements CartItemInterface @doc(description: "Simple Cart Item") {
     customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
new file mode 100644
index 0000000000000..4dca82118c1ef
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for setGuestEmailOnCart mutation
+ */
+class SetGuestEmailOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     */
+    public function testSetGuestEmailOnCartForLoggedInCustomer()
+    {
+        $reservedOrderId = 'test_order_1';
+        $email = 'some@user.com';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+
+        $query = $this->getSetGuestEmailOnCartMutation($maskedQuoteId, $email);
+        $this->expectExceptionMessage('The request is not allowed for logged in customers');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * Returns GraphQl mutation query for setting email address for a guest
+     *
+     * @param string $maskedQuoteId
+     * @param string $email
+     * @return string
+     */
+    private function getSetGuestEmailOnCartMutation(string $maskedQuoteId, string $email): string
+    {
+        return <<<QUERY
+mutation {
+  setGuestEmailOnCart(input: {
+    cart_id:"$maskedQuoteId"
+    email: "$email"
+  }) {
+    cart {
+      guest_email
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartGuestEmailTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartGuestEmailTest.php
new file mode 100644
index 0000000000000..751029e6b87a3
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartGuestEmailTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for getting guest email from cart
+ */
+class CartGuestEmailTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
+    public function testGetCartGuestEmail()
+    {
+        $email = 'store@example.com';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
+            'test_order_with_virtual_product_without_address'
+        );
+
+        $query = <<<QUERY
+{
+  cart(cart_id:"$maskedQuoteId") {    
+    guest_email
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('cart', $response);
+        $this->assertEquals($email, $response['cart']['guest_email']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
new file mode 100644
index 0000000000000..f95679b2eb5e1
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for setGuestEmailOnCart mutation
+ */
+class SetGuestEmailOnCartTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Quote/_files/empty_quote.php
+     */
+    public function testSetGuestEmailOnCart()
+    {
+        $reservedOrderId = 'reserved_order_id';
+        $email = 'some@user.com';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+
+        $query = $this->getSetGuestEmailOnCartMutation($maskedQuoteId, $email);
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey('setGuestEmailOnCart', $response);
+        $this->assertArrayHasKey('cart', $response['setGuestEmailOnCart']);
+        $this->assertEquals($email, $response['setGuestEmailOnCart']['cart']['guest_email']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Quote/_files/empty_quote.php
+     * @dataProvider incorrectInputDataProvider
+     * @param string|null $maskedQuoteId
+     * @param string $email
+     * @param string $exceptionMessage
+     */
+    public function testSetGuestEmailOnCartWithIncorrectInputData(
+        ?string $maskedQuoteId,
+        string $email,
+        string $exceptionMessage
+    ) {
+        if (null === $maskedQuoteId) { // Generate ID in case if no provided by data provider
+            $reservedOrderId = 'reserved_order_id';
+            $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        }
+
+        $query = $this->getSetGuestEmailOnCartMutation($maskedQuoteId, $email);
+        $this->expectExceptionMessage($exceptionMessage);
+        $this->graphQlQuery($query);
+    }
+
+    public function incorrectInputDataProvider(): array
+    {
+        return [
+            'wrong_email' => [null, 'some', 'Invalid email format'],
+            'no_email' => [null, '', 'Required parameter "email" is missing'],
+            'wrong_quote_id' =>  ['xxx', 'some@user.com', 'Could not find a cart with ID "xxx"'],
+            'no_quote_id' =>  ['', 'some@user.com', 'Required parameter "cart_id" is missing']
+        ];
+    }
+
+    /**
+     * Returns GraphQl mutation query for setting email address for a guest
+     *
+     * @param string $maskedQuoteId
+     * @param string $email
+     * @return string
+     */
+    private function getSetGuestEmailOnCartMutation(string $maskedQuoteId, string $email): string
+    {
+        return <<<QUERY
+mutation {
+  setGuestEmailOnCart(input: {
+    cart_id:"$maskedQuoteId"
+    email: "$email"
+  }) {
+    cart {
+      guest_email
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php
index 835b2ab812856..833e5a57ac34f 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_saved.php
@@ -13,6 +13,7 @@
     ->setIsMultiShipping(false)
     ->setReservedOrderId('test_order_with_virtual_product_without_address')
     ->setEmail('store@example.com')
+    ->setCustomerEmail('store@example.com')
     ->addProduct(
         $product->load($product->getId()),
         1

From 5868de47f41b90c657b82ebe398b5dcaf9415127 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@magento.com>
Date: Wed, 3 Apr 2019 12:41:03 -0500
Subject: [PATCH 0965/1055] MAGETWO-98831: The SKU was not found in the catalog

---
 .../Adminhtml/Order/Create/Search/Grid.php      | 17 +----------------
 .../Grid/DataProvider/ProductCollection.php     |  1 -
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
index 5b7c1dee65c39..9a271f741edda 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
@@ -15,6 +15,7 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -167,22 +168,6 @@ protected function _prepareCollection()
             $this->_salesConfig->getAvailableProductTypes()
         );
 
-        /*
-        $collection = $this->_productFactory->create()->getCollection();
-        $collection->setStore(
-            $this->getStore()
-        )->addAttributeToSelect(
-            $attributes
-        )->addAttributeToSelect(
-            'sku'
-        )->addStoreFilter()->addAttributeToFilter(
-            'type_id',
-            $this->_salesConfig->getAvailableProductTypes()
-        )->addAttributeToSelect(
-            'gift_message_available'
-        );
-        */
-
         $this->setCollection($collection);
         return parent::_prepareCollection();
     }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php
index 61f30de3a1c51..733791a2f9549 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php
@@ -53,4 +53,3 @@ public function getCollectionForStore(Store $store):Collection
         return $collection;
     }
 }
-

From 61b4ec8ab1638fef820d5ec7125bba886f2b1016 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 3 Apr 2019 12:42:57 -0500
Subject: [PATCH 0966/1055] GraphQL-295: [Place order] Place order mutation

---
 .../Model/Resolver/PlaceOrder.php             |  19 +-
 .../GetAvailablePaymentMethodsTest.php        |   8 +-
 .../GetAvailableShippingMethodsTest.php       |   8 +-
 .../GraphQl/Quote/Customer/GetCartTest.php    |   2 +-
 .../GetSelectedShippingMethodTest.php         |   8 +-
 .../GetSpecifiedBillingAddressTest.php        |   8 +-
 .../GraphQl/Quote/Customer/PlaceOrderTest.php | 256 ++++++++++++++++++
 .../Customer/SetBillingAddressOnCartTest.php  |  14 +-
 .../SetOfflineShippingMethodsOnCartTest.php   |   2 +-
 .../Customer/SetPaymentMethodOnCartTest.php   |  14 +-
 .../Customer/SetShippingAddressOnCartTest.php |  12 +-
 .../Customer/SetShippingMethodsOnCartTest.php |  14 +-
 .../Guest/GetAvailablePaymentMethodsTest.php  |   6 +-
 .../Guest/GetAvailableShippingMethodsTest.php |   6 +-
 .../GraphQl/Quote/Guest/GetCartTest.php       |   2 +-
 .../Guest/GetSelectedShippingMethodTest.php   |   6 +-
 .../Guest/GetSpecifiedBillingAddressTest.php  |   6 +-
 .../Guest/SetBillingAddressOnCartTest.php     |   8 +-
 .../SetOfflineShippingMethodsOnCartTest.php   |   2 +-
 .../Guest/SetPaymentMethodOnCartTest.php      |  12 +-
 .../Guest/SetShippingAddressOnCartTest.php    |  10 +-
 .../Guest/SetShippingMethodsOnCartTest.php    |  14 +-
 .../Magento/GraphQl/Quote/PlaceOrderTest.php  | 224 ---------------
 .../set_simple_product_out_of_stock.php       |  19 ++
 .../GraphQl/Catalog/_files/simple_product.php |  45 +++
 .../_files/simple_product_rollback.php        |  31 +++
 .../Quote/_files/add_simple_product.php       |   2 +-
 27 files changed, 443 insertions(+), 315 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
 delete mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
index c087e867a342a..3bd46a664f2ab 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
@@ -8,8 +8,10 @@
 namespace Magento\QuoteGraphQl\Model\Resolver;
 
 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\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Api\CartManagementInterface;
@@ -56,13 +58,12 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        if (!isset($args['input']['cart_id'])) {
+        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
         $maskedCartId = $args['input']['cart_id'];
 
-        $currentUserId = $context->getUserId();
-        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
+        $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
 
         try {
             $orderId = $this->cartManagement->placeOrder($cart->getId());
@@ -70,13 +71,13 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
             return [
                 'order' => [
-                    'order_id' => $order->getIncrementId()
-                ]
+                    'order_id' => $order->getIncrementId(),
+                ],
             ];
-        } catch (LocalizedException $exception) {
-            throw new GraphQlInputException(
-                __('Unable to place order: %message', ['message' => $exception->getMessage()])
-            );
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__('Unable to place order: %message', ['message' => $e->getMessage()]), $e);
         }
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
index ba640bc3402ba..673d496302662 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php
@@ -39,7 +39,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -60,7 +60,7 @@ public function testGetAvailablePaymentMethods()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -79,7 +79,7 @@ public function testGetAvailablePaymentMethodsFromGuestCart()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -97,7 +97,7 @@ public function testGetAvailablePaymentMethodsFromAnotherCustomerCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
index 71cf0201951a3..2b647f61c4c63 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailableShippingMethodsTest.php
@@ -41,7 +41,7 @@ protected function setUp()
      * Test case: get available shipping methods from current customer quote
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -77,7 +77,7 @@ public function testGetAvailableShippingMethods()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -98,7 +98,7 @@ public function testGetAvailableShippingMethodsFromGuestCart()
      *
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -118,7 +118,7 @@ public function testGetAvailableShippingMethodsFromAnotherCustomerCart()
      * Test case: get available shipping methods when all shipping methods are disabled
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index eb62b8c92f310..b1a58d818016e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -36,7 +36,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
index 16d085c1d09be..ba169d7a5bbc9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSelectedShippingMethodTest.php
@@ -39,7 +39,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -69,7 +69,7 @@ public function testGetSelectedShippingMethod()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -89,7 +89,7 @@ public function testGetSelectedShippingMethodFromGuestCart()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -108,7 +108,7 @@ public function testGetSelectedShippingMethodFromAnotherCustomerCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
index 4396f5fbac189..1ba94346073db 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
@@ -39,7 +39,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
@@ -79,7 +79,7 @@ public function testGeSpecifiedBillingAddress()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -132,7 +132,7 @@ public function testGeSpecifiedBillingAddressOfNonExistentCart()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
@@ -150,7 +150,7 @@ public function testGeSpecifiedBillingAddressFromAnotherGuestCart()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
new file mode 100644
index 0000000000000..7ec1a71111835
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for placing an order for customer
+ */
+class PlaceOrderTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+     */
+    public function testPlaceOrder()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('placeOrder', $response);
+        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     */
+    public function testPlaceOrderWithNoItemsInCart()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage(
+            'Unable to place order: A server error stopped your order from being placed. ' .
+            'Please try to place your order again'
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testPlaceOrderWithNoShippingAddress()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage(
+            'Unable to place order: Some addresses can\'t be used due to the configurations for specific countries'
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     */
+    public function testPlaceOrderWithNoShippingMethod()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage(
+            'Unable to place order: The shipping method is missing. Select the shipping method and try again'
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testPlaceOrderWithNoBillingAddress()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessageRegExp(
+            '/Unable to place order: Please check the billing address information*/'
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testPlaceOrderWithNoPaymentMethod()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage('Unable to place order: Enter a valid payment method and try again');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
+     */
+    public function testPlaceOrderWithOutOfStockProduct()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage('Unable to place order: Some of the products are out of stock');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+     */
+    public function testPlaceOrderOfGuestCart()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+     */
+    public function testPlaceOrderOfAnotherCustomerCart()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+mutation {
+  placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
+    order {
+      order_id
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 88e7b93dd1d08..ea58ddfcbf5c1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -57,7 +57,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -116,7 +116,7 @@ public function testSetNewBillingAddress()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -194,7 +194,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -241,7 +241,7 @@ public function testSetBillingAddressFromAddressBook()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -276,7 +276,7 @@ public function testSetNotExistedBillingAddressFromAddressBook()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -325,7 +325,7 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -459,7 +459,7 @@ public function testSetBillingAddressOnNonExistentCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
index bd147cc4a197e..b7b7823263106 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
@@ -48,7 +48,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index 98eded8300665..73feefe2b094b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -41,7 +41,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -62,7 +62,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -100,7 +100,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -135,7 +135,7 @@ public function testSetPaymentOnNonExistentCart()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -155,7 +155,7 @@ public function testSetPaymentMethodToGuestCart()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -174,7 +174,7 @@ public function testSetPaymentMethodToAnotherCustomerCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -227,7 +227,7 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 5ff29d20b34d7..eb366a039d8b3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -57,7 +57,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -166,7 +166,7 @@ public function testSetNewShippingAddressOnCartWithVirtualProduct()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -211,7 +211,7 @@ public function testSetShippingAddressFromAddressBook()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -248,7 +248,7 @@ public function testSetNonExistentShippingAddressFromAddressBook()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -371,7 +371,7 @@ public function testSetShippingAddressToAnotherCustomerCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -427,7 +427,7 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 29ddbefd8e405..9219b5a67022c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -48,7 +48,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -86,7 +86,7 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -124,7 +124,7 @@ public function testReSetShippingMethod()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -257,7 +257,7 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -302,7 +302,7 @@ public function testSetMultipleShippingMethods()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -331,7 +331,7 @@ public function testSetShippingMethodToGuestCart()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -360,7 +360,7 @@ public function testSetShippingMethodToAnotherCustomerCart()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
index 8271a76d88f12..af1f72fe71620 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailablePaymentMethodsTest.php
@@ -31,7 +31,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -52,7 +52,7 @@ public function testGetAvailablePaymentMethods()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -69,7 +69,7 @@ public function testGetAvailablePaymentMethodsFromCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 38fda50ba5836..a8113657eff6e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -33,7 +33,7 @@ protected function setUp()
     /**
      * Test case: get available shipping methods from current customer quote
      *
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -69,7 +69,7 @@ public function testGetAvailableShippingMethods()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -87,7 +87,7 @@ public function testGetAvailableShippingMethodsFromCustomerCart()
     /**
      * Test case: get available shipping methods when all shipping methods are disabled
      *
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 6b1f540e4d47a..2649016cf196b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -28,7 +28,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
index c31b48ccc1087..bfdecca782319 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSelectedShippingMethodTest.php
@@ -31,7 +31,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -61,7 +61,7 @@ public function testGetSelectedShippingMethod()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -79,7 +79,7 @@ public function testGetSelectedShippingMethodFromCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
index 0110384b8f605..d592443aed499 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
@@ -31,7 +31,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
@@ -69,7 +69,7 @@ public function testGeSpecifiedBillingAddress()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -118,7 +118,7 @@ public function testGetBillingAddressOfNonExistentCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index ae0a1a0e822ac..6965cd03f86f5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -28,7 +28,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -86,7 +86,7 @@ public function testSetNewBillingAddress()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -208,7 +208,7 @@ public function testSetBillingAddressToCustomerCart()
 
     /**
      * _security
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -280,7 +280,7 @@ public function testSetBillingAddressOnNonExistentCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
index 8ed9ef84d6fbd..477c93efd31d0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
@@ -40,7 +40,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index c9078fd84f6bc..879d0fd917291 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -33,7 +33,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -53,7 +53,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -89,7 +89,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -122,7 +122,7 @@ public function testSetPaymentOnNonExistentCart()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -141,7 +141,7 @@ public function testSetPaymentMethodToCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -194,7 +194,7 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index e21d9ed64d491..18523feb261b9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -28,7 +28,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -135,7 +135,7 @@ public function testSetNewShippingAddressOnCartWithVirtualProduct()
 
     /**
      * _security
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -172,7 +172,7 @@ public function testSetShippingAddressFromAddressBook()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -209,7 +209,7 @@ public function testSetShippingAddressToCustomerCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
@@ -264,7 +264,7 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index ca26f8fe5aaf0..2eac002253ff0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -40,7 +40,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -79,7 +79,7 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
      * Shipping address for quote will be created automatically BUT with NULL values (considered that address
      * is not set)
      *
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -106,7 +106,7 @@ public function testSetShippingMethodOnCartWithSimpleProductAndWithoutAddress()
 
     /**
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -143,7 +143,7 @@ public function testReSetShippingMethod()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -275,7 +275,7 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
 
     /**
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -320,7 +320,7 @@ public function testSetMultipleShippingMethods()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -348,7 +348,7 @@ public function testSetShippingMethodToCustomerCart()
 
     /**
      * _security
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php
deleted file mode 100644
index 7d4358b79bdc4..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/PlaceOrderTest.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Quote;
-
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Api\Data\CartItemInterface;
-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 placing an order
- */
-class PlaceOrderTest extends GraphQlAbstract
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @var CustomerTokenServiceInterface
-     */
-    private $customerTokenService;
-
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var Quote
-     */
-    private $quote;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    protected function setUp()
-    {
-        $this->objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $this->objectManager->create(QuoteResource::class);
-        $this->quote = $this->objectManager->create(Quote::class);
-        $this->quoteIdToMaskedId = $this->objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->customerTokenService = $this->objectManager->get(CustomerTokenServiceInterface::class);
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     */
-    public function testPlaceOrder()
-    {
-        $reservedOrderId = 'test_order_1';
-
-        $query = $this->preparePlaceOrderQuery();
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-
-        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
-        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     */
-    public function testPlaceOrderOfAnotherCustomerCart()
-    {
-        $query = $this->preparePlaceOrderQuery();
-
-        self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     */
-    public function testPlaceOrderWithOutOfStockProduct()
-    {
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get('simple');
-        $extensionAttributes = $product->getExtensionAttributes();
-        $stockItem = $extensionAttributes->getStockItem();
-        $stockItem->setIsInStock(false);
-        $productRepository->save($product);
-
-        $query = $this->preparePlaceOrderQuery();
-
-        self::expectExceptionMessage('Unable to place order: Some of the products are out of stock');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     */
-    public function testPlaceOrderWithNoItemsInCart()
-    {
-        $quoteItems = $this->quote->getAllItems();
-
-        /** @var CartItemInterface $quoteItem */
-        foreach ($quoteItems as $quoteItem) {
-            $this->quote->removeItem($quoteItem->getItemId());
-        }
-        $this->quoteResource->save($this->quote);
-
-        $query = $this->preparePlaceOrderQuery();
-
-        self::expectExceptionMessage(
-            'Unable to place order: A server error stopped your order from being placed. ' .
-            'Please try to place your order again'
-        );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     */
-    public function testPlaceOrderWithNoShippingMethod()
-    {
-        $this->quote->getShippingAddress()->setShippingMethod('');
-        $this->quoteResource->save($this->quote);
-
-        $query = $this->preparePlaceOrderQuery();
-
-        self::expectExceptionMessage(
-            'Unable to place order: The shipping method is missing. Select the shipping method and try again'
-        );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     */
-    public function testPlaceOrderWithNoShippingAddress()
-    {
-        $this->quote->removeAddress($this->quote->getShippingAddress()->getId());
-        $this->quoteResource->save($this->quote);
-
-        $query = $this->preparePlaceOrderQuery();
-
-        self::expectExceptionMessage(
-            'Unable to place order: Some addresses can\'t be used due to the configurations for specific countries'
-        );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     */
-    public function testPlaceOrderWithNoPaymentMethod()
-    {
-        $this->quote->getPayment()->setMethod('');
-        $this->quoteResource->save($this->quote);
-
-        $query = $this->preparePlaceOrderQuery();
-
-        self::expectExceptionMessage('Unable to place order: Enter a valid payment method and try again');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_check_payment.php
-     */
-    public function testPlaceOrderWithNoBillingAddress()
-    {
-        $this->quote->removeAddress($this->quote->getBillingAddress()->getId());
-        $this->quoteResource->save($this->quote);
-
-        $query = $this->preparePlaceOrderQuery();
-
-        self::expectExceptionMessageRegExp(
-            '/Unable to place order: Please check the billing address information*/'
-        );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * Prepares GraphQl query for placing an order
-     *
-     * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function preparePlaceOrderQuery(): string
-    {
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-
-        return <<<QUERY
-mutation {
-  placeOrder(input: {cart_id: "$maskedQuoteId"}) {
-    order {
-      order_id
-    }
-  }
-}
-QUERY;
-    }
-
-    /**
-     * @param string $username
-     * @param string $password
-     * @return array
-     * @throws \Magento\Framework\Exception\AuthenticationException
-     */
-    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
-    {
-        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        return $headerMap;
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
new file mode 100644
index 0000000000000..f465f482275c1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$product = $productRepository->get('simple_product');
+$extensionAttributes = $product->getExtensionAttributes();
+$stockItem = $extensionAttributes->getStockItem();
+$stockItem->setIsInStock(false);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php
new file mode 100644
index 0000000000000..732c18d4d7340
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductInterfaceFactory $productFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$product = $productFactory->create();
+$productData = [
+    ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
+    ProductInterface::ATTRIBUTE_SET_ID => 4,
+    ProductInterface::SKU => 'simple_product',
+    ProductInterface::NAME => 'Simple Product',
+    ProductInterface::PRICE => 10,
+    ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
+    ProductInterface::STATUS => Status::STATUS_ENABLED,
+];
+$dataObjectHelper->populateWithArray($product, $productData, ProductInterface::class);
+/** Out of interface */
+$product
+    ->setWebsiteIds([1])
+    ->setStockData([
+        'qty' => 85.5,
+        'is_in_stock' => true,
+        'manage_stock' => true,
+        'is_qty_decimal' => true
+    ]);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php
new file mode 100644
index 0000000000000..9a54f663c9c13
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/simple_product_rollback.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$currentArea = $registry->registry('isSecureArea');
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository->deleteById('simple_product');
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    /**
+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+     */
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', $currentArea);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
index d23381e33d436..f62b463d94003 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -20,7 +20,7 @@
 /** @var CartRepositoryInterface $cartRepository */
 $cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
 
-$product = $productRepository->get('simple');
+$product = $productRepository->get('simple_product');
 
 $quote = $quoteFactory->create();
 $quoteResource->load($quote, 'test_quote', 'reserved_order_id');

From 2299cf9b4797f8ef32be783acbbbeb380edc03d2 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 3 Apr 2019 14:24:39 -0500
Subject: [PATCH 0967/1055] GraphQL-295: [Place order] Place order mutation

---
 .../GraphQl/Quote/Customer/PlaceOrderTest.php | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
index 7ec1a71111835..4220f8932caa1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
@@ -7,8 +7,12 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -27,6 +31,21 @@ class PlaceOrderTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
+    /**
+     * @var CollectionFactory
+     */
+    private $orderCollectionFactory;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
     /**
      * @inheritdoc
      */
@@ -35,6 +54,9 @@ protected function setUp()
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
     }
 
     /**
@@ -253,4 +275,22 @@ private function getHeaderMap(string $username = 'customer@example.com', string
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
         return $headerMap;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function tearDown()
+    {
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+
+        $orderCollection = $this->orderCollectionFactory->create();
+        foreach ($orderCollection as $order) {
+            $this->orderRepository->delete($order);
+        }
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+
+        parent::tearDown();
+    }
 }

From 54355e36395024e79918ec8b2cca86ce05e3bad0 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 3 Apr 2019 17:48:42 -0500
Subject: [PATCH 0968/1055] GraphQL-481: [Test Coverage] 'RemoveCouponFromCart'
 functionality

---
 .../testsuite/Magento/Quote/Api/CouponManagementTest.php  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
index 1aee493d8e0cb..13ec50139b7fb 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
@@ -93,7 +93,7 @@ public function testSetCouponThrowsExceptionIfCouponDoesNotExist()
 
         $serviceInfo = [
             'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . $couponCode,
+                'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . urlencode($couponCode),
                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
             ],
             'soap' => [
@@ -129,7 +129,7 @@ public function testSetCouponSuccess()
         $couponCode = $salesRule->getPrimaryCoupon()->getCode();
         $serviceInfo = [
             'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . $couponCode,
+                'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . urlencode($couponCode),
                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
             ],
             'soap' => [
@@ -232,7 +232,7 @@ public function testSetMyCouponThrowsExceptionIfCouponDoesNotExist()
 
         $serviceInfo = [
             'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . $couponCode,
+                'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . urlencode($couponCode),
                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
                 'token' => $token,
             ],
@@ -280,7 +280,7 @@ public function testSetMyCouponSuccess()
 
         $serviceInfo = [
             'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . $couponCode,
+                'resourcePath' => self::RESOURCE_PATH . 'mine/coupons/' . urlencode($couponCode),
                 'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
                 'token' => $token,
             ],

From d0c9cfa68ca9b9d538e1b743ff87215f510fd6ea Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 3 Apr 2019 17:51:38 -0500
Subject: [PATCH 0969/1055] GraphQL-295: [Place order] Place order mutation

---
 .../testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php    | 2 +-
 .../testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index b1a58d818016e..2cac1f8c4fbf0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -55,7 +55,7 @@ public function testGetCart()
 
         self::assertNotEmpty($response['cart']['items'][0]['id']);
         self::assertEquals(2, $response['cart']['items'][0]['qty']);
-        self::assertEquals('simple', $response['cart']['items'][0]['product']['sku']);
+        self::assertEquals('simple_product', $response['cart']['items'][0]['product']['sku']);
 
         self::assertNotEmpty($response['cart']['items'][1]['id']);
         self::assertEquals(2, $response['cart']['items'][1]['qty']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 2649016cf196b..654b0b963af15 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -47,7 +47,7 @@ public function testGetCart()
 
         self::assertNotEmpty($response['cart']['items'][0]['id']);
         self::assertEquals(2, $response['cart']['items'][0]['qty']);
-        self::assertEquals('simple', $response['cart']['items'][0]['product']['sku']);
+        self::assertEquals('simple_product', $response['cart']['items'][0]['product']['sku']);
 
         self::assertNotEmpty($response['cart']['items'][1]['id']);
         self::assertEquals(2, $response['cart']['items'][1]['qty']);

From 0ad0e0528e11bd74dc78ebc7b9eca4e077fbad7d Mon Sep 17 00:00:00 2001
From: Ryan Fowler <ryantfowler9127@gmail.com>
Date: Wed, 3 Apr 2019 22:02:46 -0700
Subject: [PATCH 0970/1055] Update PatchApplierTest.php - Corrected Spelling

Corrected spelling error for `patchBacwardCompatability`.
---
 .../Framework/Setup/Test/Unit/Patch/PatchApplierTest.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
index f89bdc9e137dd..cb40845bcc488 100644
--- a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
@@ -91,7 +91,7 @@ class PatchApplierTest extends \PHPUnit\Framework\TestCase
     /**
      * @var PatchBackwardCompatability |\PHPUnit_Framework_MockObject_MockObject
      */
-    private $patchBacwardCompatability;
+    private $patchBackwardCompatability;
 
     protected function setUp()
     {
@@ -109,7 +109,7 @@ protected function setUp()
         $this->moduleDataSetupMock->expects($this->any())->method('getConnection')->willReturn($this->connectionMock);
 
         $objectManager = new ObjectManager($this);
-        $this->patchBacwardCompatability = $objectManager->getObject(
+        $this->patchBackwardCompatability = $objectManager->getObject(
             PatchBackwardCompatability::class,
             [
                 'moduleResource' => $this->moduleResourceMock
@@ -128,7 +128,7 @@ protected function setUp()
                 'objectManager' => $this->objectManagerMock,
                 'schemaSetup' => $this->schemaSetupMock,
                 'moduleDataSetup' => $this->moduleDataSetupMock,
-                'patchBackwardCompatability' => $this->patchBacwardCompatability
+                'patchBackwardCompatability' => $this->patchBackwardCompatability
             ]
         );
         require_once __DIR__ . '/../_files/data_patch_classes.php';

From 85155b15cb43131a96d7848bfb770cae513c9207 Mon Sep 17 00:00:00 2001
From: Davit_Zakharyan <davit_zakharyan@epam.com>
Date: Thu, 4 Apr 2019 10:00:38 +0400
Subject: [PATCH 0971/1055] MAGETWO-91523: [2.3] Allowed countries restriction
 for a default website is applied to backend customer grid

- Changed some stepKeys to camel case format.
---
 .../Test/AllowedCountriesRestrictionApplyOnBackendTest.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
index d8d77b6564987..f39394ef312e4 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -26,16 +26,16 @@
             <!--Create new website,store and store view-->
             <comment userInput="Create new website,store and store view" stepKey="createWebsite"/>
             <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="goToAdminSystemStorePage"/>
-            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateNewWebsite">
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateNewWebsite">
                 <argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
                 <argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateNewStore">
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="adminCreateNewStore">
                 <argument name="website" value="{{NewWebSiteData.name}}"/>
                 <argument name="storeGroupName" value="{{NewStoreData.name}}"/>
                 <argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateNewStoreView">
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="adminCreateNewStoreView">
                 <argument name="StoreGroup" value="NewStoreData"/>
             </actionGroup>
             <!--Set account sharing option - Default value is 'Per Website'-->

From 7ee12b065765bd814c5c089da7ba9032569f6cf7 Mon Sep 17 00:00:00 2001
From: priti <priti@twojay.in>
Date: Thu, 4 Apr 2019 14:18:33 +0530
Subject: [PATCH 0972/1055] fixes-for-customer-name-twice-desktop

---
 .../Customer/view/frontend/templates/account/customer.phtml   | 1 -
 .../Magento/luma/Magento_Theme/web/css/source/_module.less    | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
index 2bdb6ac044a92..b7b8796142de8 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
@@ -16,7 +16,6 @@
               data-toggle="dropdown"
               data-trigger-keypress-button="true"
               data-bind="scope: 'customer'">
-            <span data-bind="text: customer().fullname"></span>
             <button type="button"
                     class="action switch"
                     tabindex="-1"
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 cadf575b95fc7..1e942a84d9a16 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
@@ -104,6 +104,10 @@
                 font-size: @font-size__base;
                 margin: 0 0 0 15px;
 
+                &.customer-welcome{
+                   margin: 0 0 0 5px;
+                }
+
                 > a {
                     .lib-link(
                     @_link-color: @header-panel__text-color,

From 1a297e875a29d0d610180426519a59f91db797d5 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 4 Apr 2019 12:56:19 +0300
Subject: [PATCH 0973/1055] magento/magento2#21788: Static test fix.

---
 .../Sales/Model/Order/Email/Sender/CreditmemoSender.php        | 2 +-
 .../Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php   | 2 +-
 .../Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php  | 2 +-
 .../Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php     | 1 -
 .../Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php     | 3 +++
 .../Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php   | 3 +++
 .../Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php  | 3 +++
 7 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
index be7fa8296a264..126fe4f93f1e0 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -57,10 +57,10 @@ class CreditmemoSender extends Sender
      * @param CreditmemoIdentity $identityContainer
      * @param Order\Email\SenderBuilderFactory $senderBuilderFactory
      * @param \Psr\Log\LoggerInterface $logger
+     * @param Renderer $addressRenderer
      * @param PaymentHelper $paymentHelper
      * @param CreditmemoResource $creditmemoResource
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
-     * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
      */
     public function __construct(
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
index bd67de7322a62..ba3895cfa1524 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -57,10 +57,10 @@ class InvoiceSender extends Sender
      * @param InvoiceIdentity $identityContainer
      * @param Order\Email\SenderBuilderFactory $senderBuilderFactory
      * @param \Psr\Log\LoggerInterface $logger
+     * @param Renderer $addressRenderer
      * @param PaymentHelper $paymentHelper
      * @param InvoiceResource $invoiceResource
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
-     * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
      */
     public function __construct(
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
index 2b10d25b87a04..10e5e37a49394 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -57,10 +57,10 @@ class ShipmentSender extends Sender
      * @param ShipmentIdentity $identityContainer
      * @param Order\Email\SenderBuilderFactory $senderBuilderFactory
      * @param \Psr\Log\LoggerInterface $logger
+     * @param Renderer $addressRenderer
      * @param PaymentHelper $paymentHelper
      * @param ShipmentResource $shipmentResource
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
-     * @param Renderer $addressRenderer
      * @param ManagerInterface $eventManager
      */
     public function __construct(
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
index 859fbde31f5d8..467476c9bb406 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
index 02a2bbec72389..1f074d7262f4d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
 
+/**
+ * Test for Magento\Sales\Model\Order\Email\Sender\CreditmemoSender class.
+ */
 class CreditmemoSenderTest extends AbstractSenderTest
 {
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
index ba2f1166baf3c..d1aa5af53da4d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
 
+/**
+ * Test for Magento\Sales\Model\Order\Email\Sender\InvoiceSender class.
+ */
 class InvoiceSenderTest extends AbstractSenderTest
 {
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
index 8a71c738e9fbe..2d7b42bccae5a 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
 
+/**
+ * Test for Magento\Sales\Model\Order\Email\Sender\ShipmentSender class.
+ */
 class ShipmentSenderTest extends AbstractSenderTest
 {
     /**

From 8a15fd8932709af2705cfe56d478528811c08f01 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 4 Apr 2019 12:52:33 +0100
Subject: [PATCH 0974/1055] magento-engcom/magento2ce#2731: Fixed static tests

---
 app/code/Magento/Customer/Model/Customer.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index e970e3695d4a2..1287dbe5df708 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -1054,17 +1054,6 @@ public function resetErrors()
         return $this;
     }
 
-    /**
-     * Prepare customer for delete
-     *
-     * @return $this
-     */
-    public function beforeDelete()
-    {
-        //TODO : Revisit and figure handling permissions in MAGETWO-11084 Implementation: Service Context Provider
-        return parent::beforeDelete();
-    }
-
     /**
      * Processing object after save data
      *

From 718bb76ae948b3dc7ddd2ec447fcb0aa291df55c Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 2 Apr 2019 11:51:09 +0300
Subject: [PATCH 0975/1055] Fix functional and static tests.

---
 .../Widget/Block/Adminhtml/Widget/Options.php        |  5 +++--
 .../Magento/Framework/Data/Form/Element/Label.php    | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
index 43761d4d4ef2d..32bae10c801c8 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -91,7 +91,7 @@ public function getMainFieldset()
         if ($this->_getData('main_fieldset') instanceof \Magento\Framework\Data\Form\Element\Fieldset) {
             return $this->_getData('main_fieldset');
         }
-        $mainFieldsetHtmlId = 'options_fieldset' . md5($this->getWidgetType());
+        $mainFieldsetHtmlId = 'options_fieldset' . hash('sha256', $this->getWidgetType());
         $this->setMainFieldsetHtmlId($mainFieldsetHtmlId);
         $fieldset = $this->getForm()->addFieldset(
             $mainFieldsetHtmlId,
@@ -141,7 +141,6 @@ protected function _addField($parameter)
     {
         $form = $this->getForm();
         $fieldset = $this->getMainFieldset();
-        //$form->getElement('options_fieldset');
 
         // prepare element data with values (either from request of from default values)
         $fieldName = $parameter->getKey();
@@ -167,10 +166,12 @@ protected function _addField($parameter)
         if (is_array($data['value'])) {
             foreach ($data['value'] as &$value) {
                 if (is_string($value)) {
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
                     $value = html_entity_decode($value);
                 }
             }
         } else {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $data['value'] = html_entity_decode($data['value']);
         }
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Label.php b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
index d9834b8c15ee1..70b7885e7a0d0 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Label.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Data form abstract class
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\Phrase;
+
+/**
+ * Label form element.
+ */
 class Label extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
     /**
@@ -37,7 +37,7 @@ public function __construct(
     public function getElementHtml()
     {
         $html = $this->getBold() ? '<div class="control-value special">' : '<div class="control-value">';
-        if (is_string($this->getValue())) {
+        if (is_string($this->getValue()) || $this->getValue() instanceof Phrase) {
             $html .= $this->getEscapedValue();
         }
 

From 861fd86129c5dd40b6f85e8a7f0e779c85fe8b5e Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 4 Apr 2019 17:25:25 +0300
Subject: [PATCH 0976/1055] magento/magento2#19530: Static test fix.

---
 .../Data/InstallInitialConfigurableAttributes.php   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
index 6e608b172b6b1..c6b173453f5ec 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/Patch/Data/InstallInitialConfigurableAttributes.php
@@ -6,16 +6,16 @@
 
 namespace Magento\ConfigurableProduct\Setup\Patch\Data;
 
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 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\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
  * Class InstallInitialConfigurableAttributes
+ *
  * @package Magento\ConfigurableProduct\Setup\Patch
  */
 class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchVersionInterface
@@ -24,6 +24,7 @@ class InstallInitialConfigurableAttributes implements DataPatchInterface, PatchV
      * @var ModuleDataSetupInterface
      */
     private $moduleDataSetup;
+
     /**
      * @var EavSetupFactory
      */
@@ -43,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -84,7 +85,7 @@ public function apply()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -92,7 +93,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -100,7 +101,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

From c11bafd0a6177e5d2eff7eea52e5f60556221979 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 4 Apr 2019 09:51:42 -0500
Subject: [PATCH 0977/1055] Minor fixes for
 magento/magento-functional-tests-migration#687  - update test annotations  -
 provided additional verification of CAPTCHA

---
 ...ptchaVisibleOnContactUsFormActionGroup.xml | 21 ++++++
 ...illContactUsFormWithCaptchaActionGroup.xml | 17 +++++
 .../Test/Mftf/Data/CaptchaConfigData.xml      |  6 ++
 .../StorefrontContactUsFormSection.xml        | 16 +++++
 .../Test/Mftf/Test/CaptchaOnContactUsTest.xml | 53 ---------------
 .../Test/StorefrontCaptchaOnContactUsTest.xml | 64 +++++++++++++++++++
 .../StorefrontCaptchaOnCustomerLoginTest.xml  |  2 +-
 .../AssertMessageContactUsFormActionGroup.xml | 18 ++++++
 ...StorefrontFillContactUsFormActionGroup.xml | 20 ++++++
 ...StorefrontOpenContactUsPageActionGroup.xml | 15 +++++
 ...orefrontSubmitContactUsFormActionGroup.xml | 15 +++++
 .../Contact/Test/Mftf/Data/ContactUsData.xml  | 14 ++++
 .../Mftf/Page/StorefrontContactUsPage.xml     |  1 -
 .../StorefrontContactUsFormSection.xml        |  9 +--
 .../StorefrontContactUsMessagesSection.xml    | 14 ++++
 15 files changed, 226 insertions(+), 59 deletions(-)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
 delete mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
 create mode 100644 app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertMessageContactUsFormActionGroup.xml
 create mode 100644 app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontFillContactUsFormActionGroup.xml
 create mode 100644 app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontOpenContactUsPageActionGroup.xml
 create mode 100644 app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontSubmitContactUsFormActionGroup.xml
 create mode 100644 app/code/Magento/Contact/Test/Mftf/Data/ContactUsData.xml
 create mode 100644 app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.xml
new file mode 100644
index 0000000000000..d800c65cabb60
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnContactUsFormActionGroup.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="AssertCaptchaVisibleOnContactUsFormActionGroup">
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaField}}" stepKey="waitToSeeCaptchaField"/>
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaImg}}" stepKey="waitToSeeCaptchaImage"/>
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButton"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageReloaded" />
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaField}}" stepKey="waitToSeeCaptchaFieldAfterPageReload"/>
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaImg}}" stepKey="waitToSeeCaptchaImageAfterPageReload"/>
+        <waitForElementVisible selector="{{StorefrontContactUsFormSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButtonAfterPageReload"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml
new file mode 100644
index 0000000000000..3546fa2e57a33
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillContactUsFormWithCaptchaActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="StorefrontFillContactUsFormWithCaptchaActionGroup" extends="StorefrontFillContactUsFormActionGroup">
+        <arguments>
+            <argument name="captcha" type="string" />
+        </arguments>
+        <fillField stepKey="fillCaptchaField" after="fillComment" userInput="{{captcha}}" selector="{{StorefrontContactUsFormSection.captchaField}}" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
index 12bbb5b55dab0..b3d26cd7d7af2 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
@@ -27,6 +27,12 @@
         <data key="label">Create user</data>
         <data key="value">user_create</data>
     </entity>
+    <entity name="StorefrontCaptchaOnContactUsFormConfigData">
+        <data key="path">customer/captcha/forms</data>
+        <data key="scope_id">0</data>
+        <data key="label">Contact Us</data>
+        <data key="value">contact_us</data>
+    </entity>
     <entity name="StorefrontCaptchaOnCustomerLoginConfigData">
         <!-- Magento default value -->
         <data key="path">customer/captcha/forms</data>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
new file mode 100644
index 0000000000000..60cf961ba7e8c
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/StorefrontContactUsFormSection.xml
@@ -0,0 +1,16 @@
+<?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="StorefrontContactUsFormSection">
+        <element name="captchaField" type="input" selector="#contact-form input[name='captcha[contact_us]']" />
+        <element name="captchaImg" type="block" selector="#contact-form img.captcha-img"/>
+        <element name="captchaReload" type="block" selector="#contact-form button.captcha-reload"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.xml
deleted file mode 100644
index cd839b0f78400..0000000000000
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnContactUsTest.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="CaptchaOnContactUsTest">
-        <annotations>
-            <features value="Captcha"/>
-            <stories value="Test creation for send comment using the contact us form with captcha."/>
-            <title value="Captcha contact us form test"/>
-            <description value="Test creation for send comment using the contact us form with captcha."/>
-            <severity value="MAJOR"/>
-            <group value="captcha"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-            <magentoCLI command="config:set customer/captcha/forms contact_us" stepKey="enableUserEditCaptcha"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-        </before>
-        <after>
-            <magentoCLI command="config:set customer/captcha/forms user_login,user_forgotpassword" stepKey="revertCaptchaConfigurations"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-        </after>
-
-        <!-- Open storefront contact us form -->
-        <amOnPage url="{{StorefrontContactUsPage.url}}" stepKey="amOnContactUpPage"/>
-        <waitForPageLoad stepKey="waitForContactUpPageLoad"/>
-
-        <!-- Check Captcha items -->
-        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaField}}" stepKey="seeCaptchaFieldFirst"/>
-        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaImg}}" stepKey="seeCaptchaImageFirst"/>
-        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaReload}}" stepKey="seeCaptchaReloadButtonFirst"/>
-
-        <!-- Submit Contact Us form -->
-        <fillField selector="{{StorefrontContactUsFormSection.emailField}}"  userInput="{{Simple_US_Customer.email}}" stepKey="fillEmail"/>
-        <fillField selector="{{StorefrontContactUsFormSection.nameField}}"  userInput="{{Simple_US_Customer.firstname}}" stepKey="fillName"/>
-        <fillField selector="{{StorefrontContactUsFormSection.commentField}}"  userInput="Lorem ipsum dolor sit amet, ne enim aliquando eam, oblique deserunt no usu."
-                   stepKey="fillComment"/>
-        <fillField selector="{{StorefrontContactUsCaptchaSection.captchaField}}" userInput="InvalidCaptcha" stepKey="fillCaptcha" />
-        <click selector="{{StorefrontContactUsFormSection.submitFormButton}}" stepKey="clickSubmitFormButton"/>
-
-        <!-- Check Captcha items after form reload -->
-        <see userInput="Incorrect CAPTCHA" selector="{{StorefrontCustomerMessagesSection.errorMessage}}" stepKey="verifyMessage"/>
-        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaField}}" stepKey="seeCaptchaFieldSecond"/>
-        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaImg}}" stepKey="seeCaptchaImageSecond"/>
-        <waitForElementVisible selector="{{StorefrontContactUsCaptchaSection.captchaReload}}" stepKey="seeCaptchaReloadButtonSecond"/>
-    </test>
-</tests>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
new file mode 100644
index 0000000000000..4a08576f60a9a
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.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="StorefrontCaptchaOnContactUsTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="Submit Contact us form + Captcha"/>
+            <title value="Captcha on contact us form test"/>
+            <description value="Test creation for send comment using the contact us form with captcha."/>
+            <testCaseId value="MC-14103" />
+            <severity value="AVERAGE"/>
+            <group value="captcha"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
+            <magentoCLI command="config:set {{StorefrontCaptchaOnContactUsFormConfigData.path}} {{StorefrontCaptchaOnContactUsFormConfigData.value}}" stepKey="enableUserEditCaptcha"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
+            <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms" />
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+        </after>
+
+        <!-- Open storefront contact us form -->
+        <actionGroup ref="StorefrontOpenContactUsPageActionGroup" stepKey="goToContactUsPage" />
+
+        <!-- Check Captcha items -->
+        <actionGroup ref="AssertCaptchaVisibleOnContactUsFormActionGroup" stepKey="seeCaptchaOnContactUsForm" />
+
+        <!-- Submit Contact Us form -->
+        <actionGroup ref="StorefrontFillContactUsFormWithCaptchaActionGroup" stepKey="fillContactUsFormWithWrongCaptcha">
+            <argument name="customer" value="Simple_US_Customer" />
+            <argument name="contactUsData" value="DefaultContactUsData" />
+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
+        </actionGroup>
+        <actionGroup ref="StorefrontSubmitContactUsFormActionGroup" stepKey="submitContactUsFormWithWrongCaptcha" />
+
+        <!-- Check Captcha items after form reload -->
+        <actionGroup ref="AssertMessageContactUsFormActionGroup" stepKey="verifyErrorMessage">
+            <argument name="message" value="Incorrect CAPTCHA" />
+            <argument name="messageType" value="error" />
+        </actionGroup>
+        <actionGroup ref="AssertCaptchaVisibleOnContactUsFormActionGroup" stepKey="seeCaptchaOnContactUsFormAfterWrongCaptcha" />
+
+        <actionGroup ref="StorefrontFillContactUsFormWithCaptchaActionGroup" stepKey="fillContactUsFormWithCorrectCaptcha">
+            <argument name="customer" value="Simple_US_Customer" />
+            <argument name="contactUsData" value="DefaultContactUsData" />
+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
+        </actionGroup>
+        <actionGroup ref="StorefrontSubmitContactUsFormActionGroup" stepKey="submitContactUsFormWithCorrectCaptcha" />
+        <actionGroup ref="AssertMessageContactUsFormActionGroup" stepKey="verifySuccessMessage" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
index ea63037b0551d..413c1b6c7e3a2 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
@@ -55,7 +55,7 @@
         </actionGroup>
         <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonThirdAttempt" />
         <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterThirdAttempt" />
-        <actionGroup ref="AssertCaptchaVisibleOnCustomerLoginFormActionGroup" stepKey="dontSeeCaptchaAfterThirdAttempt" />
+        <actionGroup ref="AssertCaptchaVisibleOnCustomerLoginFormActionGroup" stepKey="seeCaptchaAfterThirdAttempt" />
 
         <!-- Submit form with incorrect captcha -->
         <actionGroup ref="StorefrontFillCustomerLoginFormWithCaptchaActionGroup" stepKey="fillLoginFormCorrectAccountIncorrectCaptcha">
diff --git a/app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertMessageContactUsFormActionGroup.xml b/app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertMessageContactUsFormActionGroup.xml
new file mode 100644
index 0000000000000..eec2194825166
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/ActionGroup/AssertMessageContactUsFormActionGroup.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="AssertMessageContactUsFormActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="Thanks for contacting us with your comments and questions. We'll respond to you very soon." />
+            <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+        <see userInput="{{message}}" selector="{{StorefrontContactUsMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontFillContactUsFormActionGroup.xml b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontFillContactUsFormActionGroup.xml
new file mode 100644
index 0000000000000..df4964ea0423d
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontFillContactUsFormActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontFillContactUsFormActionGroup">
+        <arguments>
+            <argument name="customer" type="entity" />
+            <argument name="contactUsData" type="entity" />
+        </arguments>
+        <fillField selector="{{StorefrontContactUsFormSection.nameField}}"  userInput="{{customer.firstname}}" stepKey="fillName"/>
+        <fillField selector="{{StorefrontContactUsFormSection.emailField}}"  userInput="{{customer.email}}" stepKey="fillEmail"/>
+        <fillField selector="{{StorefrontContactUsFormSection.commentField}}"  userInput="{{contactUsData.comment}}" stepKey="fillComment"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontOpenContactUsPageActionGroup.xml b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontOpenContactUsPageActionGroup.xml
new file mode 100644
index 0000000000000..d333d5d998960
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontOpenContactUsPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontOpenContactUsPageActionGroup">
+        <amOnPage url="{{StorefrontContactUsPage.url}}" stepKey="amOnContactUpPage"/>
+        <waitForPageLoad stepKey="waitForContactUpPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontSubmitContactUsFormActionGroup.xml b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontSubmitContactUsFormActionGroup.xml
new file mode 100644
index 0000000000000..f3fe34f20c319
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/ActionGroup/StorefrontSubmitContactUsFormActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontSubmitContactUsFormActionGroup">
+        <click selector="{{StorefrontContactUsFormSection.submitFormButton}}" stepKey="clickSubmitFormButton"/>
+        <waitForPageLoad stepKey="waitForCommentSubmitted" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Contact/Test/Mftf/Data/ContactUsData.xml b/app/code/Magento/Contact/Test/Mftf/Data/ContactUsData.xml
new file mode 100644
index 0000000000000..eadf760776c58
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/Data/ContactUsData.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="DefaultContactUsData">
+        <data key="comment" unique="suffix">Lorem ipsum dolor sit amet, ne enim aliquando eam, oblique deserunt no usu. Unique: </data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml b/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml
index b8d1de812d887..5e793b2338507 100644
--- a/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml
+++ b/app/code/Magento/Contact/Test/Mftf/Page/StorefrontContactUsPage.xml
@@ -10,6 +10,5 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="StorefrontContactUsPage" url="/contact/" area="storefront" module="Magento_Contact">
         <section name="StorefrontContactUsFormSection"/>
-        <section name="StorefrontContactUsCaptchaSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml
index a73d1ad1297ef..fdaddf33f5170 100644
--- a/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml
+++ b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsFormSection.xml
@@ -9,9 +9,10 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontContactUsFormSection">
-        <element name="nameField" type="input" selector="#name"/>
-        <element name="emailField" type="input" selector="#email"/>
-        <element name="commentField" type="textarea" selector="#comment"/>
-        <element name="submitFormButton" type="button" selector=".action.submit.primary" timeout="30"/>
+        <element name="nameField" type="input" selector="#contact-form input[name='name']" />
+        <element name="emailField" type="input" selector="#contact-form input[name='email']" />
+        <element name="phoneField" type="input" selector="#contact-form input[name='telephone']" />
+        <element name="commentField" type="textarea" selector="#contact-form textarea[name='comment']" />
+        <element name="submitFormButton" type="button" selector="#contact-form button[type='submit']" timeout="30" />
     </section>
 </sections>
diff --git a/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.xml
new file mode 100644
index 0000000000000..0970f1f8f6b20
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/Section/StorefrontContactUsMessagesSection.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="StorefrontContactUsMessagesSection">
+        <element name="messageByType" type="block" selector="#maincontent .message-{{messageType}}" parameterized="true" />
+    </section>
+</sections>

From 30a5a863cb7732ab592bd4f4f18354fa31822024 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 4 Apr 2019 18:06:49 +0300
Subject: [PATCH 0978/1055] MAGETWO-58764: [GitHub] Minimal Query Length For
 Catalog Search #6681

---
 .../Model/Search/Adapter/Mysql/Query/Builder/Match.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
index 8f5aa73e9d12c..b8640f67811f7 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -44,7 +44,6 @@ public function __construct(
         array $preprocessors = []
     ) {
         parent::__construct($resolver, $fulltextHelper, $fulltextSearchMode, $preprocessors);
-        $this->replaceSymbols = str_split(self::SPECIAL_CHARACTERS, 1);
         $this->searchHelper = $searchHelper;
     }
 
@@ -53,6 +52,7 @@ public function __construct(
      */
     protected function prepareQuery($queryValue, $conditionType)
     {
+        $this->replaceSymbols = str_split(self::SPECIAL_CHARACTERS, 1);
         $queryValue = str_replace($this->replaceSymbols, ' ', $queryValue);
         foreach ($this->preprocessors as $preprocessor) {
             $queryValue = $preprocessor->process($queryValue);

From 5f0bf181fcb2d63d7e42c34ea5bac0e74b450c62 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Thu, 4 Apr 2019 10:48:42 -0500
Subject: [PATCH 0979/1055] MC-15729: Create new GraphQL script for our
 benchmark - part 1

---
 setup/performance-toolkit/benchmark.jmx | 538 ++++++++++++++++++++++++
 1 file changed, 538 insertions(+)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index c0d57ba0e2cef..2035da9d58265 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -364,6 +364,16 @@
             <stringProp name="Argument.value">${__P(graphQLPoolUsers,1)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="graphqlAddConfigurableProductToCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlAddConfigurableProductToCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlAddConfigurableProductToCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlAddSimpleProductToCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlAddSimpleProductToCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlAddSimpleProductToCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="graphqlGetCategoryListByCategoryIdPercentage" elementType="Argument">
             <stringProp name="Argument.name">graphqlGetCategoryListByCategoryIdPercentage</stringProp>
             <stringProp name="Argument.value">${__P(graphqlGetCategoryListByCategoryIdPercentage,0)}</stringProp>
@@ -40572,6 +40582,534 @@ vars.putObject("category", categories[number]);
     </hashTree>
   </hashTree>
 
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Add Simple Product To Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlAddSimpleProductToCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Add Simple Product To Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          data: {\n            qty: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        qty\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Simple Product From Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  removeItemFromCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_item_id: ${item_id}\n    }\n  ) {\n    cart {\n      items {\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_simple_product_from_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1452665323">{"data":{"removeItemFromCart":{"cart":{"items":[]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Add Configurable Product To Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlAddConfigurableProductToCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Add Configurable Product To Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    
+    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
+      <stringProp name="VAR">product_option</stringProp>
+      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
+      <stringProp name="DEFAULT"/>
+      <stringProp name="VARIABLE"/>
+      <stringProp name="SUBJECT">BODY</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            qty: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        qty\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
+          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Configurable Product From Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  removeItemFromCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_item_id: ${item_id}\n    }\n  ) {\n    cart {\n      items {\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_configurable_product_from_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1452665323">{"data":{"removeItemFromCart":{"cart":{"items":[]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
   </hashTree>
 
     

From c62e6a691c2af0cea283d6802ae0eaf827ed57eb Mon Sep 17 00:00:00 2001
From: Viktor Tymchynskyi <vtymchynskyi@magento.com>
Date: Thu, 14 Mar 2019 16:01:08 -0500
Subject: [PATCH 0980/1055] MAGETWO-98424: Braintree payment method not
 supported in multi-shipping

- Add support of Braintree and Braintree PayPal payment methods on multi-shipping checkout
---
 .../Model/Multishipping/PlaceOrder.php        | 177 ++++++++++++
 app/code/Magento/Braintree/composer.json      |   3 +-
 app/code/Magento/Braintree/etc/config.xml     |   8 +-
 .../Magento/Braintree/etc/frontend/di.xml     |   8 +
 app/code/Magento/Braintree/etc/payment.xml    |  10 +-
 .../layout/multishipping_checkout_billing.xml |  20 ++
 .../templates/multishipping/form.phtml        |  29 ++
 .../templates/multishipping/form_paypal.phtml |  29 ++
 .../multishipping/hosted-fields.js            | 102 +++++++
 .../method-renderer/multishipping/paypal.js   | 143 ++++++++++
 .../template/payment/multishipping/form.html  | 106 ++++++++
 .../payment/multishipping/paypal.html         |  40 +++
 .../frontend/templates/checkout/billing.phtml |  69 +++--
 .../layout/multishipping_checkout_billing.xml |  19 ++
 .../multishipping/checkmo_form.phtml          |  28 ++
 .../Fixtures/assign_items_per_address.php     |  40 +++
 .../Braintree/Fixtures/payment_braintree.php  |  28 ++
 .../Fixtures/payment_braintree_paypal.php     |  28 ++
 .../quote_with_split_items_braintree.php      |  26 ++
 ...uote_with_split_items_braintree_paypal.php |  26 ++
 .../Braintree/Model/MultishippingTest.php     | 254 ++++++++++++++++++
 21 files changed, 1159 insertions(+), 34 deletions(-)
 create mode 100644 app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php
 create mode 100644 app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml
 create mode 100644 app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
 create mode 100644 app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
 create mode 100644 app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/hosted-fields.js
 create mode 100644 app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
 create mode 100644 app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html
 create mode 100644 app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html
 create mode 100644 app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml
 create mode 100644 app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
 create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php

diff --git a/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php b/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php
new file mode 100644
index 0000000000000..a6c1b088400a7
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Model\Multishipping;
+
+use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PaypalConfigProvider;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+
+/**
+ * Order payments processing for multishipping checkout flow.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PlaceOrder implements PlaceOrderInterface
+{
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
+
+    /**
+     * @var OrderPaymentExtensionInterfaceFactory
+     */
+    private $paymentExtensionFactory;
+
+    /**
+     * @var GetPaymentNonceCommand
+     */
+    private $getPaymentNonceCommand;
+
+    /**
+     * @param OrderManagementInterface $orderManagement
+     * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
+     * @param GetPaymentNonceCommand $getPaymentNonceCommand
+     */
+    public function __construct(
+        OrderManagementInterface $orderManagement,
+        OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
+        GetPaymentNonceCommand $getPaymentNonceCommand
+    ) {
+        $this->orderManagement = $orderManagement;
+        $this->paymentExtensionFactory = $paymentExtensionFactory;
+        $this->getPaymentNonceCommand = $getPaymentNonceCommand;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function place(array $orderList): array
+    {
+        if (empty($orderList)) {
+            return [];
+        }
+
+        $errorList = [];
+        $firstOrder = $this->orderManagement->place(array_shift($orderList));
+        // get payment token from first placed order
+        $paymentToken = $this->getPaymentToken($firstOrder);
+
+        foreach ($orderList as $order) {
+            try {
+                /** @var OrderInterface $order */
+                $orderPayment = $order->getPayment();
+                $this->setVaultPayment($orderPayment, $paymentToken);
+                $this->orderManagement->place($order);
+            } catch (\Exception $e) {
+                $incrementId = $order->getIncrementId();
+                $errorList[$incrementId] = $e;
+            }
+        }
+
+        return $errorList;
+    }
+
+    /**
+     * Sets vault payment method.
+     *
+     * @param OrderPaymentInterface $orderPayment
+     * @param PaymentTokenInterface $paymentToken
+     * @return void
+     */
+    private function setVaultPayment(OrderPaymentInterface $orderPayment, PaymentTokenInterface $paymentToken): void
+    {
+        $vaultMethod = $this->getVaultPaymentMethod(
+            $orderPayment->getMethod()
+        );
+        $orderPayment->setMethod($vaultMethod);
+
+        $publicHash = $paymentToken->getPublicHash();
+        $customerId = $paymentToken->getCustomerId();
+        $result = $this->getPaymentNonceCommand->execute(
+            ['public_hash' => $publicHash, 'customer_id' => $customerId]
+        )
+            ->get();
+
+        $orderPayment->setAdditionalInformation(
+            DataAssignObserver::PAYMENT_METHOD_NONCE,
+            $result['paymentMethodNonce']
+        );
+        $orderPayment->setAdditionalInformation(
+            PaymentTokenInterface::PUBLIC_HASH,
+            $publicHash
+        );
+        $orderPayment->setAdditionalInformation(
+            PaymentTokenInterface::CUSTOMER_ID,
+            $customerId
+        );
+    }
+
+    /**
+     * Returns vault payment method.
+     *
+     * For placing sequence of orders, we need to replace the original method on the vault method.
+     *
+     * @param string $method
+     * @return string
+     */
+    private function getVaultPaymentMethod(string $method): string
+    {
+        $vaultPaymentMap = [
+            ConfigProvider::CODE => ConfigProvider::CC_VAULT_CODE,
+            PaypalConfigProvider::PAYPAL_CODE => PaypalConfigProvider::PAYPAL_VAULT_CODE
+        ];
+
+        return $vaultPaymentMap[$method] ?? $method;
+    }
+
+    /**
+     * Returns payment token.
+     *
+     * @param OrderInterface $order
+     * @return PaymentTokenInterface
+     * @throws \BadMethodCallException
+     */
+    private function getPaymentToken(OrderInterface $order): PaymentTokenInterface
+    {
+        $orderPayment = $order->getPayment();
+        $extensionAttributes = $this->getExtensionAttributes($orderPayment);
+        $paymentToken = $extensionAttributes->getVaultPaymentToken();
+
+        if ($paymentToken === null) {
+            throw new \BadMethodCallException('Vault Payment Token should be defined for placed order payment.');
+        }
+
+        return $paymentToken;
+    }
+
+    /**
+     * Gets payment extension attributes.
+     *
+     * @param OrderPaymentInterface $payment
+     * @return OrderPaymentExtensionInterface
+     */
+    private function getExtensionAttributes(OrderPaymentInterface $payment): OrderPaymentExtensionInterface
+    {
+        $extensionAttributes = $payment->getExtensionAttributes();
+        if (null === $extensionAttributes) {
+            $extensionAttributes = $this->paymentExtensionFactory->create();
+            $payment->setExtensionAttributes($extensionAttributes);
+        }
+
+        return $extensionAttributes;
+    }
+}
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
index 5af56a2afd3fe..2f956076f3846 100644
--- a/app/code/Magento/Braintree/composer.json
+++ b/app/code/Magento/Braintree/composer.json
@@ -21,7 +21,8 @@
         "magento/module-quote": "*",
         "magento/module-sales": "*",
         "magento/module-ui": "*",
-        "magento/module-vault": "*"
+        "magento/module-vault": "*",
+        "magento/module-multishipping": "*"
     },
     "suggest": {
         "magento/module-checkout-agreements": "*",
diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
index 9de4773af023a..fe4cfab9c0e30 100644
--- a/app/code/Magento/Braintree/etc/config.xml
+++ b/app/code/Magento/Braintree/etc/config.xml
@@ -42,7 +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>
+                <group>braintree_group</group>
             </braintree>
             <braintree_paypal>
                 <model>BraintreePayPalFacade</model>
@@ -68,7 +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>
+                <group>braintree_group</group>
             </braintree_paypal>
             <braintree_cc_vault>
                 <model>BraintreeCreditCardVaultFacade</model>
@@ -78,7 +78,7 @@
                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
                 </instant_purchase>
-                <group>braintree</group>
+                <group>braintree_group</group>
             </braintree_cc_vault>
             <braintree_paypal_vault>
                 <model>BraintreePayPalVaultFacade</model>
@@ -88,7 +88,7 @@
                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter</tokenFormat>
                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
                 </instant_purchase>
-                <group>braintree</group>
+                <group>braintree_group</group>
             </braintree_paypal_vault>
         </payment>
     </default>
diff --git a/app/code/Magento/Braintree/etc/frontend/di.xml b/app/code/Magento/Braintree/etc/frontend/di.xml
index ea417c407dffd..d8d3a93b71dc3 100644
--- a/app/code/Magento/Braintree/etc/frontend/di.xml
+++ b/app/code/Magento/Braintree/etc/frontend/di.xml
@@ -61,4 +61,12 @@
             <argument name="resolver" xsi:type="object">Magento\Braintree\Model\LocaleResolver</argument>
         </arguments>
     </type>
+    <type name="Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool">
+        <arguments>
+            <argument name="services" xsi:type="array">
+                <item name="braintree" xsi:type="string">Magento\Braintree\Model\Multishipping\PlaceOrder</item>
+                <item name="braintree_paypal" xsi:type="string">Magento\Braintree\Model\Multishipping\PlaceOrder</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Braintree/etc/payment.xml b/app/code/Magento/Braintree/etc/payment.xml
index dbabd91151022..4cae049aaf5a9 100644
--- a/app/code/Magento/Braintree/etc/payment.xml
+++ b/app/code/Magento/Braintree/etc/payment.xml
@@ -8,8 +8,16 @@
 <payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
     <groups>
-        <group id="braintree">
+        <group id="braintree_group">
             <label>Braintree</label>
         </group>
     </groups>
+    <methods>
+        <method name="braintree">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="braintree_paypal">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+    </methods>
 </payment>
diff --git a/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml
new file mode 100644
index 0000000000000..06390d403e63d
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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="checkout_billing">
+            <arguments>
+                <argument name="form_templates" xsi:type="array">
+                    <item name="braintree" xsi:type="string">Magento_Braintree::multishipping/form.phtml</item>
+                    <item name="braintree_paypal" xsi:type="string">Magento_Braintree::multishipping/form_paypal.phtml</item>
+                </argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
new file mode 100644
index 0000000000000..bf8aa8dd09c2c
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script>
+    require([
+        'uiLayout',
+        'jquery'
+    ], function (layout, $) {
+        $(function () {
+            var paymentMethodData = {
+                method: 'braintree'
+            };
+            layout([
+                {
+                    component: 'Magento_Braintree/js/view/payment/method-renderer/multishipping/hosted-fields',
+                    name: 'payment_method_braintree',
+                    method: paymentMethodData.method,
+                    item: paymentMethodData
+                }
+            ]);
+
+            $('body').trigger('contentUpdated');
+        })
+    })
+</script>
+<!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
new file mode 100644
index 0000000000000..ea3eb2214c2d8
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script>
+    require([
+        'uiLayout',
+        'jquery'
+    ], function (layout, $) {
+        $(function () {
+            var paymentMethodData = {
+                method: 'braintree_paypal'
+            };
+            layout([
+                {
+                    component: 'Magento_Braintree/js/view/payment/method-renderer/multishipping/paypal',
+                    name: 'payment_method_braintree_paypal',
+                    method: paymentMethodData.method,
+                    item: paymentMethodData
+                }
+            ]);
+
+            $('body').trigger('contentUpdated');
+        })
+    })
+</script>
+<!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/hosted-fields.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/hosted-fields.js
new file mode 100644
index 0000000000000..1ceebc8e66282
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/hosted-fields.js
@@ -0,0 +1,102 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*browser:true*/
+/*global define*/
+
+define([
+    'jquery',
+    'Magento_Braintree/js/view/payment/method-renderer/hosted-fields',
+    'Magento_Braintree/js/validator',
+    'Magento_Ui/js/model/messageList',
+    'mage/translate',
+    'Magento_Checkout/js/model/full-screen-loader',
+    'Magento_Checkout/js/action/set-payment-information',
+    'Magento_Checkout/js/model/payment/additional-validators'
+], function (
+    $,
+    Component,
+    validator,
+    messageList,
+    $t,
+    fullScreenLoader,
+    setPaymentInformationAction,
+    additionalValidators
+) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_Braintree/payment/multishipping/form'
+        },
+
+        /**
+         * Get list of available CC types
+         *
+         * @returns {Object}
+         */
+        getCcAvailableTypes: function () {
+            var availableTypes = validator.getAvailableCardTypes(),
+                billingCountryId;
+
+            billingCountryId = $('#multishipping_billing_country_id').val();
+
+            if (billingCountryId && validator.getCountrySpecificCardTypes(billingCountryId)) {
+                return validator.collectTypes(
+                    availableTypes, validator.getCountrySpecificCardTypes(billingCountryId)
+                );
+            }
+
+            return availableTypes;
+        },
+
+        /**
+         * @override
+         */
+        placeOrder: function () {
+            var self = this;
+
+            this.validatorManager.validate(self, function () {
+                return self.setPaymentInformation();
+            });
+        },
+
+        /**
+         * @override
+         */
+        setPaymentInformation: function () {
+            if (additionalValidators.validate()) {
+
+                fullScreenLoader.startLoader();
+
+                $.when(
+                    setPaymentInformationAction(
+                        this.messageContainer,
+                        this.getData()
+                    )
+                ).done(this.done.bind(this))
+                    .fail(this.fail.bind(this));
+            }
+        },
+
+        /**
+         * {Function}
+         */
+        fail: function () {
+            fullScreenLoader.stopLoader();
+
+            return this;
+        },
+
+        /**
+         * {Function}
+         */
+        done: function () {
+            fullScreenLoader.stopLoader();
+            $('#multishipping-billing-form').submit();
+
+            return this;
+        }
+    });
+});
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
new file mode 100644
index 0000000000000..6702e58d1214b
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
@@ -0,0 +1,143 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*browser:true*/
+/*global define*/
+define([
+    'jquery',
+    'underscore',
+    'Magento_Braintree/js/view/payment/method-renderer/paypal',
+    'Magento_Checkout/js/action/set-payment-information',
+    'Magento_Checkout/js/model/payment/additional-validators',
+    'Magento_Checkout/js/model/full-screen-loader',
+    'mage/translate'
+], function (
+    $,
+    _,
+    Component,
+    setPaymentInformationAction,
+    additionalValidators,
+    fullScreenLoader,
+    $t
+) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_Braintree/payment/multishipping/paypal',
+            submitButtonSelector: '#payment-continue span'
+        },
+
+        /**
+         * @override
+         */
+        onActiveChange: function (isActive) {
+            this.updateSubmitButtonTitle(isActive);
+
+            this._super(isActive);
+        },
+
+        /**
+         * @override
+         */
+        beforePlaceOrder: function (data) {
+            this._super(data);
+
+            this.updateSubmitButtonTitle(true);
+        },
+
+        /**
+         * @override
+         */
+        getShippingAddress: function () {
+            return {};
+        },
+
+        /**
+         * @override
+         */
+        getData: function () {
+            var data = this._super();
+
+            data['additional_data']['is_active_payment_token_enabler'] = true;
+
+            return data;
+        },
+
+        /**
+         * @override
+         */
+        isActiveVault: function () {
+            return true;
+        },
+
+        /**
+         * Skipping order review step on checkout with multiple addresses is not allowed.
+         *
+         * @returns {Boolean}
+         */
+        isSkipOrderReview: function () {
+            return false;
+        },
+
+        /**
+         * Checks if payment method nonce is already received.
+         *
+         * @returns {Boolean}
+         */
+        isPaymentMethodNonceReceived: function () {
+            return this.paymentMethodNonce !== null;
+        },
+
+        /**
+         * Updates submit button title on multi-addresses checkout billing form.
+         *
+         * @param {Boolean} isActive
+         */
+        updateSubmitButtonTitle: function (isActive) {
+            var title = this.isPaymentMethodNonceReceived() || !isActive ?
+                $t('Go to Review Your Order') : $t('Continue to PayPal');
+
+            $(this.submitButtonSelector).html(title);
+        },
+
+        /**
+         * @override
+         */
+        placeOrder: function () {
+            if (!this.isPaymentMethodNonceReceived()) {
+                this.payWithPayPal();
+            } else {
+                fullScreenLoader.startLoader();
+
+                $.when(
+                    setPaymentInformationAction(
+                        this.messageContainer,
+                        this.getData()
+                    )
+                ).done(this.done.bind(this))
+                    .fail(this.fail.bind(this));
+            }
+        },
+
+        /**
+         * {Function}
+         */
+        fail: function () {
+            fullScreenLoader.stopLoader();
+
+            return this;
+        },
+
+        /**
+         * {Function}
+         */
+        done: function () {
+            fullScreenLoader.stopLoader();
+            $('#multishipping-billing-form').submit();
+
+            return this;
+        }
+    });
+});
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html
new file mode 100644
index 0000000000000..964e15df166d3
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html
@@ -0,0 +1,106 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<div data-bind="attr: {class: 'payment-method payment-method-' + getCode()}, css: {'_active': isActive()}">
+    <div>
+        <form id="co-transparent-form-braintree" class="form" data-bind="" method="post" action="#" novalidate="novalidate">
+            <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}">
+                <legend class="legend">
+                    <span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span>
+                </legend>
+                <br>
+                <div class="field type">
+                    <div class="control">
+                        <ul class="credit-card-types">
+                            <!-- ko foreach: {data: getCcAvailableTypes(), as: 'item'} -->
+                            <li class="item" data-bind="css: {
+                                _active: $parent.selectedCardType() == item,
+                                _inactive: $parent.selectedCardType() != null && $parent.selectedCardType() != item
+                            } ">
+                                <!--ko if: $parent.getIcons(item) -->
+                                <img data-bind="attr: {
+                                    'src': $parent.getIcons(item).url,
+                                    'width': $parent.getIcons(item).width,
+                                    'height': $parent.getIcons(item).height
+                                }">
+                                <!--/ko-->
+                            </li>
+                            <!--/ko-->
+                        </ul>
+                        <input type="hidden"
+                               name="payment[cc_type]"
+                               class="input-text"
+                               value=""
+                               data-bind="attr: {id: getCode() + '_cc_type', 'data-container': getCode() + '-cc-type'},
+                                    value: creditCardType
+                        ">
+                    </div>
+                </div>
+                <div class="field number required">
+                    <label data-bind="attr: {for: getCode() + '_cc_number'}" class="label">
+                        <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
+                    </label>
+                    <div class="control">
+                        <div data-bind="attr: {id: getCode() + '_cc_number'}" class="hosted-control"></div>
+                        <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Credit Card Number'--><!-- /ko --></div>
+                    </div>
+                </div>
+                <div class="field number required">
+                    <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
+                        <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
+                    </label>
+                    <div class="control">
+                        <div class="hosted-date-wrap">
+                            <div data-bind="attr: {id: getCode() + '_expirationMonth'}"
+                                 class="hosted-control hosted-date"></div>
+
+                            <div data-bind="attr: {id: getCode() + '_expirationYear'}"
+                                 class="hosted-control hosted-date"></div>
+
+                            <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Expiration Date'--><!-- /ko --></div>
+                        </div>
+                    </div>
+                </div>
+                <!-- ko if: (hasVerification())-->
+                <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}">
+                    <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
+                        <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
+                    </label>
+                    <div class="control _with-tooltip">
+                        <div data-bind="attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
+                        <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Card Verification Number'--><!-- /ko --></div>
+
+                        <div class="field-tooltip toggle">
+                            <span class="field-tooltip-action action-cvv"
+                                  tabindex="0"
+                                  data-toggle="dropdown"
+                                  data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
+                                <span><!-- ko i18n: 'What is this?'--><!-- /ko --></span>
+                            </span>
+                            <div class="field-tooltip-content"
+                                 data-target="dropdown"
+                                 data-bind="html: getCvvImageHtml()"></div>
+                        </div>
+                    </div>
+                </div>
+                <!-- /ko -->
+            </fieldset>
+            <input type="submit" id="braintree_submit"  style="display:none" />
+        </form>
+
+        <div class="actions-toolbar no-display">
+            <div class="primary">
+                <button data-role="review-save"
+                        type="submit"
+                        data-bind="{click: placeOrderClick}"
+                        class="action primary checkout">
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html
new file mode 100644
index 0000000000000..722989e41f98f
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html
@@ -0,0 +1,40 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': isActive()}">
+    <div class="payment-method-title field choice">
+        <label class="label" data-bind="attr: {'for': getCode()}">
+            <!-- PayPal Logo -->
+            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark'), title: $t('Acceptance Mark')}"
+                 class="payment-icon"/>
+            <!-- PayPal Logo -->
+            <span text="getTitle()"></span>
+        </label>
+    </div>
+
+    <div class="payment-method-content">
+        <each args="getRegion('messages')" render=""></each>
+        <fieldset class="braintree-paypal-fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
+            <div id="paypal-container"></div>
+        </fieldset>
+        <div class="actions-toolbar braintree-paypal-actions" data-bind="visible: isReviewRequired()">
+            <div class="payment-method-item braintree-paypal-account">
+                <span class="payment-method-type">PayPal</span>
+                <span class="payment-method-description" text="customerEmail()"></span>
+            </div>
+            <div class="actions-toolbar no-display">
+                <div class="primary">
+                    <button data-button="paypal-place" data-role="review-save"
+                            type="submit"
+                            data-bind="{click: placeOrder}"
+                            class="action primary checkout">
+                        <span data-bind="i18n: 'Place Order'"></span>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
index da553b7823da9..4354cfb7c1c3e 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -55,6 +55,10 @@
                 <div class="box-content">
                     <address>
                         <?= /* @noEscape */ $block->getCheckoutData()->getAddressHtml($block->getAddress()); ?>
+                        <input type="hidden"
+                               id="multishipping_billing_country_id"
+                               value="<?= /* @noEscape */ $block->getAddress()->getCountryId(); ?>"
+                               name="multishipping_billing_country_id"/>
                     </address>
                 </div>
             </div>
@@ -80,35 +84,44 @@
                                     $block->setMethodFormTemplate($code, $methodsForms[$code]);
                                 }
                                 ?>
-                            <dt class="item-title">
-                                <?php if ($methodsCount > 1) : ?>
-                                    <input type="radio"
-                                           id="p_method_<?= $block->escapeHtml($code); ?>"
-                                           value="<?= $block->escapeHtml($code); ?>"
-                                           name="payment[method]"
-                                           title="<?= $block->escapeHtml($_method->getTitle()) ?>"
-                                        <?php if ($checked) : ?>
-                                           checked="checked"
+                                <div data-bind="scope: 'payment_method_<?= $block->escapeHtml($code);?>'">
+                                    <dt class="item-title">
+                                        <?php if ($methodsCount > 1) : ?>
+                                            <input type="radio"
+                                                   id="p_method_<?= $block->escapeHtml($code); ?>"
+                                                   value="<?= $block->escapeHtml($code); ?>"
+                                                   name="payment[method]"
+                                                   title="<?= $block->escapeHtml($_method->getTitle()) ?>"
+                                                   data-bind="
+                                                       value: getCode(),
+                                                       checked: isChecked,
+                                                       click: selectPaymentMethod,
+                                                       visible: isRadioButtonVisible()"
+                                                <?php if ($checked) : ?>
+                                                    checked="checked"
+                                                <?php endif; ?>
+                                                   class="radio"/>
+                                        <?php else : ?>
+                                            <input type="radio"
+                                                   id="p_method_<?= $block->escapeHtml($code); ?>"
+                                                   value="<?= $block->escapeHtml($code); ?>"
+                                                   name="payment[method]"
+                                                   data-bind="
+                                                       value: getCode(),
+                                                       afterRender: selectPaymentMethod"
+                                                   checked="checked"
+                                                   class="radio solo method" />
                                         <?php endif; ?>
-                                           class="radio"/>
-                                <?php else : ?>
-                                    <input type="radio"
-                                           id="p_method_<?= $block->escapeHtml($code); ?>"
-                                           value="<?= $block->escapeHtml($code); ?>"
-                                           name="payment[method]"
-                                           checked="checked"
-                                           class="radio solo method" />
-                                <?php endif; ?>
-                                    <label for="p_method_<?= $block->escapeHtml($code); ?>">
-                                        <?= $block->escapeHtml($_method->getTitle()) ?>
-                                    </label>
-                            </dt>
-                                <?php if ($html = $block->getChildHtml('payment.method.' . $code)) : ?>
-                                    <dd class="item-content <?= $checked ? '' : 'no-display'; ?>"
-                                        data-bind="scope: 'payment_method_<?= $block->escapeHtml($code);?>'">
-                                        <?= /* @noEscape */ $html; ?>
-                                    </dd>
-                                <?php endif; ?>
+                                        <label for="p_method_<?= $block->escapeHtml($code); ?>">
+                                            <?= $block->escapeHtml($_method->getTitle()) ?>
+                                        </label>
+                                    </dt>
+                                    <?php if ($html = $block->getChildHtml('payment.method.' . $code)) : ?>
+                                        <dd class="item-content <?= $checked ? '' : 'no-display'; ?>">
+                                            <?= /* @noEscape */ $html; ?>
+                                        </dd>
+                                    <?php endif; ?>
+                                </div>
                             <?php endforeach; ?>
                         </dl>
                         <?= $block->getChildHtml('payment_methods_after') ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml
new file mode 100644
index 0000000000000..32810ecef20da
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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="checkout_billing">
+            <arguments>
+                <argument name="form_templates" xsi:type="array">
+                    <item name="checkmo" xsi:type="string">Magento_OfflinePayments::multishipping/checkmo_form.phtml</item>
+                </argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
new file mode 100644
index 0000000000000..b96918243a7a7
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script>
+    require([
+        'uiLayout',
+        'jquery'
+    ], function (layout, $) {
+        $(function () {
+            var paymentMethodData = {
+                method: 'checkmo'
+            };
+            layout([
+                {
+                    component: 'Magento_Checkout/js/view/payment/default',
+                    name: 'payment_method_checkmo',
+                    method: paymentMethodData.method,
+                    item: paymentMethodData
+                }
+            ]);
+
+            $('body').trigger('contentUpdated');
+        })
+    })
+</script>
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
new file mode 100644
index 0000000000000..91cea7dc96602
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+
+$store = $storeManager->getStore();
+$quote->setReservedOrderId('multishipping_quote_id_braintree')
+    ->setStoreId($store->getId())
+    ->setCustomerEmail('customer001@test.com');
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quote->collectTotals();
+$quoteRepository->save($quote);
+
+$items = $quote->getAllItems();
+$addressList = $quote->getAllShippingAddresses();
+
+foreach ($addressList as $key => $address) {
+    $item = $items[$key];
+    // set correct quantity per shipping address
+    $item->setQty(1);
+    $address->setTotalQty(1);
+    $address->addItem($item);
+}
+
+// assign virtual product to the billing address
+$billingAddress = $quote->getBillingAddress();
+$virtualItem = $items[sizeof($items) - 1];
+$billingAddress->setTotalQty(1);
+$billingAddress->addItem($virtualItem);
+
+// need to recollect totals
+$quote->setTotalsCollectedFlag(false);
+$quote->collectTotals();
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php
new file mode 100644
index 0000000000000..3e1db90f1f2c8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote\Payment;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+
+/**
+ * @var Magento\Quote\Model\Quote $quote
+ */
+
+if (empty($quote)) {
+    throw new \Exception('$quote should be defined in the parent fixture');
+}
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var PaymentInterface $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod(ConfigProvider::CODE);
+$quote->setPayment($payment);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php
new file mode 100644
index 0000000000000..e4bba222078b0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote\Payment;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+
+/**
+ * @var Magento\Quote\Model\Quote $quote
+ */
+
+if (empty($quote)) {
+    throw new \Exception('$quote should be defined in the parent fixture');
+}
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var PaymentInterface $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod(ConfigProvider::PAYPAL_CODE);
+$quote->setPayment($payment);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
new file mode 100644
index 0000000000000..1c56e611dd6db
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/shipping_address_list.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/billing_address.php';
+require __DIR__ . '/payment_braintree.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/items.php';
+require __DIR__ . '/assign_items_per_address.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
new file mode 100644
index 0000000000000..4bd8e926abb76
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/shipping_address_list.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/billing_address.php';
+require __DIR__ . '/payment_braintree_paypal.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/items.php';
+require __DIR__ . '/assign_items_per_address.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php
new file mode 100644
index 0000000000000..91bc0388d8551
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Model;
+
+use Braintree\Result\Successful;
+use Braintree\Transaction;
+use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Payment\Gateway\Command\ResultInterface as CommandResultInterface;
+
+/**
+ * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping with Braintree and BraintreePayPal payments.
+ *
+ * @magentoAppArea frontend
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MultishippingTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var BraintreeAdapter|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @var Multishipping
+     */
+    private $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $orderSender = $this->getMockBuilder(OrderSender::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactory->method('create')
+            ->willReturn($this->adapter);
+
+        $this->objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
+        $this->objectManager->addSharedInstance($this->getPaymentNonceMock(), GetPaymentNonceCommand::class);
+
+        $this->model = $this->objectManager->create(
+            Multishipping::class,
+            ['orderSender' => $orderSender]
+        );
+    }
+
+    /**
+     * Checks a case when multiple orders are created successfully using Braintree payment method.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
+     * @magentoConfigFixture current_store payment/braintree/active 1
+     * @return void
+     */
+    public function testCreateOrdersWithBraintree()
+    {
+        $this->adapter->method('sale')
+            ->willReturn(
+                $this->getTransactionStub()
+            );
+        $this->createOrders();
+    }
+
+    /**
+     * Checks a case when multiple orders are created successfully using Braintree PayPal payment method.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
+     * @magentoConfigFixture current_store payment/braintree_paypal/active 1
+     * @return void
+     */
+    public function testCreateOrdersWithBraintreePaypal()
+    {
+        $this->adapter->method('sale')
+            ->willReturn(
+                $this->getTransactionPaypalStub()
+            );
+        $this->createOrders();
+    }
+
+    /**
+     * Creates orders for multishipping checkout flow.
+     *
+     * @return void
+     */
+    private function createOrders()
+    {
+        $expectedPlacedOrdersNumber = 3;
+        $quote = $this->getQuote('multishipping_quote_id_braintree');
+
+        /** @var CheckoutSession $session */
+        $session = $this->objectManager->get(CheckoutSession::class);
+        $session->replaceQuote($quote);
+
+        $this->model->createOrders();
+
+        $orderList = $this->getOrderList((int)$quote->getId());
+        self::assertCount(
+            $expectedPlacedOrdersNumber,
+            $orderList,
+            'Total successfully placed orders number mismatch'
+        );
+    }
+
+    /**
+     * Creates stub for Braintree capture Transaction.
+     *
+     * @return Successful
+     */
+    private function getTransactionStub(): Successful
+    {
+        $transaction = $this->getMockBuilder(Transaction::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $transaction->status = 'submitted_for_settlement';
+        $transaction->creditCard = [
+            'last4' => '1111',
+            'cardType' => 'Visa',
+            'expirationMonth' => '12',
+            'expirationYear' => '2021'
+        ];
+
+        $creditCardDetails = new \stdClass();
+        $creditCardDetails->token = '4fdg';
+        $creditCardDetails->expirationMonth = '12';
+        $creditCardDetails->expirationYear = '2021';
+        $creditCardDetails->cardType = 'Visa';
+        $creditCardDetails->last4 = '1111';
+        $creditCardDetails->expirationDate = '12/2021';
+        $transaction->creditCardDetails = $creditCardDetails;
+
+        $response = new Successful();
+        $response->success = true;
+        $response->transaction = $transaction;
+
+        return $response;
+    }
+
+    /**
+     * Creates stub for BraintreePaypal capture Transaction.
+     *
+     * @return Successful
+     */
+    private function getTransactionPaypalStub(): Successful
+    {
+        $transaction = $this->getMockBuilder(Transaction::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $transaction->status = 'submitted_for_settlement';
+        $transaction->paypal = [
+            'token' => 'fchxqx',
+            'payerEmail' => 'payer@example.com',
+            'paymentId' => 'PAY-33ac47a28e7f54791f6cda45',
+        ];
+        $paypalDetails = new \stdClass();
+        $paypalDetails->token = 'fchxqx';
+        $paypalDetails->payerEmail = 'payer@example.com';
+        $paypalDetails->paymentId = '33ac47a28e7f54791f6cda45';
+        $transaction->paypalDetails = $paypalDetails;
+
+        $response = new Successful();
+        $response->success = true;
+        $response->transaction = $transaction;
+
+        return $response;
+    }
+
+    /**
+     * Retrieves quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Get list of orders by quote id.
+     *
+     * @param int $quoteId
+     * @return array
+     */
+    private function getOrderList(int $quoteId): array
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('quote_id', $quoteId)
+            ->create();
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        return $orderRepository->getList($searchCriteria)->getItems();
+    }
+
+    /**
+     * Returns GetPaymentNonceCommand command mock.
+     *
+     * @return MockObject
+     */
+    private function getPaymentNonceMock(): MockObject
+    {
+        $commandResult = $this->createMock(CommandResultInterface::class);
+        $commandResult->method('get')
+            ->willReturn(['paymentMethodNonce' => 'testNonce']);
+        $paymentNonce = $this->createMock(GetPaymentNonceCommand::class);
+        $paymentNonce->method('execute')
+            ->willReturn($commandResult);
+
+        return $paymentNonce;
+    }
+}

From 6af0e0068cacd1d66a9f470c4cca5ae7454d0db4 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 4 Apr 2019 17:10:09 -0500
Subject: [PATCH 0981/1055] Minor fixes for
 magento/magento-functional-tests-migration#688  - update test annotations  -
 provided additional verification of CAPTCHA

---
 .../AssertAdminSuccessLoginActionGroup.xml    | 14 ++++
 .../AssertMessageOnAdminLoginActionGroup.xml  | 18 +++++
 .../ActionGroup/LoginAsAdminActionGroup.xml   |  6 +-
 .../Test/Mftf/Section/AdminHeaderSection.xml  |  1 +
 .../Mftf/Section/AdminLoginFormSection.xml    |  4 --
 .../Section/AdminLoginMessagesSection.xml     | 14 ++++
 .../AdminLoginWithCaptchaActionGroup.xml      | 17 +++++
 ...tchaVisibleOnAdminLoginFormActionGroup.xml | 21 ++++++
 .../Test/Mftf/Data/CaptchaConfigData.xml      | 43 ++++++++++++
 .../Mftf/Section/AdminLoginFormSection.xml    | 16 +++++
 .../Mftf/Test/AdminLoginWithCaptchaTest.xml   | 66 ++++++++++++++++++
 .../Mftf/Test/CaptchaOnAdminLoginTest.xml     | 68 -------------------
 ...StorefrontCaptchaEditCustomerEmailTest.xml |  2 +-
 .../Test/StorefrontCaptchaOnContactUsTest.xml |  2 +-
 .../StorefrontCaptchaOnCustomerLoginTest.xml  |  2 +-
 ...orefrontCaptchaRegisterNewCustomerTest.xml |  2 +-
 .../Magento/User/Test/Mftf/Data/UserData.xml  |  8 +++
 17 files changed, 225 insertions(+), 79 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminLoginActionGroup.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Section/AdminLoginMessagesSection.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
 delete mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml
new file mode 100644
index 0000000000000..844f58c789a15
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="AssertAdminSuccessLoginActionGroup">
+        <waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminLoginActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminLoginActionGroup.xml
new file mode 100644
index 0000000000000..ccc7cd24350c5
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminLoginActionGroup.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="AssertMessageOnAdminLoginActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later." />
+            <argument name="messageType" type="string" defaultValue="error" />
+        </arguments>
+        <see userInput="{{message}}" selector="{{AdminLoginMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
index 1070bc409962a..b2fbadcbe38e2 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
@@ -10,11 +10,11 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="LoginAsAdmin">
         <arguments>
-            <argument name="adminUser" defaultValue="_ENV"/>
+            <argument name="adminUser" type="entity" defaultValue="DefaultAdminUser"/>
         </arguments>
         <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
-        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.username}}" stepKey="fillUsername"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.password}}" stepKey="fillPassword"/>
         <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
         <closeAdminNotification stepKey="closeAdminNotification"/>
     </actionGroup>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
index 441ce886f117b..5b517c7be8a79 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminHeaderSection">
         <element name="pageTitle" type="text" selector=".page-header h1.page-title"/>
+        <element name="adminUserAccountText" type="text" selector=".page-header .admin-user-account-text" />
     </section>
 </sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
index 8b28e923cc017..3b10fac7bb9dc 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
@@ -12,9 +12,5 @@
         <element name="username" type="input" selector="#username"/>
         <element name="password" type="input" selector="#login"/>
         <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
-        <element name="captchaField" type="input" selector="#captcha"/>
-        <element name="captchaImg" type="block" selector="#backend_login"/>
-        <element name="captchaReload" type="block" selector="#captcha-reload"/>
-        <element name="error" type="text" selector=".message.message-error.error"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginMessagesSection.xml
new file mode 100644
index 0000000000000..f6ada50ada357
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginMessagesSection.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="AdminLoginMessagesSection">
+        <element name="messageByType" type="block" selector=".login-content .messages .message-{{messageType}}" parameterized="true" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
new file mode 100644
index 0000000000000..07329e2659876
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AdminLoginWithCaptchaActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="AdminLoginWithCaptchaActionGroup" extends="LoginAsAdmin">
+        <arguments>
+            <argument name="captcha" type="string" />
+        </arguments>
+        <fillField stepKey="fillCaptchaField" after="fillPassword" userInput="{{captcha}}" selector="{{AdminLoginFormSection.captchaField}}" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.xml
new file mode 100644
index 0000000000000..aa02588000d2b
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnAdminLoginFormActionGroup.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="AssertCaptchaVisibleOnAdminLoginFormActionGroup">
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeCaptchaField"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeCaptchaImage"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageReloaded" />
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeCaptchaFieldAfterPageReload"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeCaptchaImageAfterPageReload"/>
+        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeCaptchaReloadButtonAfterPageReload"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
index b3d26cd7d7af2..90f48c320f2ac 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml
@@ -96,4 +96,47 @@
         <data key="label">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
         <data key="value">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
     </entity>
+    <entity name="AdminCaptchaEnableConfigData">
+        <!-- Magento default value -->
+        <data key="path">admin/captcha/enable</data>
+        <data key="scope_id">0</data>
+        <data key="label">Yes</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="AdminCaptchaDisableConfigData">
+        <data key="path">admin/captcha/enable</data>
+        <data key="scope_id">0</data>
+        <data key="label">No</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="AdminCaptchaLength3ConfigData">
+        <data key="path">admin/captcha/length</data>
+        <data key="scope">admin</data>
+        <data key="scope_id">1</data>
+        <data key="label">3</data>
+        <data key="value">3</data>
+    </entity>
+    <entity name="AdminCaptchaSymbols1ConfigData">
+        <data key="path">admin/captcha/symbols</data>
+        <data key="scope">admin</data>
+        <data key="scope_id">1</data>
+        <data key="label">1</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="AdminCaptchaDefaultLengthConfigData">
+        <!-- Magento default value -->
+        <data key="path">admin/captcha/length</data>
+        <data key="scope">admin</data>
+        <data key="scope_id">1</data>
+        <data key="label">4-5</data>
+        <data key="value">4-5</data>
+    </entity>
+    <entity name="AdminCaptchaDefaultSymbolsConfigData">
+        <!-- Magento default value -->
+        <data key="path">admin/captcha/symbols</data>
+        <data key="scope">admin</data>
+        <data key="scope_id">1</data>
+        <data key="label">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
+        <data key="value">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml b/app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml
new file mode 100644
index 0000000000000..2bcc6fc542d82
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Section/AdminLoginFormSection.xml
@@ -0,0 +1,16 @@
+<?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="AdminLoginFormSection">
+        <element name="captchaField" type="input" selector="#login-form input[name='captcha[backend_login]']" />
+        <element name="captchaImg" type="block" selector="#login-form img#backend_login"/>
+        <element name="captchaReload" type="block" selector="#login-form img#captcha-reload"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
new file mode 100644
index 0000000000000..6c3bf9b127b1e
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.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="AdminLoginWithCaptchaTest">
+        <annotations>
+            <features value="Captcha"/>
+            <stories value="Admin login + Captcha"/>
+            <title value="Captcha on Admin login form"/>
+            <description value="Test creation for admin login with captcha."/>
+            <testCaseId value="MC-14012" />
+            <severity value="MAJOR"/>
+            <group value="captcha"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <magentoCLI command="config:set {{AdminCaptchaLength3ConfigData.path}} {{AdminCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
+            <magentoCLI command="config:set {{AdminCaptchaSymbols1ConfigData.path}} {{AdminCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
+        </before>
+        <after>
+            <magentoCLI command="config:set {{AdminCaptchaDefaultLengthConfigData.path}} {{AdminCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
+            <magentoCLI command="config:set {{AdminCaptchaDefaultSymbolsConfigData.path}} {{AdminCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
+        </after>
+        
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdminWithWrongCredentialsFirstAttempt">
+            <argument name="adminUser" value="AdminUserWrongCredentials" />
+        </actionGroup>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeFirstLoginErrorMessage" />
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdminWithWrongCredentialsSecondAttempt">
+            <argument name="adminUser" value="AdminUserWrongCredentials" />
+        </actionGroup>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeSecondLoginErrorMessage" />
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdminWithWrongCredentialsThirdAttempt">
+            <argument name="adminUser" value="AdminUserWrongCredentials" />
+        </actionGroup>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeThirdLoginErrorMessage" />
+
+        <!-- Check captcha visibility on admin login page  -->
+        <actionGroup ref="AssertCaptchaVisibleOnAdminLoginFormActionGroup" stepKey="assertCaptchaVisible" />
+
+        <!-- Submit form with incorrect captcha -->
+        <actionGroup ref="AdminLoginWithCaptchaActionGroup" stepKey="loginAsAdminWithIncorrectCaptcha">
+            <argument name="adminUser" value="DefaultAdminUser" />
+            <argument name="captcha" value="{{WrongCaptcha.value}}" />
+        </actionGroup>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeIncorrectCaptchaErrorMessage">
+            <argument name="message" value="Incorrect CAPTCHA." />
+        </actionGroup>
+        <actionGroup ref="AssertCaptchaVisibleOnAdminLoginFormActionGroup" stepKey="assertCaptchaVisibleAfterIncorrectCaptcha" />
+
+        <actionGroup ref="AdminLoginWithCaptchaActionGroup" stepKey="loginAsAdminWithCorrectCaptcha">
+            <argument name="adminUser" value="DefaultAdminUser" />
+            <argument name="captcha" value="{{PreconfiguredCaptcha.value}}" />
+        </actionGroup>
+        <actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="verifyAdminLoggedIn" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml
deleted file mode 100644
index d830c0723ba89..0000000000000
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaOnAdminLoginTest.xml
+++ /dev/null
@@ -1,68 +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="CaptchaOnAdminLoginTest">
-        <annotations>
-            <features value="Captcha"/>
-            <stories value="Test creation for send comment using the contact us form with captcha."/>
-            <title value="Captcha contact us form test"/>
-            <description value="Test creation for send comment using the contact us form with captcha."/>
-            <severity value="MAJOR"/>
-            <group value="captcha"/>
-            <group value="mtf_migrated"/>
-        </annotations>
-        <before>
-
-        </before>
-        <after>
-
-        </after>
-        <!-- Open admin login page -->
-        <amOnPage url="{{AdminLoginPage.url}}" stepKey="goToAdminLoginPage" />
-        <waitForPageLoad stepKey="waitForPageLoad1" />
-
-        <!-- Login as Admin with incorrect credentials 3 times -->
-        <actionGroup ref="LoginAdminWithCredentialsActionGroup" stepKey="failedFirstLoginAdminUser">
-            <argument name="adminUser" value="adminUser" />
-            <argument name="adminPassword" value="INVALIDAdminPassword" />
-        </actionGroup>
-        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."
-             selector="{{AdminLoginFormSection.error}}" stepKey="seeFirstLoginError"/>
-
-        <actionGroup ref="LoginAdminWithCredentialsActionGroup" stepKey="failedSecondLoginAdminUser">
-            <argument name="adminUser" value="adminUser" />
-            <argument name="adminPassword" value="INVALIDAdminPassword" />
-        </actionGroup>
-        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."
-             selector="{{AdminLoginFormSection.error}}" stepKey="seeSecondLoginError"/>
-
-        <actionGroup ref="LoginAdminWithCredentialsActionGroup" stepKey="failedThirdLoginAdminUser">
-            <argument name="adminUser" value="adminUser" />
-            <argument name="adminPassword" value="INVALIDAdminPassword" />
-        </actionGroup>
-        <see userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."
-             selector="{{AdminLoginFormSection.error}}" stepKey="seeThirdLoginError"/>
-
-        <!-- Check captcha visibility on admin login page  -->
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeFirstCaptchaField"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeFirstCaptchaImage"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeFirstCaptchaReloadButton"/>
-
-        <!-- Submit form with incorrect captcha -->
-        <fillField selector="{{AdminLoginFormSection.username}}" userInput="adminUser" stepKey="fillAdminUserNameWithCaptcha"/>
-        <fillField selector="{{AdminLoginFormSection.password}}" userInput="adminPassword" stepKey="fillPasswordWithCaptcha"/>
-        <fillField selector="{{AdminLoginFormSection.captchaField}}" userInput="incorrectCaptcha" stepKey="fillCaptcha"/>
-        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLoginWithCaptcha"/>
-        <see userInput="Incorrect CAPTCHA." selector="{{AdminLoginFormSection.error}}" stepKey="seeCaptchaError"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaField}}" stepKey="seeSecondCaptchaField"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaImg}}" stepKey="seeSecondCaptchaImage"/>
-        <waitForElementVisible selector="{{AdminLoginFormSection.captchaReload}}" stepKey="seeSecondCaptchaReloadButton"/>
-    </test>
-</tests>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
index 99ce58bc3d174..54237087227d8 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
@@ -15,7 +15,7 @@
             <title value="Test for checking captcha on the customer account edit page."/>
             <description value="Test for checking captcha on the customer account edit page and customer is locked."/>
             <testCaseId value="MC-14013" />
-            <severity value="AVERAGE"/>
+            <severity value="MAJOR"/>
             <group value="captcha"/>
             <group value="mtf_migrated"/>
         </annotations>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
index 4a08576f60a9a..0c6a3f31c1df2 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
@@ -15,7 +15,7 @@
             <title value="Captcha on contact us form test"/>
             <description value="Test creation for send comment using the contact us form with captcha."/>
             <testCaseId value="MC-14103" />
-            <severity value="AVERAGE"/>
+            <severity value="MAJOR"/>
             <group value="captcha"/>
             <group value="mtf_migrated"/>
         </annotations>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
index 413c1b6c7e3a2..5a1be68d3f251 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
@@ -14,7 +14,7 @@
             <stories value="Login with Customer Account + Captcha"/>
             <title value="Captcha customer login page test"/>
             <description value="Check CAPTCHA on Storefront Login Page."/>
-            <severity value="AVERAGE"/>
+            <severity value="MAJOR"/>
             <testCaseId value="MC-14010" />
             <group value="captcha"/>
             <group value="mtf_migrated"/>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
index cce8a1570682b..2c331f958e467 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
@@ -14,7 +14,7 @@
             <stories value="Create New Customer Account + Captcha"/>
             <title value="Test creation for customer register with captcha on storefront."/>
             <description value="Test creation for customer register with captcha on storefront."/>
-            <severity value="AVERAGE"/>
+            <severity value="MAJOR"/>
             <testCaseId value="MC-14805" />
             <group value="captcha"/>
             <group value="mtf_migrated"/>
diff --git a/app/code/Magento/User/Test/Mftf/Data/UserData.xml b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
index 80c1cc3022964..d602f094ce4e5 100644
--- a/app/code/Magento/User/Test/Mftf/Data/UserData.xml
+++ b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
@@ -8,6 +8,14 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DefaultAdminUser" type="user">
+        <data key="username">{{_ENV.MAGENTO_ADMIN_USERNAME}}</data>
+        <data key="password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
+    </entity>
+    <entity name="AdminUserWrongCredentials">
+        <data key="username" unique="suffix">username_</data>
+        <data key="password" unique="suffix">password_</data>
+    </entity>
     <entity name="admin" type="user">
         <data key="email">admin@magento.com</data>
         <data key="password">admin123</data>

From e84784133d050a8b8a96a1704338f131dd16ef6a Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Thu, 4 Apr 2019 17:12:00 -0500
Subject: [PATCH 0982/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

- Address review comments
- Add customer validator interface for graphql requests
---
 .../Magento/GraphQl/Controller/GraphQl.php    |  80 +++++---------
 .../ContentTypeProcessor.php                  |  37 -------
 .../HttpHeaderProcessor/StoreProcessor.php    |   4 +-
 .../HttpHeaderProcessorInterface.php          |   5 +-
 .../Controller/HttpRequestProcessor.php       |  24 ++++-
 .../ContentTypeValidator.php                  |  40 +++++++
 .../HttpVerbValidator.php                     |  40 +++++++
 .../HttpRequestValidatorInterface.php         |  24 +++++
 app/code/Magento/GraphQl/etc/graphql/di.xml   |   5 +-
 .../TestFramework/TestCase/GraphQl/Client.php |  46 ++++----
 .../TestCase/GraphQlAbstract.php              |  54 ++++++----
 .../CatalogInventory/AddProductToCartTest.php |   4 +-
 .../Customer/ChangeCustomerPasswordTest.php   |   8 +-
 .../Customer/CreateCustomerAddressTest.php    |   6 +-
 .../GraphQl/Customer/CreateCustomerTest.php   |  12 +--
 .../Customer/DeleteCustomerAddressTest.php    |  10 +-
 .../Customer/GenerateCustomerTokenTest.php    |   4 +-
 .../Customer/RevokeCustomerTokenTest.php      |   4 +-
 .../Customer/SubscriptionStatusTest.php       |   9 +-
 .../Customer/UpdateCustomerAddressTest.php    |   6 +-
 .../GraphQl/Customer/UpdateCustomerTest.php   |  14 +--
 .../AddConfigurableProductToCartTest.php      |   6 +-
 .../Quote/AddSimpleProductToCartTest.php      |   6 +-
 .../Magento/GraphQl/Quote/CouponTest.php      |  16 +--
 .../Quote/Customer/CreateEmptyCartTest.php    |   2 +-
 .../Quote/Customer/RemoveItemFromCartTest.php |  14 +--
 .../Customer/SetBillingAddressOnCartTest.php  |  20 ++--
 .../SetOfflineShippingMethodsOnCartTest.php   |   2 +-
 .../Customer/SetPaymentMethodOnCartTest.php   |  18 ++--
 .../Customer/SetShippingAddressOnCartTest.php |  18 ++--
 .../Customer/SetShippingMethodsOnCartTest.php |  14 +--
 .../Quote/Customer/UpdateCartItemsTest.php    |  18 ++--
 .../Quote/Guest/CreateEmptyCartTest.php       |   2 +-
 .../Quote/Guest/RemoveItemFromCartTest.php    |  12 +--
 .../Guest/SetBillingAddressOnCartTest.php     |  12 +--
 .../SetOfflineShippingMethodsOnCartTest.php   |   2 +-
 .../Guest/SetPaymentMethodOnCartTest.php      |  16 +--
 .../Guest/SetShippingAddressOnCartTest.php    |  12 +--
 .../Guest/SetShippingMethodsOnCartTest.php    |  14 +--
 .../Quote/Guest/UpdateCartItemsTest.php       |  16 +--
 .../GraphQl/SendFriend/SendFriendTest.php     |  10 +-
 .../TestModule/GraphQlMutationTest.php        |   2 +-
 .../GraphQl/TestModule/GraphQlQueryTest.php   |  22 ++++
 .../Ups/SetUpsShippingMethodsOnCartTest.php   |   2 +-
 .../Vault/CustomerPaymentTokensTest.php       |   6 +-
 .../Controller/GraphQlControllerTest.php      | 102 +++++++++---------
 .../Exception/GraphQlRequestException.php     |  54 ----------
 47 files changed, 450 insertions(+), 404 deletions(-)
 delete mode 100644 app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
 create mode 100644 app/code/Magento/GraphQl/Controller/HttpRequestValidator/ContentTypeValidator.php
 create mode 100644 app/code/Magento/GraphQl/Controller/HttpRequestValidator/HttpVerbValidator.php
 create mode 100644 app/code/Magento/GraphQl/Controller/HttpRequestValidatorInterface.php
 delete mode 100644 lib/internal/Magento/Framework/GraphQl/Exception/GraphQlRequestException.php

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index 6c37a5709a0bd..9e27ca5d608f0 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -12,7 +12,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\GraphQl\Exception\ExceptionFormatter;
-use Magento\Framework\GraphQl\Exception\GraphQlRequestException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\QueryProcessor;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
@@ -24,7 +24,6 @@
  * Front controller for web API GraphQL area.
  *
  * @api
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GraphQl implements FrontControllerInterface
 {
@@ -49,12 +48,12 @@ class GraphQl implements FrontControllerInterface
     private $queryProcessor;
 
     /**
-     * @var \Magento\Framework\GraphQl\Exception\ExceptionFormatter
+     * @var ExceptionFormatter
      */
     private $graphQlError;
 
     /**
-     * @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface
+     * @var ContextInterface
      */
     private $resolverContext;
 
@@ -73,8 +72,8 @@ class GraphQl implements FrontControllerInterface
      * @param SchemaGeneratorInterface $schemaGenerator
      * @param SerializerInterface $jsonSerializer
      * @param QueryProcessor $queryProcessor
-     * @param \Magento\Framework\GraphQl\Exception\ExceptionFormatter $graphQlError
-     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $resolverContext
+     * @param ExceptionFormatter $graphQlError
+     * @param ContextInterface $resolverContext
      * @param HttpRequestProcessor $requestProcessor
      * @param QueryFields $queryFields
      */
@@ -109,30 +108,24 @@ public function dispatch(RequestInterface $request) : ResponseInterface
         $statusCode = 200;
         try {
             /** @var Http $request */
-            if ($this->isHttpVerbValid($request)) {
-                $this->requestProcessor->processHeaders($request);
-                $data = $this->getDataFromRequest($request);
-                $query = isset($data['query']) ? $data['query'] : '';
-                $variables = isset($data['variables']) ? $data['variables'] : null;
-
-                // We must extract queried field names to avoid instantiation of unnecessary fields in webonyx schema
-                // Temporal coupling is required for performance optimization
-                $this->queryFields->setQuery($query, $variables);
-                $schema = $this->schemaGenerator->generate();
-
-                $result = $this->queryProcessor->process(
-                    $schema,
-                    $query,
-                    $this->resolverContext,
-                    isset($data['variables']) ? $data['variables'] : []
-                );
-            } else {
-                $errorMessage = __('Mutation requests allowed only for POST requests');
-                $result['errors'] = [
-                    $this->graphQlError->create(new GraphQlRequestException($errorMessage))
-                ];
-                $statusCode = ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS;
-            }
+            $this->requestProcessor->validateRequest($request);
+            $this->requestProcessor->processHeaders($request);
+
+            $data = $this->getDataFromRequest($request);
+            $query = $data['query'] ?? '';
+            $variables = $data['variables'] ?? null;
+
+            // We must extract queried field names to avoid instantiation of unnecessary fields in webonyx schema
+            // Temporal coupling is required for performance optimization
+            $this->queryFields->setQuery($query, $variables);
+            $schema = $this->schemaGenerator->generate();
+
+            $result = $this->queryProcessor->process(
+                $schema,
+                $query,
+                $this->resolverContext,
+                $data['variables'] ?? []
+            );
         } catch (\Exception $error) {
             $result['errors'] = isset($result) && isset($result['errors']) ? $result['errors'] : [];
             $result['errors'][] = $this->graphQlError->create($error);
@@ -148,37 +141,22 @@ public function dispatch(RequestInterface $request) : ResponseInterface
     /**
      * Get data from request body or query string
      *
-     * @param Http $request
+     * @param RequestInterface $request
      * @return array
      */
-    private function getDataFromRequest(Http $request) : array
+    private function getDataFromRequest(RequestInterface $request) : array
     {
+        /** @var Http $request */
         if ($request->isPost()) {
             $data = $this->jsonSerializer->unserialize($request->getContent());
-        } else {
+        } elseif ($request->isGet()) {
             $data = $request->getParams();
             $data['variables'] = isset($data['variables']) ?
                 $this->jsonSerializer->unserialize($data['variables']) : null;
+        } else {
+            return [];
         }
 
         return $data;
     }
-
-    /**
-     * Check if request is using correct verb for query or mutation
-     *
-     * @param Http $request
-     * @return boolean
-     */
-    private function isHttpVerbValid(Http $request)
-    {
-        $requestData = $this->getDataFromRequest($request);
-        $query = $requestData['query'] ?? '';
-
-        // The easiest way to determine mutations without additional parsing
-        if ($request->isSafeMethod() && strpos(trim($query), 'mutation') === 0) {
-            return false;
-        }
-        return true;
-    }
 }
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
deleted file mode 100644
index 54d75eeae906a..0000000000000
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Controller\HttpHeaderProcessor;
-
-use Magento\Framework\App\HttpRequestInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
-
-/**
- * Processes the "Content-Type" header entry
- */
-class ContentTypeProcessor implements HttpHeaderProcessorInterface
-{
-    /**
-     * Handle the mandatory application/json header
-     *
-     * @param string $headerValue
-     * @param HttpRequestInterface $request
-     * @return void
-     * @throws LocalizedException
-     */
-    public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void
-    {
-        if ($request->isPost()
-            && (!$headerValue || strpos($headerValue, 'application/json') === false)
-        ) {
-            throw new LocalizedException(
-                new \Magento\Framework\Phrase('Request content type must be application/json')
-            );
-        }
-    }
-}
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
index c6121ac4b290f..246ad15379f85 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
@@ -36,12 +36,10 @@ public function __construct(StoreManagerInterface $storeManager)
      * Handle the value of the store and set the scope
      *
      * @param string $headerValue
-     * @param HttpRequestInterface $request
      * @return void
      * @throws GraphQlInputException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void
+    public function processHeaderValue(string $headerValue) : void
     {
         if ($headerValue) {
             $storeCode = ltrim(rtrim($headerValue));
diff --git a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php
index b38b96714eab2..a20f88a4ef995 100644
--- a/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php
+++ b/app/code/Magento/GraphQl/Controller/HttpHeaderProcessorInterface.php
@@ -7,8 +7,6 @@
 
 namespace Magento\GraphQl\Controller;
 
-use Magento\Framework\App\HttpRequestInterface;
-
 /**
  * Use this interface to implement a processor for each entry of a header in an HTTP GraphQL request.
  */
@@ -21,8 +19,7 @@ interface HttpHeaderProcessorInterface
      * to enforce required headers like "application/json"
      *
      * @param string $headerValue
-     * @param HttpRequestInterface $request
      * @return void
      */
-    public function processHeaderValue(string $headerValue, HttpRequestInterface $request) : void;
+    public function processHeaderValue(string $headerValue) : void;
 }
diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php b/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
index 5d1c970a358a3..bb29f1fa68af9 100644
--- a/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
+++ b/app/code/Magento/GraphQl/Controller/HttpRequestProcessor.php
@@ -19,12 +19,19 @@ class HttpRequestProcessor
      */
     private $headerProcessors = [];
 
+    /**
+     * @var HttpRequestValidatorInterface[] array
+     */
+    private $requestValidators = [];
+
     /**
      * @param HttpHeaderProcessorInterface[] $graphQlHeaders
+     * @param HttpRequestValidatorInterface[] $requestValidators
      */
-    public function __construct(array $graphQlHeaders = [])
+    public function __construct(array $graphQlHeaders = [], array $requestValidators = [])
     {
         $this->headerProcessors = $graphQlHeaders;
+        $this->requestValidators = $requestValidators;
     }
 
     /**
@@ -36,7 +43,20 @@ public function __construct(array $graphQlHeaders = [])
     public function processHeaders(Http $request) : void
     {
         foreach ($this->headerProcessors as $headerName => $headerClass) {
-            $headerClass->processHeaderValue((string)$request->getHeader($headerName), $request);
+            $headerClass->processHeaderValue((string)$request->getHeader($headerName));
+        }
+    }
+
+    /**
+     * Validate HTTP request
+     *
+     * @param Http $request
+     * @return void
+     */
+    public function validateRequest(Http $request) : void
+    {
+        foreach ($this->requestValidators as $requestValidator) {
+            $requestValidator->validate($request);
         }
     }
 }
diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestValidator/ContentTypeValidator.php b/app/code/Magento/GraphQl/Controller/HttpRequestValidator/ContentTypeValidator.php
new file mode 100644
index 0000000000000..555048aac6771
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpRequestValidator/ContentTypeValidator.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Controller\HttpRequestValidator;
+
+use Magento\Framework\App\HttpRequestInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\GraphQl\Controller\HttpRequestValidatorInterface;
+
+/**
+ * Processes the "Content-Type" header entry
+ */
+class ContentTypeValidator implements HttpRequestValidatorInterface
+{
+    /**
+     * Handle the mandatory application/json header
+     *
+     * @param HttpRequestInterface $request
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validate(HttpRequestInterface $request) : void
+    {
+        $headerName = 'Content-Type';
+        $requiredHeaderValue = 'application/json';
+
+        $headerValue = (string)$request->getHeader($headerName);
+        if ($request->isPost()
+            && strpos($headerValue, $requiredHeaderValue) === false
+        ) {
+            throw new GraphQlInputException(
+                new \Magento\Framework\Phrase('Request content type must be application/json')
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestValidator/HttpVerbValidator.php b/app/code/Magento/GraphQl/Controller/HttpRequestValidator/HttpVerbValidator.php
new file mode 100644
index 0000000000000..300b3d4f44dca
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpRequestValidator/HttpVerbValidator.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Controller\HttpRequestValidator;
+
+use Magento\Framework\App\HttpRequestInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\App\Request\Http;
+use Magento\GraphQl\Controller\HttpRequestValidatorInterface;
+
+/**
+ * Validator to check HTTP verb for Graphql requests
+ */
+class HttpVerbValidator implements HttpRequestValidatorInterface
+{
+    /**
+     * Check if request is using correct verb for query or mutation
+     *
+     * @param HttpRequestInterface $request
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validate(HttpRequestInterface $request) : void
+    {
+        /** @var Http $request */
+        if (false === $request->isPost()) {
+            $query = $request->getParam('query', '');
+            // The easiest way to determine mutations without additional parsing
+            if (strpos(trim($query), 'mutation') === 0) {
+                throw new GraphQlInputException(
+                    new \Magento\Framework\Phrase('Mutation requests allowed only for POST requests')
+                );
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestValidatorInterface.php b/app/code/Magento/GraphQl/Controller/HttpRequestValidatorInterface.php
new file mode 100644
index 0000000000000..c0873b0caff89
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpRequestValidatorInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Controller;
+
+use Magento\Framework\App\HttpRequestInterface;
+
+/**
+ * Use this interface to implement a validator for a Graphql HTTP requests
+ */
+interface HttpRequestValidatorInterface
+{
+    /**
+     * Perform validation of request
+     *
+     * @param HttpRequestInterface $request
+     * @return void
+     */
+    public function validate(HttpRequestInterface $request) : void;
+}
diff --git a/app/code/Magento/GraphQl/etc/graphql/di.xml b/app/code/Magento/GraphQl/etc/graphql/di.xml
index f4e6ca59364b2..b4f0113f58776 100644
--- a/app/code/Magento/GraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/GraphQl/etc/graphql/di.xml
@@ -28,9 +28,12 @@
     <type name="Magento\GraphQl\Controller\HttpRequestProcessor">
         <arguments>
             <argument name="graphQlHeaders" xsi:type="array">
-                <item name="Content-Type" xsi:type="object">Magento\GraphQl\Controller\HttpHeaderProcessor\ContentTypeProcessor</item>
                 <item name="Store" xsi:type="object">Magento\GraphQl\Controller\HttpHeaderProcessor\StoreProcessor</item>
             </argument>
+            <argument name="requestValidators" xsi:type="array">
+                <item name="ContentTypeValidator" xsi:type="object">Magento\GraphQl\Controller\HttpRequestValidator\ContentTypeValidator</item>
+                <item name="VerbValidator" xsi:type="object">Magento\GraphQl\Controller\HttpRequestValidator\HttpVerbValidator</item>
+            </argument>
         </arguments>
     </type>
 </config>
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 6ace9b557ff9f..5eea3be840ae5 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
@@ -51,7 +51,7 @@ public function __construct(
      * @return array|string|int|float|bool
      * @throws \Exception
      */
-    public function postQuery(string $query, array $variables = [], string $operationName = '', array $headers = [])
+    public function post(string $query, array $variables = [], string $operationName = '', array $headers = [])
     {
         $url = $this->getEndpointUrl();
         $headers = array_merge($headers, ['Accept: application/json', 'Content-Type: application/json']);
@@ -63,19 +63,7 @@ public function postQuery(string $query, array $variables = [], string $operatio
         $postData = $this->json->jsonEncode($requestArray);
 
         $responseBody = $this->curlClient->post($url, $postData, $headers);
-        $responseBodyArray = $this->json->jsonDecode($responseBody);
-
-        if (!is_array($responseBodyArray)) {
-            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
-        }
-
-        $this->processErrors($responseBodyArray);
-
-        if (!isset($responseBodyArray['data'])) {
-            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
-        } else {
-            return $responseBodyArray['data'];
-        }
+        return $this->processResponse($responseBody);
     }
 
     /**
@@ -88,7 +76,7 @@ public function postQuery(string $query, array $variables = [], string $operatio
      * @return mixed
      * @throws \Exception
      */
-    public function getQuery(string $query, array $variables = [], string $operationName = '', array $headers = [])
+    public function get(string $query, array $variables = [], string $operationName = '', array $headers = [])
     {
         $url = $this->getEndpointUrl();
         $requestArray = [
@@ -98,19 +86,31 @@ public function getQuery(string $query, array $variables = [], string $operation
         ];
 
         $responseBody = $this->curlClient->get($url, $requestArray, $headers);
-        $responseBodyArray = $this->json->jsonDecode($responseBody);
+        return $this->processResponse($responseBody);
+    }
+
+    /**
+     * Process response from GraphQl server
+     *
+     * @param string $response
+     * @return mixed
+     * @throws \Exception
+     */
+    private function processResponse(string $response)
+    {
+        $responseArray = $this->json->jsonDecode($response);
 
-        if (!is_array($responseBodyArray)) {
-            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
+        if (!is_array($responseArray)) {
+            throw new \Exception('Unknown GraphQL response body: ' . $response);
         }
 
-        $this->processErrors($responseBodyArray);
+        $this->processErrors($responseArray);
 
-        if (!isset($responseBodyArray['data'])) {
-            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
-        } else {
-            return $responseBodyArray['data'];
+        if (!isset($responseArray['data'])) {
+            throw new \Exception('Unknown GraphQL response body: ' . $response);
         }
+
+        return $responseArray['data'];
     }
 
     /**
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
index d1a6356d78fba..8abd97b4b744d 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -28,14 +28,13 @@ abstract class GraphQlAbstract extends WebapiAbstract
     private $appCache;
 
     /**
-     * Perform GraphQL call to the system under test.
+     * Perform GraphQL query call via GET to the system under test.
      *
      * @see \Magento\TestFramework\TestCase\GraphQl\Client::call()
      * @param string $query
      * @param array $variables
      * @param string $operationName
      * @param array $headers
-     * @param string $requestType
      * @return array|int|string|float|bool GraphQL call results
      * @throws \Exception
      */
@@ -43,28 +42,39 @@ public function graphQlQuery(
         string $query,
         array $variables = [],
         string $operationName = '',
-        array $headers = [],
-        string $requestType = Http::METHOD_POST
+        array $headers = []
     ) {
-        if ($requestType === Http::METHOD_POST) {
-            $response = $this->getGraphQlClient()->postQuery(
-                $query,
-                $variables,
-                $operationName,
-                $this->composeHeaders($headers)
-            );
-        } elseif ($requestType === Http::METHOD_GET) {
-            $response = $this->getGraphQlClient()->getQuery(
-                $query,
-                $variables,
-                $operationName,
-                $this->composeHeaders($headers)
-            );
-        } else {
-            throw new \Exception("Unsupported request type");
-        }
+        return $this->getGraphQlClient()->get(
+            $query,
+            $variables,
+            $operationName,
+            $this->composeHeaders($headers)
+        );
+    }
 
-        return $response;
+    /**
+     * Perform GraphQL mutations call via POST to the system under test.
+     *
+     * @see \Magento\TestFramework\TestCase\GraphQl\Client::call()
+     * @param string $query
+     * @param array $variables
+     * @param string $operationName
+     * @param array $headers
+     * @return array|int|string|float|bool GraphQL call results
+     * @throws \Exception
+     */
+    public function graphQlMutation(
+        string $query,
+        array $variables = [],
+        string $operationName = '',
+        array $headers = []
+    ) {
+        return $this->getGraphQlClient()->post(
+            $query,
+            $variables,
+            $operationName,
+            $this->composeHeaders($headers)
+        );
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
index 17c2af8dc59d0..0e7ada49dfd38 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -54,7 +54,7 @@ public function testAddProductIfQuantityIsNotAvailable()
 
         $maskedQuoteId = $this->getMaskedQuoteId();
         $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
         self::fail('Should be "The requested qty is not available" error message.');
     }
 
@@ -74,7 +74,7 @@ public function testAddMoreProductsThatAllowed()
 
         $maskedQuoteId = $this->getMaskedQuoteId();
         $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
         self::fail('Should be "The most you may purchase is 5." error message.');
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
index 84c111bd25fd4..d147229f55a2d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
@@ -50,7 +50,7 @@ public function testChangePassword()
         $query = $this->getChangePassQuery($oldCustomerPassword, $newCustomerPassword);
         $headerMap = $this->getCustomerAuthHeaders($customerEmail, $oldCustomerPassword);
 
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $response = $this->graphQlMutation($query, [], '', $headerMap);
         $this->assertEquals($customerEmail, $response['changeCustomerPassword']['email']);
 
         try {
@@ -69,7 +69,7 @@ public function testChangePassword()
     public function testChangePasswordIfUserIsNotAuthorizedTest()
     {
         $query = $this->getChangePassQuery('currentpassword', 'newpassword');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -87,7 +87,7 @@ public function testChangeWeakPassword()
         $this->expectException(\Exception::class);
         $this->expectExceptionMessageRegExp('/Minimum of different classes of characters in password is.*/');
 
-        $this->graphQlQuery($query, [], '', $headerMap);
+        $this->graphQlMutation($query, [], '', $headerMap);
     }
 
     /**
@@ -105,7 +105,7 @@ public function testChangePasswordIfPasswordIsInvalid()
         $query = $this->getChangePassQuery($incorrectPassword, $newCustomerPassword);
 
         $headerMap = $this->getCustomerAuthHeaders($customerEmail, $oldCustomerPassword);
-        $this->graphQlQuery($query, [], '', $headerMap);
+        $this->graphQlMutation($query, [], '', $headerMap);
     }
 
     private function getChangePassQuery($currentPassword, $newPassword)
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 602d969924fbd..5019bd0f50c80 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -117,7 +117,7 @@ public function testCreateCustomerAddress()
         $userName = 'customer@example.com';
         $password = 'password';
 
-        $response = $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
         $this->assertArrayHasKey('createCustomerAddress', $response);
         $this->assertArrayHasKey('customer_id', $response['createCustomerAddress']);
         $this->assertEquals($customerId, $response['createCustomerAddress']['customer_id']);
@@ -158,7 +158,7 @@ public function testCreateCustomerAddressIfUserIsNotAuthorized()
   }
 }
 MUTATION;
-        $this->graphQlQuery($mutation);
+        $this->graphQlMutation($mutation);
     }
 
     /**
@@ -195,7 +195,7 @@ public function testCreateCustomerAddressWithMissingAttribute()
 
         $userName = 'customer@example.com';
         $password = 'password';
-        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
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 388028c4ca750..fc51f57a83a76 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -66,7 +66,7 @@ public function testCreateCustomerAccountWithPassword()
     }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
         $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
@@ -103,7 +103,7 @@ public function testCreateCustomerAccountWithoutPassword()
     }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
         $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
@@ -134,7 +134,7 @@ public function testCreateCustomerIfInputDataIsEmpty()
     }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -167,7 +167,7 @@ public function testCreateCustomerIfEmailMissed()
     }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -202,7 +202,7 @@ public function testCreateCustomerIfEmailIsNotValid()
     }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -238,7 +238,7 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
     }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     public function tearDown()
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 1153b9662b41a..c25d8a7183514 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
@@ -55,7 +55,7 @@ public function testDeleteCustomerAddress()
   deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
-        $response = $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
         $this->assertArrayHasKey('deleteCustomerAddress', $response);
         $this->assertEquals(true, $response['deleteCustomerAddress']);
     }
@@ -73,7 +73,7 @@ public function testDeleteCustomerAddressIfUserIsNotAuthorized()
   deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
-        $this->graphQlQuery($mutation);
+        $this->graphQlMutation($mutation);
     }
 
     /**
@@ -99,7 +99,7 @@ public function testDeleteDefaultShippingCustomerAddress()
   deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
-        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
@@ -125,7 +125,7 @@ public function testDeleteDefaultBillingCustomerAddress()
   deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
-        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
@@ -144,7 +144,7 @@ public function testDeleteNonExistCustomerAddress()
   deleteCustomerAddress(id: 9999)
 }
 MUTATION;
-        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php
index ae28e23a28bf1..88eaeaa8f9dd5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php
@@ -38,7 +38,7 @@ public function testGenerateCustomerValidToken()
 }
 MUTATION;
 
-        $response = $this->graphQlQuery($mutation);
+        $response = $this->graphQlMutation($mutation);
         $this->assertArrayHasKey('generateCustomerToken', $response);
         $this->assertInternalType('array', $response['generateCustomerToken']);
     }
@@ -66,6 +66,6 @@ public function testGenerateCustomerTokenWithInvalidCredentials()
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('GraphQL response contains errors: The account sign-in' . ' ' .
             'was incorrect or your account is disabled temporarily. Please wait and try again later.');
-        $this->graphQlQuery($mutation);
+        $this->graphQlMutation($mutation);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php
index 9bdbf3059eeaf..fc0c02bae5508 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php
@@ -36,7 +36,7 @@ public function testRevokeCustomerTokenValidCredentials()
         $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
 
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $response = $this->graphQlMutation($query, [], '', $headerMap);
         $this->assertTrue($response['revokeCustomerToken']['result']);
     }
 
@@ -53,6 +53,6 @@ public function testRevokeCustomerTokenForGuestCustomer()
                 }
             }
 QUERY;
-        $this->graphQlQuery($query, [], '');
+        $this->graphQlMutation($query, [], '');
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
index 191ea1ae6b877..6d9782dae87d4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
@@ -88,7 +88,12 @@ public function testChangeSubscriptionStatusTest()
     }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
+        );
         $this->assertTrue($response['updateCustomer']['customer']['is_subscribed']);
     }
 
@@ -111,7 +116,7 @@ public function testChangeSubscriptionStatuIfUserIsNotAuthorizedTest()
     }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
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..bfb07ccf4149c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -128,7 +128,7 @@ public function testUpdateCustomerAddress()
 }
 MUTATION;
 
-        $response = $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
         $this->assertArrayHasKey('updateCustomerAddress', $response);
         $this->assertArrayHasKey('customer_id', $response['updateCustomerAddress']);
         $this->assertEquals($customerId, $response['updateCustomerAddress']['customer_id']);
@@ -158,7 +158,7 @@ public function testUpdateCustomerAddressIfUserIsNotAuthorized()
   }
 }
 MUTATION;
-        $this->graphQlQuery($mutation);
+        $this->graphQlMutation($mutation);
     }
 
     /**
@@ -187,7 +187,7 @@ public function testUpdateCustomerAddressWithMissingAttribute()
   }
 }
 MUTATION;
-        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
index df45e1de771d9..53c20ad898505 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
@@ -87,7 +87,7 @@ public function testUpdateCustomer()
     }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $response = $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
 
         $this->assertEquals($newPrefix, $response['updateCustomer']['customer']['prefix']);
         $this->assertEquals($newFirstname, $response['updateCustomer']['customer']['firstname']);
@@ -123,7 +123,7 @@ public function testUpdateCustomerIfInputDataIsEmpty()
     }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
     }
 
     /**
@@ -147,7 +147,7 @@ public function testUpdateCustomerIfUserIsNotAuthorized()
     }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -176,7 +176,7 @@ public function testUpdateCustomerIfAccountIsLocked()
     }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
     }
 
     /**
@@ -203,7 +203,7 @@ public function testUpdateEmailIfPasswordIsMissed()
     }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
     }
 
     /**
@@ -232,7 +232,7 @@ public function testUpdateEmailIfPasswordIsInvalid()
     }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
     }
 
     /**
@@ -260,7 +260,7 @@ public function testUpdateEmailIfEmailAlreadyExists()
     }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php
index b3f16c8734203..d8df8db800d8c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php
@@ -54,7 +54,7 @@ public function testAddConfigurableProductToCart()
 
         $query = $this->getAddConfigurableProductMutationQuery($maskedQuoteId, $variantSku, $qty);
 
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
         $cartItems = $response['addConfigurableProductsToCart']['cart']['items'];
         self::assertEquals($qty, $cartItems[0]['qty']);
         self::assertEquals($variantSku, $cartItems[0]['product']['sku']);
@@ -74,7 +74,7 @@ public function testAddProductIfQuantityIsNotAvailable()
         $maskedQuoteId = $this->getMaskedQuoteId();
         $query = $this->getAddConfigurableProductMutationQuery($maskedQuoteId, $variantSku, $qty);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -90,7 +90,7 @@ public function testAddOutOfStockProduct()
         $maskedQuoteId = $this->getMaskedQuoteId();
         $query = $this->getAddConfigurableProductMutationQuery($maskedQuoteId, $variantSku, $qty);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
index d9ab8db62a195..4334a3d6785d6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
@@ -52,7 +52,7 @@ public function testAddSimpleProductToCart()
         $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
         self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
 
         self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][0]['qty']);
@@ -72,7 +72,7 @@ public function testAddSimpleProductToCartWithNegativeQty()
         $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -158,6 +158,6 @@ public function testAddProductWithWrongCartHash()
 }
 QUERY;
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
index 828784ca27885..2f0fc7cc04bc9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
@@ -56,7 +56,7 @@ public function testApplyCouponToGuestCartWithItems()
         );
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('applyCouponToCart', $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
@@ -77,13 +77,13 @@ public function testApplyCouponTwice()
         );
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey("applyCouponToCart", $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
 
         self::expectExceptionMessage('A coupon is already applied to the cart. Please remove it to apply another');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -100,7 +100,7 @@ public function testApplyCouponToCartWithNoItems()
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -123,7 +123,7 @@ public function testGuestCustomerAttemptToChangeCustomerCart()
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -147,11 +147,11 @@ public function testRemoveCoupon()
             'reserved_order_id'
         );
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
 
         /* Remove coupon from quote */
         $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('removeCouponFromCart', $response);
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
@@ -180,7 +180,7 @@ public function testRemoveCouponFromCustomerCartByGuest()
         $query = $this->prepareRemoveCouponRequestQuery($maskedQuoteId);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
index 0cb8a38b0cb5e..0091354a6ee65 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
@@ -48,7 +48,7 @@ public function testCreateEmptyCart()
         $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
 
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $response = $this->graphQlMutation($query, [], '', $headerMap);
 
         self::assertArrayHasKey('createEmptyCart', $response);
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
index e80a2127ad420..468f0d34a14dd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -66,7 +66,7 @@ public function testRemoveItemFromCart()
         $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $itemId);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         $this->assertArrayHasKey('removeItemFromCart', $response);
         $this->assertArrayHasKey('cart', $response['removeItemFromCart']);
@@ -81,7 +81,7 @@ public function testRemoveItemFromCart()
     public function testRemoveItemFromNonExistentCart()
     {
         $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -97,7 +97,7 @@ public function testRemoveNonExistentItem()
         $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $notExistentItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -125,7 +125,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
         $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
 
         $query = $this->prepareMutationQuery($firstQuoteMaskedId, $secondQuoteItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -150,7 +150,7 @@ public function testRemoveItemFromGuestCart()
         );
 
         $query = $this->prepareMutationQuery($guestQuoteMaskedId, $guestQuoteItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -179,7 +179,7 @@ public function testRemoveItemFromAnotherCustomerCart()
         );
 
         $query = $this->prepareMutationQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -206,7 +206,7 @@ public function testUpdateWithMissedItemRequiredParameters(string $input, string
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 88e7b93dd1d08..94e347cd46f08 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -105,7 +105,7 @@ public function testSetNewBillingAddress()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
         $cartResponse = $response['setBillingAddressOnCart']['cart'];
@@ -179,7 +179,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
         $cartResponse = $response['setBillingAddressOnCart']['cart'];
@@ -230,7 +230,7 @@ public function testSetBillingAddressFromAddressBook()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
         $cartResponse = $response['setBillingAddressOnCart']['cart'];
@@ -270,7 +270,7 @@ public function testSetNotExistedBillingAddressFromAddressBook()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -318,7 +318,7 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
         self::expectExceptionMessage(
             'The billing address cannot contain "customer_address_id" and "address" at the same time.'
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -355,7 +355,7 @@ public function testSetBillingAddressToGuestCart()
             "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
         );
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -390,7 +390,7 @@ public function testSetBillingAddressToAnotherCustomerCart()
             "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
         );
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer@search.example.com'));
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer@search.example.com'));
     }
 
     /**
@@ -424,7 +424,7 @@ public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
@@ -454,7 +454,7 @@ public function testSetBillingAddressOnNonExistentCart()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -490,7 +490,7 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
 QUERY;
 
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
index bd147cc4a197e..baa929768527d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetOfflineShippingMethodsOnCartTest.php
@@ -72,7 +72,7 @@ public function testSetOfflineShippingMethod(string $carrierCode, string $method
             $carrierCode,
             $quoteAddressId
         );
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('setShippingMethodsOnCart', $response);
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index 98eded8300665..189a470bfac78 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -52,7 +52,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
         self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
@@ -75,7 +75,7 @@ public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -90,7 +90,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
         self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
@@ -114,7 +114,7 @@ public function testSetNonExistentPaymentMethod()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -129,7 +129,7 @@ public function testSetPaymentOnNonExistentCart()
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -149,7 +149,7 @@ public function testSetPaymentMethodToGuestCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -169,7 +169,7 @@ public function testSetPaymentMethodToAnotherCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
@@ -201,7 +201,7 @@ public function testSetPaymentMethodWithoutRequiredParameters(string $input, str
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -240,7 +240,7 @@ public function testReSetPayment()
 
         $methodCode = Cashondelivery::PAYMENT_METHOD_CASHONDELIVERY_CODE;
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
         self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 5ff29d20b34d7..70db0d1e66a54 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -107,7 +107,7 @@ public function testSetNewShippingAddressOnCartWithSimpleProduct()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
         $cartResponse = $response['setShippingAddressesOnCart']['cart'];
@@ -160,7 +160,7 @@ public function testSetNewShippingAddressOnCartWithVirtualProduct()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -200,7 +200,7 @@ public function testSetShippingAddressFromAddressBook()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
         $cartResponse = $response['setShippingAddressesOnCart']['cart'];
@@ -242,7 +242,7 @@ public function testSetNonExistentShippingAddressFromAddressBook()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -291,7 +291,7 @@ public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
         self::expectExceptionMessage(
             'The shipping address cannot contain "customer_address_id" and "address" at the same time.'
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -328,7 +328,7 @@ public function testSetShippingAddressIfCustomerIsNotOwnerOfAddress()
 }
 QUERY;
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
@@ -366,7 +366,7 @@ public function testSetShippingAddressToAnotherCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
@@ -405,7 +405,7 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -483,7 +483,7 @@ public function testSetMultipleNewShippingAddresses()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 29ddbefd8e405..4e048c7502639 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -66,7 +66,7 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
             $carrierCode,
             $quoteAddressId
         );
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('setShippingMethodsOnCart', $response);
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
@@ -105,7 +105,7 @@ public function testReSetShippingMethod()
             $carrierCode,
             $quoteAddressId
         );
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('setShippingMethodsOnCart', $response);
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
@@ -156,7 +156,7 @@ public function testSetShippingMethodWithWrongParameters(string $input, string $
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -296,7 +296,7 @@ public function testSetMultipleShippingMethods()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -325,7 +325,7 @@ public function testSetShippingMethodToGuestCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -354,7 +354,7 @@ public function testSetShippingMethodToAnotherCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
     /**
@@ -382,7 +382,7 @@ public function testSetShippingMethodIfCustomerIsNotOwnerOfAddress()
         $this->expectExceptionMessage(
             "Cart does not contain address with ID \"{$anotherQuoteAddressId}\""
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
index 74e7aa8b5d0a4..35e2d62214fb2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
@@ -67,7 +67,7 @@ public function testUpdateCartItemQty()
         $qty = 2;
 
         $query = $this->getQuery($maskedQuoteId, $itemId, $qty);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         $this->assertArrayHasKey('updateCartItems', $response);
         $this->assertArrayHasKey('cart', $response['updateCartItems']);
@@ -91,7 +91,7 @@ public function testRemoveCartItemIfQuantityIsZero()
         $qty = 0;
 
         $query = $this->getQuery($maskedQuoteId, $itemId, $qty);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         $this->assertArrayHasKey('updateCartItems', $response);
         $this->assertArrayHasKey('cart', $response['updateCartItems']);
@@ -108,7 +108,7 @@ public function testRemoveCartItemIfQuantityIsZero()
     public function testUpdateItemInNonExistentCart()
     {
         $query = $this->getQuery('non_existent_masked_id', 1, 2);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -124,7 +124,7 @@ public function testUpdateNonExistentItem()
         $this->expectExceptionMessage("Could not find cart item with id: {$notExistentItemId}.");
 
         $query = $this->getQuery($maskedQuoteId, $notExistentItemId, 2);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -152,7 +152,7 @@ public function testUpdateItemIfItemIsNotBelongToCart()
         $this->expectExceptionMessage("Could not find cart item with id: {$secondQuoteItemId}.");
 
         $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId, 2);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -177,7 +177,7 @@ public function testUpdateItemInGuestCart()
         );
 
         $query = $this->getQuery($guestQuoteMaskedId, $guestQuoteItemId, 2);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -206,7 +206,7 @@ public function testUpdateItemInAnotherCustomerCart()
         );
 
         $query = $this->getQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId, 2);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -235,7 +235,7 @@ public function testUpdateWithMissedCartItemId()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -266,7 +266,7 @@ public function testUpdateWithMissedItemRequiredParameters(string $input, string
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
index 4fd398439913e..c74eb3d06f6ff 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
@@ -34,7 +34,7 @@ public function testCreateEmptyCart()
   createEmptyCart
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('createEmptyCart', $response);
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
index a306b29e51197..cfb041b4d797e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
@@ -59,7 +59,7 @@ public function testRemoveItemFromCart()
         $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $itemId);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         $this->assertArrayHasKey('removeItemFromCart', $response);
         $this->assertArrayHasKey('cart', $response['removeItemFromCart']);
@@ -73,7 +73,7 @@ public function testRemoveItemFromCart()
     public function testRemoveItemFromNonExistentCart()
     {
         $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -89,7 +89,7 @@ public function testRemoveNonExistentItem()
         $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
 
         $query = $this->prepareMutationQuery($maskedQuoteId, $notExistentItemId);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -117,7 +117,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
         $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
 
         $query = $this->prepareMutationQuery($firstQuoteMaskedId, $secondQuoteItemId);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -135,7 +135,7 @@ public function testRemoveItemFromCustomerCart()
         $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
 
         $query = $this->prepareMutationQuery($customerQuoteMaskedId, $customerQuoteItemId);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -161,7 +161,7 @@ public function testUpdateWithMissedItemRequiredParameters(string $input, string
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index ae0a1a0e822ac..c6572e9898c3d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -76,7 +76,7 @@ public function testSetNewBillingAddress()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
         $cartResponse = $response['setBillingAddressOnCart']['cart'];
@@ -149,7 +149,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
         $cartResponse = $response['setBillingAddressOnCart']['cart'];
@@ -203,7 +203,7 @@ public function testSetBillingAddressToCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -237,7 +237,7 @@ public function testSetBillingAddressFromAddressBook()
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -276,7 +276,7 @@ public function testSetBillingAddressOnNonExistentCart()
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -310,7 +310,7 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
index 8ed9ef84d6fbd..264cacda31375 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetOfflineShippingMethodsOnCartTest.php
@@ -64,7 +64,7 @@ public function testSetOfflineShippingMethod(string $carrierCode, string $method
             $carrierCode,
             $quoteAddressId
         );
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('setShippingMethodsOnCart', $response);
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index c9078fd84f6bc..f0e9d57f0f315 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -44,7 +44,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
         self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
@@ -66,7 +66,7 @@ public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -80,7 +80,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
         self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
@@ -103,7 +103,7 @@ public function testSetNonExistentPaymentMethod()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -116,7 +116,7 @@ public function testSetPaymentOnNonExistentCart()
         $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -137,7 +137,7 @@ public function testSetPaymentMethodToCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -169,7 +169,7 @@ public function testSetPaymentMethodWithoutRequiredParameters(string $input, str
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -207,7 +207,7 @@ public function testReSetPayment()
 
         $methodCode = Cashondelivery::PAYMENT_METHOD_CASHONDELIVERY_CODE;
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('setPaymentMethodOnCart', $response);
         self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index e21d9ed64d491..4c7dfe03a0b44 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -78,7 +78,7 @@ public function testSetNewShippingAddressOnCartWithSimpleProduct()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
         $cartResponse = $response['setShippingAddressesOnCart']['cart'];
@@ -130,7 +130,7 @@ public function testSetNewShippingAddressOnCartWithVirtualProduct()
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -166,7 +166,7 @@ public function testSetShippingAddressFromAddressBook()
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -205,7 +205,7 @@ public function testSetShippingAddressToCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -243,7 +243,7 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -320,7 +320,7 @@ public function testSetMultipleNewShippingAddresses()
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index ca26f8fe5aaf0..e8ca6131d2616 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -58,7 +58,7 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
             $carrierCode,
             $quoteAddressId
         );
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('setShippingMethodsOnCart', $response);
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
@@ -101,7 +101,7 @@ public function testSetShippingMethodOnCartWithSimpleProductAndWithoutAddress()
             $carrierCode,
             $quoteAddressId
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -125,7 +125,7 @@ public function testReSetShippingMethod()
             $carrierCode,
             $quoteAddressId
         );
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('setShippingMethodsOnCart', $response);
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
@@ -175,7 +175,7 @@ public function testSetShippingMethodWithWrongParameters(string $input, string $
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -314,7 +314,7 @@ public function testSetMultipleShippingMethods()
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -343,7 +343,7 @@ public function testSetShippingMethodToCustomerCart()
         $this->expectExceptionMessage(
             "The current user cannot perform operations on cart \"$maskedQuoteId\""
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -370,7 +370,7 @@ public function testSetShippingMethodIfGuestIsNotOwnerOfAddress()
         $this->expectExceptionMessage(
             "Cart does not contain address with ID \"{$anotherQuoteAddressId}\""
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
index fca7a4287620b..1b8cf2e1c57f7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
@@ -60,7 +60,7 @@ public function testUpdateCartItemQty()
         $qty = 2;
 
         $query = $this->getQuery($maskedQuoteId, $itemId, $qty);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         $this->assertArrayHasKey('updateCartItems', $response);
         $this->assertArrayHasKey('cart', $response['updateCartItems']);
@@ -84,7 +84,7 @@ public function testRemoveCartItemIfQuantityIsZero()
         $qty = 0;
 
         $query = $this->getQuery($maskedQuoteId, $itemId, $qty);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         $this->assertArrayHasKey('updateCartItems', $response);
         $this->assertArrayHasKey('cart', $response['updateCartItems']);
@@ -100,7 +100,7 @@ public function testRemoveCartItemIfQuantityIsZero()
     public function testUpdateItemInNonExistentCart()
     {
         $query = $this->getQuery('non_existent_masked_id', 1, 2);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -116,7 +116,7 @@ public function testUpdateNonExistentItem()
         $this->expectExceptionMessage("Could not find cart item with id: {$notExistentItemId}.");
 
         $query = $this->getQuery($maskedQuoteId, $notExistentItemId, 2);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -142,7 +142,7 @@ public function testUpdateItemIfItemIsNotBelongToCart()
         $this->expectExceptionMessage("Could not find cart item with id: {$secondQuoteItemId}.");
 
         $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId, 2);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -158,7 +158,7 @@ public function testUpdateItemFromCustomerCart()
         $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
 
         $query = $this->getQuery($customerQuoteMaskedId, $customerQuoteItemId, 2);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -186,7 +186,7 @@ public function testUpdateWithMissedCartItemId()
   }
 }
 QUERY;
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -217,7 +217,7 @@ public function testUpdateWithMissedItemRequiredParameters(string $input, string
 }
 QUERY;
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
index 05e3e608c5e52..b40a2b787fe81 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
@@ -66,7 +66,7 @@ public function testSendFriend()
 }
 QUERY;
 
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
         self::assertEquals('Name', $response['sendEmailToFriend']['sender']['name']);
         self::assertEquals('e@mail.com', $response['sendEmailToFriend']['sender']['email']);
         self::assertEquals('Lorem Ipsum', $response['sendEmailToFriend']['sender']['message']);
@@ -117,7 +117,7 @@ public function testSendWithoutExistProduct()
         $this->expectExceptionMessage(
             'The product that was requested doesn\'t exist. Verify the product and try again.'
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -181,7 +181,7 @@ public function testMaxSendEmailToFriend()
 QUERY;
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage("No more than {$sendFriend->getMaxRecipients()} emails can be sent at a time.");
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -214,7 +214,7 @@ public function testErrors(string $input, string $errorMessage)
 QUERY;
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage($errorMessage);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -270,7 +270,7 @@ public function testLimitMessagesPerHour()
         );
 
         for ($i = 0; $i <= $sendFriend->getMaxSendsToFriend() + 1; $i++) {
-            $this->graphQlQuery($query);
+            $this->graphQlMutation($query);
         }
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
index ef1dea1c18f54..35f408b255a84 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
@@ -28,7 +28,7 @@ public function testMutation()
 }
 MUTATION;
 
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
         $this->assertArrayHasKey('testItem', $response);
         $testItem = $response['testItem'];
         $this->assertArrayHasKey('integer_list', $testItem);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
index 690844222929f..fa3af0179d8ff 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
@@ -77,4 +77,26 @@ public function testQueryViaGetRequestReturnsResults()
 
         $this->assertArrayHasKey('testItem', $response);
     }
+
+    public function testQueryViaGetRequestWithVariablesReturnsResults()
+    {
+        $id = 1;
+
+        $query = <<<QUERY
+{
+    testItem(\$id: Int!)
+    {
+        item_id
+        name
+    }
+}
+QUERY;
+        $variables = [
+            "id" => $id
+        ];
+
+        $response = $this->graphQlQuery($query, $variables, '', [], 'GET');
+
+        $this->assertArrayHasKey('testItem', $response);
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index 463f2c4af101f..6861bb8dbb240 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -142,6 +142,6 @@ private function sendRequestWithToken(string $query): array
         $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
 
-        return $this->graphQlQuery($query, [], '', $headerMap);
+        return $this->graphQlMutation($query, [], '', $headerMap);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
index 89fbbb9c49ed3..97e86b9c6ac96 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
@@ -139,7 +139,7 @@ public function testDeletePaymentToken()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $response = $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
 
         $this->assertTrue($response['deletePaymentToken']['result']);
         $this->assertEquals(1, count($response['deletePaymentToken']['customerPaymentTokens']['items']));
@@ -168,7 +168,7 @@ public function testDeletePaymentTokenIfUserIsNotAuthorized()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '');
+        $this->graphQlMutation($query, [], '');
     }
 
     /**
@@ -190,7 +190,7 @@ public function testDeletePaymentTokenInvalidPublicHash()
   }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index 0f7dfa97e8e2e..2beeff64b4831 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -38,6 +38,9 @@ class GraphQlControllerTest extends \Magento\TestFramework\Indexer\TestCase
     /** @var MetadataPool */
     private $metadataPool;
 
+    /** @var Http */
+    private $request;
+
     public static function setUpBeforeClass()
     {
         $db = Bootstrap::getInstance()->getBootstrap()
@@ -57,6 +60,7 @@ protected function setUp() : void
         $this->graphql = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
         $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
         $this->metadataPool = $this->objectManager->get(MetadataPool::class);
+        $this->request = $this->objectManager->get(Http::class);
     }
 
     /**
@@ -86,28 +90,27 @@ public function testDispatch() : void
        }
 QUERY;
         $postData = [
-            'query'         => $query,
-            'variables'     => null,
+            'query' => $query,
+            'variables' => null,
             'operationName' => null
         ];
-        /** @var Http $request */
-        $request = $this->objectManager->get(Http::class);
-        $request->setPathInfo('/graphql');
-        $request->setMethod('POST');
-        $request->setContent(json_encode($postData));
+
+        $this->request->setPathInfo('/graphql');
+        $this->request->setMethod('POST');
+        $this->request->setContent(json_encode($postData));
         $headers = $this->objectManager->create(\Zend\Http\Headers::class)
             ->addHeaders(['Content-Type' => 'application/json']);
-        $request->setHeaders($headers);
-        $response = $this->graphql->dispatch($request);
+        $this->request->setHeaders($headers);
+        $response = $this->graphql->dispatch($this->request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
 
         $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
-        $this->assertTrue(!empty($output['data']['products']['items']), 'Products array has items');
-        $this->assertTrue(!empty($output['data']['products']['items'][0]), 'Products array has items');
-        $this->assertEquals($output['data']['products']['items'][0]['id'], $product->getData($linkField));
-        $this->assertEquals($output['data']['products']['items'][0]['sku'], $product->getSku());
-        $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
+        $this->assertNotEmpty($output['data']['products']['items'], 'Products array has items');
+        $this->assertNotEmpty($output['data']['products']['items'][0], 'Products array has items');
+        $this->assertEquals($product->getData($linkField), $output['data']['products']['items'][0]['id']);
+        $this->assertEquals($product->getSku(), $output['data']['products']['items'][0]['sku']);
+        $this->assertEquals($product->getName(), $output['data']['products']['items'][0]['name']);
     }
 
     /**
@@ -136,21 +139,20 @@ public function testDispatchWithGet() : void
            }
        }
 QUERY;
-        /** @var Http $request */
-        $request = $this->objectManager->get(Http::class);
-        $request->setPathInfo('/graphql');
-        $request->setMethod('GET');
-        $request->setQueryValue('query', $query);
-        $response = $this->graphql->dispatch($request);
+
+        $this->request->setPathInfo('/graphql');
+        $this->request->setMethod('GET');
+        $this->request->setQueryValue('query', $query);
+        $response = $this->graphql->dispatch($this->request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
 
         $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
-        $this->assertTrue(!empty($output['data']['products']['items']), 'Products array has items');
-        $this->assertTrue(!empty($output['data']['products']['items'][0]), 'Products array has items');
-        $this->assertEquals($output['data']['products']['items'][0]['id'], $product->getData($linkField));
-        $this->assertEquals($output['data']['products']['items'][0]['sku'], $product->getSku());
-        $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
+        $this->assertNotEmpty($output['data']['products']['items'], 'Products array has items');
+        $this->assertNotEmpty($output['data']['products']['items'][0], 'Products array has items');
+        $this->assertEquals($product->getData($linkField), $output['data']['products']['items'][0]['id']);
+        $this->assertEquals($product->getSku(), $output['data']['products']['items'][0]['sku']);
+        $this->assertEquals($product->getName(), $output['data']['products']['items'][0]['name']);
     }
 
     /** Test request is dispatched and response generated when using GET request with parameterized query string
@@ -177,32 +179,31 @@ public function testDispatchGetWithParameterizedVariables() : void
     }
 }
 QUERY;
+
         $variables = [
-            'filterInput'=>[
-                'sku' =>['eq' => 'simple1']
+            'filterInput' => [
+                'sku' => ['eq' => 'simple1']
             ]
         ];
         $queryParams = [
-            'query'         => $query,
-            'variables'     => json_encode($variables),
+            'query' => $query,
+            'variables' => json_encode($variables),
             'operationName' => 'GetProducts'
         ];
 
-        /** @var Http $request */
-        $request = $this->objectManager->get(Http::class);
-        $request->setPathInfo('/graphql');
-        $request->setMethod('GET');
-        $request->setParams($queryParams);
-        $response = $this->graphql->dispatch($request);
+        $this->request->setPathInfo('/graphql');
+        $this->request->setMethod('GET');
+        $this->request->setParams($queryParams);
+        $response = $this->graphql->dispatch($this->request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
 
         $this->assertArrayNotHasKey('errors', $output, 'Response has errors');
-        $this->assertTrue(!empty($output['data']['products']['items']), 'Products array has items');
-        $this->assertTrue(!empty($output['data']['products']['items'][0]), 'Products array has items');
-        $this->assertEquals($output['data']['products']['items'][0]['id'], $product->getData($linkField));
-        $this->assertEquals($output['data']['products']['items'][0]['sku'], $product->getSku());
-        $this->assertEquals($output['data']['products']['items'][0]['name'], $product->getName());
+        $this->assertNotEmpty($output['data']['products']['items'], 'Products array has items');
+        $this->assertNotEmpty($output['data']['products']['items'][0], 'Products array has items');
+        $this->assertEquals($product->getData($linkField), $output['data']['products']['items'][0]['id']);
+        $this->assertEquals($product->getSku(), $output['data']['products']['items'][0]['sku']);
+        $this->assertEquals($product->getName(), $output['data']['products']['items'][0]['name']);
     }
 
     /**
@@ -232,26 +233,25 @@ public function testError() : void
 QUERY;
 
         $postData = [
-            'query'         => $query,
-            'variables'     => null,
+            'query' => $query,
+            'variables' => null,
             'operationName' => null
         ];
-        /** @var Http $request */
-        $request = $this->objectManager->get(Http::class);
-        $request->setPathInfo('/graphql');
-        $request->setMethod('POST');
-        $request->setContent(json_encode($postData));
+
+        $this->request->setPathInfo('/graphql');
+        $this->request->setMethod('POST');
+        $this->request->setContent(json_encode($postData));
         $headers = $this->objectManager->create(\Zend\Http\Headers::class)
             ->addHeaders(['Content-Type' => 'application/json']);
-        $request->setHeaders($headers);
-        $response = $this->graphql->dispatch($request);
+        $this->request->setHeaders($headers);
+        $response = $this->graphql->dispatch($this->request);
         $outputResponse = $this->jsonSerializer->unserialize($response->getContent());
         if (isset($outputResponse['errors'][0])) {
             if (is_array($outputResponse['errors'][0])) {
                 foreach ($outputResponse['errors'] as $error) {
                     $this->assertEquals(
-                        $error['category'],
-                        \Magento\Framework\GraphQl\Exception\GraphQlInputException::EXCEPTION_CATEGORY
+                        \Magento\Framework\GraphQl\Exception\GraphQlInputException::EXCEPTION_CATEGORY,
+                        $error['category']
                     );
                     if (isset($error['message'])) {
                         $this->assertEquals($error['message'], 'Invalid entity_type specified: invalid');
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlRequestException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlRequestException.php
deleted file mode 100644
index 8fef0a4791081..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlRequestException.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\GraphQl\Exception;
-
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Phrase;
-
-/**
- * Exception for GraphQL to be thrown when user supplies invalid input
- */
-class GraphQlRequestException extends LocalizedException implements \GraphQL\Error\ClientAware
-{
-    const EXCEPTION_CATEGORY = 'graphql-request';
-
-    /**
-     * @var boolean
-     */
-    private $isSafe;
-
-    /**
-     * Initialize object
-     *
-     * @param Phrase $phrase
-     * @param \Exception $cause
-     * @param int $code
-     * @param boolean $isSafe
-     */
-    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0, $isSafe = true)
-    {
-        $this->isSafe = $isSafe;
-        parent::__construct($phrase, $cause, $code);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function isClientSafe() : bool
-    {
-        return $this->isSafe;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getCategory() : string
-    {
-        return self::EXCEPTION_CATEGORY;
-    }
-}

From 43fad756dc4ca51fe3a60888b67976772f07cc8a Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Thu, 4 Apr 2019 17:35:43 -0500
Subject: [PATCH 0983/1055] GraphQL-481: [Test Coverage] 'RemoveCouponFromCart'
 functionality

---
 .../testsuite/Magento/Quote/Api/CouponManagementTest.php       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
index 13ec50139b7fb..1fb8fc43b0db6 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php
@@ -9,6 +9,9 @@
 
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
+/**
+ * Coupon management service tests
+ */
 class CouponManagementTest extends WebapiAbstract
 {
     const SERVICE_VERSION = 'V1';

From 0bf820270f4a3f7a1da2a3b4be49a37d533bdf6e Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Fri, 5 Apr 2019 09:50:43 +0300
Subject: [PATCH 0984/1055] MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle
 items doesn't work

---
 .../Product/View/Type/Bundle/Option.php       |   4 +-
 .../Magento/Bundle/Model/Product/Price.php    | 151 +++++++++---------
 2 files changed, 79 insertions(+), 76 deletions(-)

diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 6a60854f80e64..7c5a64ca0232f 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -171,7 +171,7 @@ protected function assignSelection(\Magento\Bundle\Model\Option $option, $select
     {
         if (is_array($selectionId)) {
             $this->_selectedOptions = $selectionId;
-        } else if ($selectionId && $option->getSelectionById($selectionId)) {
+        } elseif ($selectionId && $option->getSelectionById($selectionId)) {
             $this->_selectedOptions = $selectionId;
         } elseif (!$option->getRequired()) {
             $this->_selectedOptions = 'None';
@@ -301,7 +301,7 @@ public function getSelectionTitlePrice($selection, $includeContainer = true)
      */
     public function setValidationContainer($elementId, $containerId)
     {
-        return;
+        return '';
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index c9ed97fada966..0e75ad2dc828c 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -258,67 +258,68 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
                 foreach ($options as $option) {
                     /* @var $option \Magento\Bundle\Model\Option */
                     $selections = $option->getSelections();
-                    if ($selections) {
-                        $selectionMinimalPrices = [];
-                        $selectionMaximalPrices = [];
-
-                        foreach ($option->getSelections() as $selection) {
-                            /* @var $selection \Magento\Bundle\Model\Selection */
-                            if (!$selection->isSalable()) {
-                                /**
-                                 * @todo CatalogInventory Show out of stock Products
-                                 */
-                                continue;
-                            }
-
-                            $qty = $selection->getSelectionQty();
-
-                            $item = $product->getPriceType() == self::PRICE_TYPE_FIXED ? $product : $selection;
-
-                            $selectionMinimalPrices[] = $this->_catalogData->getTaxPrice(
-                                $item,
-                                $this->getSelectionFinalTotalPrice(
-                                    $product,
-                                    $selection,
-                                    1,
-                                    $qty,
-                                    true,
-                                    $takeTierPrice
-                                ),
-                                $includeTax
-                            );
-                            $selectionMaximalPrices[] = $this->_catalogData->getTaxPrice(
-                                $item,
-                                $this->getSelectionFinalTotalPrice(
-                                    $product,
-                                    $selection,
-                                    1,
-                                    null,
-                                    true,
-                                    $takeTierPrice
-                                ),
-                                $includeTax
+                    if (empty($selections)) {
+                        continue;
+                    }
+                    $selectionMinimalPrices = [];
+                    $selectionMaximalPrices = [];
+
+                    foreach ($option->getSelections() as $selection) {
+                        /* @var $selection \Magento\Bundle\Model\Selection */
+                        if (!$selection->isSalable()) {
+                            /**
+                             * @todo CatalogInventory Show out of stock Products
+                             */
+                            continue;
+                        }
+
+                        $qty = $selection->getSelectionQty();
+
+                        $item = $product->getPriceType() == self::PRICE_TYPE_FIXED ? $product : $selection;
+
+                        $selectionMinimalPrices[] = $this->_catalogData->getTaxPrice(
+                            $item,
+                            $this->getSelectionFinalTotalPrice(
+                                $product,
+                                $selection,
+                                1,
+                                $qty,
+                                true,
+                                $takeTierPrice
+                            ),
+                            $includeTax
+                        );
+                        $selectionMaximalPrices[] = $this->_catalogData->getTaxPrice(
+                            $item,
+                            $this->getSelectionFinalTotalPrice(
+                                $product,
+                                $selection,
+                                1,
+                                null,
+                                true,
+                                $takeTierPrice
+                            ),
+                            $includeTax
+                        );
+                    }
+
+                    if (count($selectionMinimalPrices)) {
+                        $selMinPrice = min($selectionMinimalPrices);
+                        if ($option->getRequired()) {
+                            $minimalPrice += $selMinPrice;
+                            $minPriceFounded = true;
+                        } elseif (true !== $minPriceFounded) {
+                            $selMinPrice += $minimalPrice;
+                            $minPriceFounded = false === $minPriceFounded ? $selMinPrice : min(
+                                $minPriceFounded,
+                                $selMinPrice
                             );
                         }
 
-                        if (count($selectionMinimalPrices)) {
-                            $selMinPrice = min($selectionMinimalPrices);
-                            if ($option->getRequired()) {
-                                $minimalPrice += $selMinPrice;
-                                $minPriceFounded = true;
-                            } elseif (true !== $minPriceFounded) {
-                                $selMinPrice += $minimalPrice;
-                                $minPriceFounded = false === $minPriceFounded ? $selMinPrice : min(
-                                    $minPriceFounded,
-                                    $selMinPrice
-                                );
-                            }
-
-                            if ($option->isMultiSelection()) {
-                                $maximalPrice += array_sum($selectionMaximalPrices);
-                            } else {
-                                $maximalPrice += max($selectionMaximalPrices);
-                            }
+                        if ($option->isMultiSelection()) {
+                            $maximalPrice += array_sum($selectionMaximalPrices);
+                        } else {
+                            $maximalPrice += max($selectionMaximalPrices);
                         }
                     }
                 }
@@ -341,23 +342,25 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
 
                             $prices[] = $valuePrice;
                         }
-                        if (count($prices)) {
-                            if ($customOption->getIsRequire()) {
-                                $minimalPrice += $this->_catalogData->getTaxPrice($product, min($prices), $includeTax);
-                            }
-
-                            $multiTypes = [
-                                \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX,
-                                \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE,
-                            ];
-
-                            if (in_array($customOption->getType(), $multiTypes)) {
-                                $maximalValue = array_sum($prices);
-                            } else {
-                                $maximalValue = max($prices);
-                            }
-                            $maximalPrice += $this->_catalogData->getTaxPrice($product, $maximalValue, $includeTax);
+                        if (empty($prices)) {
+                            continue;
+                        }
+
+                        if ($customOption->getIsRequire()) {
+                            $minimalPrice += $this->_catalogData->getTaxPrice($product, min($prices), $includeTax);
+                        }
+
+                        $multiTypes = [
+                            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX,
+                            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE,
+                        ];
+
+                        if (in_array($customOption->getType(), $multiTypes)) {
+                            $maximalValue = array_sum($prices);
+                        } else {
+                            $maximalValue = max($prices);
                         }
+                        $maximalPrice += $this->_catalogData->getTaxPrice($product, $maximalValue, $includeTax);
                     } else {
                         $valuePrice = $customOption->getPrice(true);
 

From 79ae8bb7f6487ee6a8dcfcf335444660c5337d8b Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Fri, 5 Apr 2019 10:28:09 +0400
Subject: [PATCH 0985/1055] MAGETWO-96429: Wrong special price displayed in
 product search results

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

diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
index 81b025c9554e2..ff9fce57c4524 100644
--- a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
@@ -12,6 +12,7 @@
         <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="productSpecialPrice" type="text" selector="//a[contains(text(), '{{productName}}')]/ancestor::div//span[contains(@data-price-type, 'finalPrice')]/span[contains(@class, 'price')]" parameterized="true"/>
         <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="//span[@class='price-wrapper ']/span[@class='price']"/>

From b4c615882068d9c32b65fef112835a195122c852 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 5 Apr 2019 14:40:39 +0300
Subject: [PATCH 0986/1055] Fix static and unit tests.

---
 .../Frontend/Quote/Address/CollectTotalsObserver.php         | 5 +++++
 .../Frontend/Quote/Address/CollectTotalsObserverTest.php     | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
index b5e3f4ae1887b..77dfec9603a5c 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
@@ -7,6 +7,11 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Handle customer VAT number on collect_totals_before event of quote address.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class CollectTotalsObserver implements ObserverInterface
 {
     /**
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
index f3357f8aacd31..4ea067c9be8f6 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
@@ -199,7 +199,7 @@ public function testDispatchWithCustomerCountryNotInEUAndNotLoggedCustomerInGrou
             ->method('getNotLoggedInGroup')
             ->will($this->returnValue($this->groupInterfaceMock));
         $this->groupInterfaceMock->expects($this->once())
-            ->method('getId')->will($this->returnValue(0));
+            ->method('getId')->will($this->returnValue(null));
         $this->vatValidatorMock->expects($this->once())
             ->method('isEnabled')
             ->with($this->quoteAddressMock, $this->storeId)
@@ -220,9 +220,6 @@ public function testDispatchWithCustomerCountryNotInEUAndNotLoggedCustomerInGrou
             $this->returnValue(false)
         );
 
-        $groupMock = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->customerMock->expects($this->once())->method('getId')->will($this->returnValue(null));
 
         /** Assertions */

From 191fc7ce4d52c5fbc515204156c708a6de97535e Mon Sep 17 00:00:00 2001
From: Antoine Daudenthun <adaudenthun@gmail.com>
Date: Fri, 5 Apr 2019 10:16:29 +0200
Subject: [PATCH 0987/1055] unregister phar only when appropriate

Calling stream_wrapper_unregister('phar') without checking if it's registered will trigger a warning
---
 app/bootstrap.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index ddbcaffd42962..4974acdf0fc80 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -8,7 +8,9 @@
  * Environment initialization
  */
 error_reporting(E_ALL);
-stream_wrapper_unregister('phar');
+if (in_array('phar', \stream_get_wrappers())) {
+    stream_wrapper_unregister('phar');
+}
 #ini_set('display_errors', 1);
 
 /* PHP version validation */

From 5ac9d3b0f7b20bec5cbebeb67fd4af3a5baca092 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Fri, 5 Apr 2019 08:19:17 -0500
Subject: [PATCH 0988/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

- Fix static tests
---
 .../Magento/TestFramework/TestCase/GraphQl/Client.php     | 3 +++
 .../Magento/GraphQl/Customer/UpdateCustomerTest.php       | 7 ++++++-
 .../Magento/GraphQl/TestModule/GraphQlMutationTest.php    | 2 +-
 .../Magento/GraphQl/Vault/CustomerPaymentTokensTest.php   | 7 ++++++-
 .../Magento/GraphQl/Controller/GraphQlControllerTest.php  | 8 --------
 5 files changed, 16 insertions(+), 11 deletions(-)

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 5eea3be840ae5..1b27d000adb3c 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
@@ -101,12 +101,14 @@ private function processResponse(string $response)
         $responseArray = $this->json->jsonDecode($response);
 
         if (!is_array($responseArray)) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . $response);
         }
 
         $this->processErrors($responseArray);
 
         if (!isset($responseArray['data'])) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unknown GraphQL response body: ' . $response);
         }
 
@@ -142,6 +144,7 @@ private function processErrors($responseBodyArray)
                     $responseBodyArray
                 );
             }
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('GraphQL responded with an unknown error: ' . json_encode($responseBodyArray));
         }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
index 53c20ad898505..d4f8053826bcf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
@@ -87,7 +87,12 @@ public function testUpdateCustomer()
     }
 }
 QUERY;
-        $response = $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
+        );
 
         $this->assertEquals($newPrefix, $response['updateCustomer']['customer']['prefix']);
         $this->assertEquals($newFirstname, $response['updateCustomer']['customer']['firstname']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
index 35f408b255a84..c85f63c083700 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlMutationTest.php
@@ -53,6 +53,6 @@ public function testMutationIsNotAllowedViaGetRequest()
 }
 MUTATION;
 
-        $this->graphQlQuery($query, [], '', [], 'GET');
+        $this->graphQlQuery($query, [], '', []);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
index 97e86b9c6ac96..b2d89828f211f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
@@ -139,7 +139,12 @@ public function testDeletePaymentToken()
   }
 }
 QUERY;
-        $response = $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
+        );
 
         $this->assertTrue($response['deletePaymentToken']['result']);
         $this->assertEquals(1, count($response['deletePaymentToken']['customerPaymentTokens']['items']));
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
index 2beeff64b4831..d0d746812ec44 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php
@@ -265,12 +265,4 @@ public function testError() : void
             }
         }
     }
-
-    /**
-     * teardown
-     */
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
 }

From 656f2b0e0dd8891e0ebc5796514f3547fbd43df9 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Fri, 5 Apr 2019 08:47:39 -0500
Subject: [PATCH 0989/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

- fix web-api tests
---
 .../Magento/TestFramework/TestCase/GraphQl/Client.php      | 5 +++--
 .../GraphQl/Framework/QueryComplexityLimiterTest.php       | 3 ++-
 .../Magento/GraphQl/TestModule/GraphQlQueryTest.php        | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

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 1b27d000adb3c..e18a8c8e97c79 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
@@ -81,9 +81,10 @@ public function get(string $query, array $variables = [], string $operationName
         $url = $this->getEndpointUrl();
         $requestArray = [
             'query' => $query,
-            'variables' => empty($variables) ? $variables : null,
-            'operationName' => empty($operationName) ? $operationName : null
+            'variables' => $variables ? $this->json->jsonEncode($variables) : null,
+            'operationName' => $operationName ?? null
         ];
+        array_filter($requestArray);
 
         $responseBody = $this->curlClient->get($url, $requestArray, $headers);
         return $this->processResponse($responseBody);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php
index 352947714360a..e784061d5562f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/QueryComplexityLimiterTest.php
@@ -393,7 +393,8 @@ public function testQueryComplexityIsLimited()
 QUERY;
 
         self::expectExceptionMessageRegExp('/Max query complexity should be 300 but got 302/');
-        $this->graphQlQuery($query);
+        //Use POST request because request uri is too large for some servers
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
index fa3af0179d8ff..2db06e383758f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
@@ -73,7 +73,7 @@ public function testQueryViaGetRequestReturnsResults()
 }
 QUERY;
 
-        $response = $this->graphQlQuery($query, [], '', [], 'GET');
+        $response = $this->graphQlQuery($query, [], '', []);
 
         $this->assertArrayHasKey('testItem', $response);
     }
@@ -83,8 +83,9 @@ public function testQueryViaGetRequestWithVariablesReturnsResults()
         $id = 1;
 
         $query = <<<QUERY
+query getTestItem(\$id: Int!)
 {
-    testItem(\$id: Int!)
+    testItem(id: \$id)
     {
         item_id
         name
@@ -95,7 +96,7 @@ public function testQueryViaGetRequestWithVariablesReturnsResults()
             "id" => $id
         ];
 
-        $response = $this->graphQlQuery($query, $variables, '', [], 'GET');
+        $response = $this->graphQlQuery($query, $variables, '', []);
 
         $this->assertArrayHasKey('testItem', $response);
     }

From d3a9199774293c9cdee86210f7b20f5102333e99 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 5 Apr 2019 17:04:14 +0300
Subject: [PATCH 0990/1055] MAGETWO-58764: [GitHub] Minimal Query Length For
 Catalog Search #6681

---
 .../Model/Search/Adapter/Mysql/Query/Builder/Match.php   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
index b8640f67811f7..4490cf031e5e1 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -24,11 +24,6 @@ class Match extends BuilderMatch
      */
     private $searchHelper;
 
-    /**
-     * @var string[]
-     */
-    private $replaceSymbols = [];
-
     /**
      * @param ResolverInterface $resolver
      * @param Fulltext $fulltextHelper
@@ -52,8 +47,8 @@ public function __construct(
      */
     protected function prepareQuery($queryValue, $conditionType)
     {
-        $this->replaceSymbols = str_split(self::SPECIAL_CHARACTERS, 1);
-        $queryValue = str_replace($this->replaceSymbols, ' ', $queryValue);
+        $replaceSymbols = str_split(self::SPECIAL_CHARACTERS, 1);
+        $queryValue = str_replace($replaceSymbols, ' ', $queryValue);
         foreach ($this->preprocessors as $preprocessor) {
             $queryValue = $preprocessor->process($queryValue);
         }

From f875c6d37670eaea0ce68634f6df246907ce6a45 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 5 Apr 2019 10:37:27 -0500
Subject: [PATCH 0991/1055] Add migrated tag to MTF test

---
 .../Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.xml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.xml
index 8e4327db5eddc..8068b2cbc050e 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnStoreFrontLoginTest.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\Captcha\Test\TestCase\CaptchaOnStoreFrontLoginTest" summary="Check CAPTCHA on StoreFront Login Page" ticketId="MAGETWO-43639">
         <variation name="CaptchaOnStoreFrontLoginTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="captcha" xsi:type="string">111</data>
             <data name="configData" xsi:type="string">captcha_storefront_login</data>

From 29a039df5851c8e5f62b927a6b4312d9e774fe9e Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 5 Apr 2019 12:40:55 -0500
Subject: [PATCH 0992/1055] GraphQL-481: [Test Coverage] 'RemoveCouponFromCart'
 functionality

---
 .../GraphQl/Quote/Customer/RemoveCouponFromCartTest.php   | 8 ++++----
 .../GraphQl/Quote/Guest/RemoveCouponFromCartTest.php      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
index 689b360f724a7..feba8c5c64259 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -39,7 +39,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -85,7 +85,7 @@ public function testRemoveCouponFromEmptyCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -103,7 +103,7 @@ public function testRemoveCouponFromCartIfCouponWasNotSet()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -120,7 +120,7 @@ public function testRemoveCouponFromGuestCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
index a17ef545eba88..edb5f9cbf267c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
@@ -31,7 +31,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -74,7 +74,7 @@ public function testRemoveCouponFromEmptyCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
@@ -92,7 +92,7 @@ public function testRemoveCouponFromCartIfCouponWasNotSet()
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php

From ddc90cfbf1c978d5aea65560ddf3532762bc0e47 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 5 Apr 2019 14:04:48 -0500
Subject: [PATCH 0993/1055] Test stabilization

---
 .../Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml       | 2 ++
 .../Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
index 6c3bf9b127b1e..e5ee55910df65 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
@@ -23,10 +23,12 @@
         <before>
             <magentoCLI command="config:set {{AdminCaptchaLength3ConfigData.path}} {{AdminCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
             <magentoCLI command="config:set {{AdminCaptchaSymbols1ConfigData.path}} {{AdminCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
         </before>
         <after>
             <magentoCLI command="config:set {{AdminCaptchaDefaultLengthConfigData.path}} {{AdminCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
             <magentoCLI command="config:set {{AdminCaptchaDefaultSymbolsConfigData.path}} {{AdminCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
         </after>
         
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdminWithWrongCredentialsFirstAttempt">
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml
index 12e603bd3748c..8d4be5fda3c79 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml
@@ -20,10 +20,11 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
-            <magentoCLI command="config:set customer/captcha/enable 0" stepKey="disableCaptcha"/>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
             <createData stepKey="customer" entity="Simple_US_Customer"/>
         </before>
         <after>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaEnableConfigData.path}} {{StorefrontCustomerCaptchaEnableConfigData.value}}" stepKey="enableCaptcha"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 

From fef452adae8dde46c395afbe02ba6a7b2d88bcc7 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Fri, 5 Apr 2019 15:05:30 -0500
Subject: [PATCH 0994/1055] MC-15440: Product Page Gallery Load Optimization

---
 .../Catalog/Block/Product/View/Gallery.php    | 23 ++-----------------
 app/code/Magento/Catalog/Helper/Image.php     |  3 ++-
 .../frontend/layout/catalog_product_view.xml  |  6 ++++-
 .../templates/product/view/gallery.phtml      | 20 +++++++++++++++-
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index fb2898544d804..8b98fbdc8f7ef 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -207,8 +207,8 @@ public function isMainImage($image)
      */
     public function getImageAttribute($imageId, $attributeName, $default = null)
     {
-        $attributes =
-            $this->getConfigView()->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
+        $attributes = $this->getConfigView()
+                ->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
         return $attributes[$attributeName] ?? $default;
     }
 
@@ -239,23 +239,4 @@ private function getGalleryImagesConfig()
 
         return $this->getData('gallery_images_config');
     }
-
-    /**
-     * Get main product image
-     *
-     * @param string $size
-     * @return string
-     */
-    public function getMainProductImage($size = 'medium_image_url')
-    {
-        foreach ($this->getGalleryImages() as $image) {
-            $image = $image->getData($size);
-
-            if (!$image) {
-                return $this->_imageHelper->getDefaultPlaceholderUrl('image');
-            }
-
-            return $image;
-        }
-    }
 }
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 170f1209ad9e6..cc2a1cd7cb481 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Helper;
 
 use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 /**
  * Catalog image helper
@@ -14,7 +15,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @since 100.0.2
  */
-class Image extends AbstractHelper
+class Image extends AbstractHelper implements ArgumentInterface
 {
     /**
      * Media config node
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 8d3248896b434..e987d09728bdb 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
@@ -121,7 +121,11 @@
                         </arguments>
                     </block>
                 </container>
-                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml"/>
+                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml">
+                    <arguments>
+                        <argument name="imageHelper" xsi:type="object">Magento\Catalog\Helper\Image</argument>
+                    </arguments>
+                </block>
                 <container name="skip_gallery_after.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
                     <block class="Magento\Framework\View\Element\Template" after="product.info.media.image" name="skip_gallery_after" template="Magento_Theme::html/skip.phtml">
                         <arguments>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 820e6cc969175..096761c0a5d5c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -13,10 +13,28 @@
  */
 ?>
 
+<?php
+    $images = $block->getGalleryImages()->getItems();
+    $mainImage = current(array_filter($images, function ($img) use ($block) {
+        return $block->isMainImage($img);
+    }));
+
+    if (!empty($images) && empty($mainImage)) {
+        $mainImage = $block->getGalleryImages()->getFirstItem();
+    }
+
+    $helper = $block->getData('imageHelper');
+    $mainImageData = $mainImage ?
+        $mainImage->getData('medium_image_url') :
+        $helper->getDefaultPlaceholderUrl('image');
+
+?>
+
 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
     <img
+        alt="main product photo"
         class="gallery-placeholder__image"
-        src="<?= /* @escapeNotVerified */ $block->getMainProductImage() ?>"
+        src="<?= /* @noEscape */ $mainImageData ?>"
     />
 </div>
 

From 04e576be255c99dd209043268acef4429df26193 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 5 Apr 2019 15:11:11 -0500
Subject: [PATCH 0995/1055] Test stabilization

---
 .../Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml        | 3 +++
 .../AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
index 505e178f49f43..e660a2eb8d428 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
@@ -13,6 +13,9 @@
             <title value="AdvancedReportingButtonTest"/>
             <description value="Test log in to AdvancedReporting and tests AdvancedReportingButtonTest"/>
             <testCaseId value="MC-14800"/>
+            <skip>
+                <issueId value="MC-14800" />
+            </skip>
             <severity value="CRITICAL"/>
             <group value="analytics"/>
             <group value="mtf_migrated"/>
diff --git a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml
index ef28705cc7a26..c68ffbfb5be4b 100644
--- a/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnCustomerAccountInfoActionGroup.xml
@@ -9,11 +9,13 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertCaptchaVisibleOnCustomerAccountInfoActionGroup">
+        <checkOption selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckbox" />
         <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaField"/>
         <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImage"/>
         <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButton"/>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageReloaded" />
+        <checkOption selector="{{StorefrontCustomerAccountInformationSection.changeEmail}}" stepKey="clickChangeEmailCheckboxAfterPageReload" />
         <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaField}}" stepKey="seeCaptchaFieldAfterPageReload"/>
         <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaImg}}" stepKey="seeCaptchaImageAfterPageReload"/>
         <waitForElementVisible selector="{{StorefrontCustomerAccountInformationSection.captchaReload}}" stepKey="seeCaptchaReloadButtonAfterPageReload"/>

From c819cc0e816e7d0710ac379828bd3107dbe176f1 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Fri, 5 Apr 2019 15:58:48 -0500
Subject: [PATCH 0996/1055] Strict comparison with null instead of is_null
 function usage

---
 .../ConfigurableProduct/Model/Product/Type/Configurable.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 47c1a3c39f9a8..a849d964eaed5 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -1249,7 +1249,7 @@ public function getUsedProducts($product, $requiredAttributeIds = null)
             $product->getStoreId(),
             $this->getCustomerSession()->getCustomerGroupId()
         ];
-        if (!is_null($requiredAttributeIds)) {
+        if ($requiredAttributeIds !== null) {
             sort($requiredAttributeIds);
             $keyParts[] = implode('', $requiredAttributeIds);
         }

From 3cefd3a172075c68bc552d4187cdcff0ec307ee4 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@adobe.com>
Date: Fri, 5 Apr 2019 16:31:31 -0500
Subject: [PATCH 0997/1055] MQE-1509: Updated annotation in mftf test
 AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest

---
 ...AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
index 7453b7b5a43f3..7e1b9acbc47ab 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
@@ -10,7 +10,7 @@
     <test name="AdminUpdateCategoryUrlRewriteAndAddTemporaryRedirectTest">
         <annotations>
             <stories value="Update URL rewrite"/>
-            <title value="Update Category URL Rewrites, no redirect type"/>
+            <title value="Update Category URL Rewrites, Temporary redirect type"/>
             <description value="Login as Admin and update category UrlRewrite and add Temporary redirect type"/>
             <testCaseId value="MC-5356"/>
             <severity value="CRITICAL"/>

From 2ab7760b616d06a817b9f960878cde78af185a69 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 5 Apr 2019 17:10:39 -0500
Subject: [PATCH 0998/1055] Minor fixes to
 magento/magento-functional-tests-migration#682

---
 ...refrontResetCustomerPasswordFailedTest.xml | 19 ++++++++++++++++
 ...AssertCustomerResetPasswordActionGroup.xml | 22 +++++++++++++++++++
 ...efrontCustomerResetPasswordActionGroup.xml | 12 ----------
 ...refrontResetCustomerPasswordFailedTest.xml |  4 ++--
 .../ResetCustomerPasswordFailedTest.xml       |  3 +--
 5 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerResetPasswordActionGroup.xml

diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
new file mode 100644
index 0000000000000..36d7989b9acc1
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
@@ -0,0 +1,19 @@
+<?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="StorefrontResetCustomerPasswordFailedTest">
+        <before>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaEnableConfigData.path}} {{StorefrontCustomerCaptchaEnableConfigData.value}}" stepKey="enableCaptcha"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerResetPasswordActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerResetPasswordActionGroup.xml
new file mode 100644
index 0000000000000..644254443d129
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerResetPasswordActionGroup.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="AssertCustomerResetPasswordActionGroup">
+        <arguments>
+            <argument name="url" type="string"/>
+            <argument name="message" type="string" defaultValue="" />
+            <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+
+        <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForMessage" />
+        <see stepKey="seeMessage" userInput="{{message}}" selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}"/>
+        <seeInCurrentUrl stepKey="seeCorrectCurrentUrl" url="{{url}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
index f322be6109218..a28593f1b77b7 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerResetPasswordActionGroup.xml
@@ -21,16 +21,4 @@
         <click stepKey="clickResetPassword" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
         <waitForPageLoad stepKey="waitForPageLoaded" />
     </actionGroup>
-
-    <actionGroup name="AssertCustomerResetPasswordActionGroup">
-        <arguments>
-            <argument name="url" type="string"/>
-            <argument name="message" type="string" defaultValue="" />
-            <argument name="messageType" type="string" defaultValue="success" />
-        </arguments>
-
-        <seeInCurrentUrl stepKey="seeInSignInPage" url="{{url}}"/>
-        <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForMessage" />
-        <see stepKey="seeMessage" userInput="{{message}}" selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}"/>
-    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
index 56c8af118fadc..3121bd0da9d2d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml
@@ -13,16 +13,16 @@
             <features value="Customer"/>
             <title value="Customer tries to reset password several times"/>
             <description value="Customer tries to reset password several times"/>
+            <severity value="CRITICAL" />
+            <testCaseId value="MC-14374" />
             <group value="Customer"/>
             <group value="security"/>
             <group value="mtf_migrated"/>
         </annotations>
         <before>
-            <magentoCLI command="config:set customer/captcha/enable 0" stepKey="disableCaptcha"/>
             <createData stepKey="customer" entity="Simple_US_Customer"/>
         </before>
         <after>
-            <magentoCLI command="config:set customer/captcha/enable 1" stepKey="enableCaptcha"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml
index 524f57c78b4ba..b4fbe7bb92929 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml
@@ -8,8 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Security\Test\TestCase\ResetCustomerPasswordFailedTest" summary="Reset customer password.">
         <variation name="ResetPasswordTestVariation">
-            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1,mftf_migrated:yes</data>
             <data name="customer/dataset" xsi:type="string">customer_US</data>
             <data name="attempts" xsi:type="string">2</data>
             <data name="configData" xsi:type="string">captcha_storefront_disable</data>

From 3ad6bb9c3569f6ce2509c99a293188d1c78ce2a2 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Sat, 6 Apr 2019 11:16:24 +0200
Subject: [PATCH 0999/1055] Removing incorrect less selector '.abs-cleafix', it
 has a typo + it is already used correctly in a different less file
 (_data-grid-header.less).

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

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 5d9bf80ce2255..71f57b765ff0e 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
@@ -470,8 +470,6 @@ label.mage-error {
     }
 
     .admin__data-grid-header-row {
-        &:extend(.abs-cleafix);
-
         .action-select-multiselect {
             -webkit-appearance: menulist-button;
             appearance: menulist-button;

From 34bd8bd793de2aad34c461aad62a1a3984fb509a Mon Sep 17 00:00:00 2001
From: Andreas Mautz <andreas.mautz@webvisum.de>
Date: Sun, 7 Apr 2019 13:58:40 +0200
Subject: [PATCH 1000/1055] 22166: updated README to follow-up the switch from
 Bugcrowd to hackerone

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9e3cf448f99fb..01e6df12cb5f5 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Please review the [Code Contributions guide](https://devdocs.magento.com/guides/
 
 ## Reporting Security Issues
 
-To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
+To report security vulnerabilities or learn more about reporting security issues in Magento software or web sites visit the [Magento Bug Bounty Program](https://hackerone.com/magento) on hackerone. Please create a hackerone account [there](https://hackerone.com/magento) to submit and follow-up your issue.
 
 Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications](https://magento.com/security/sign-up).
 

From 2131a21f183dfd0019c36f90bb4921948552d045 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <mitry@atwix.com>
Date: Sun, 7 Apr 2019 23:00:20 +0300
Subject: [PATCH 1001/1055] Add API functional tests for ApplyCouponToCart
 functionality, code refactoring

---
 .../Quote/Customer/ApplyCouponToCartTest.php  | 284 +++++-------------
 .../Quote/Guest/ApplyCouponToCartTest.php     | 199 +++---------
 .../Quote/_files/make_coupon_expired.php      |  22 ++
 .../_files/make_coupon_expired_rollback.php   |  23 ++
 ...strict_coupon_usage_for_simple_product.php |  52 ++++
 ...upon_usage_for_simple_product_rollback.php |  37 +++
 6 files changed, 252 insertions(+), 365 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index 2db2e799f9123..885e8705dc3d9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -8,15 +8,8 @@
 namespace Magento\GraphQl\Quote\Customer;
 
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 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\SalesRule\Api\Data\ConditionInterface;
-use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
-use Magento\SalesRule\Api\RuleRepositoryInterface;
-use Magento\SalesRule\Model\Coupon;
-use Magento\SalesRule\Model\Spi\CouponResourceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -25,279 +18,187 @@
  */
 class ApplyCouponToCartTest extends GraphQlAbstract
 {
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var Quote
-     */
-    private $quote;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var CouponResourceInterface
-     */
-    protected $couponResource;
-
-    /**
-     * @var Coupon
-     */
-    private $coupon;
-
     /**
      * @var CustomerTokenServiceInterface
      */
     private $customerTokenService;
 
     /**
-     * @var RuleRepositoryInterface
-     */
-    private $ruleRepository;
-
-    /**
-     * @var ConditionInterfaceFactory
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $conditionFactory;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     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->couponResource = $objectManager->get(CouponResourceInterface::class);
-        $this->coupon = $objectManager->create(Coupon::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
-        $this->conditionFactory = $objectManager->get(ConditionInterfaceFactory::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testApplyCouponToCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('applyCouponToCart', $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
      */
     public function testApplyCouponTwice()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey("applyCouponToCart", $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
 
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @expectedException \Exception
      * @expectedExceptionMessage Cart does not contain products.
      */
     public function testApplyCouponToCartWithoutItems()
     {
         $couponCode = '2?ds5!2d';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
      */
     public function testApplyCouponToGuestCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @expectedException \Exception
      */
     public function testApplyCouponToAnotherCustomerCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(2);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer_two@example.com'));
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyNonExistentCouponToCart()
     {
-        $couponCode = '1%q#f5';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $couponCode = 'non_existent_coupon_code';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @expectedException \Exception
      */
     public function testApplyCouponToNonExistentCart()
     {
         $couponCode = '2?ds5!2d';
-        $maskedQuoteId = '1hk3y1842h1n';
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_coupon_expired.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyExpiredCoupon()
     {
         $couponCode = '2?ds5!2d';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->coupon->loadByCode($couponCode);
-        $yesterday = new \DateTime();
-        $yesterday->add(\DateInterval::createFromDateString('-1 day'));
-        $this->coupon->setExpirationDate($yesterday->format('Y-m-d'));
-        $this->couponResource->save($this->coupon);
-
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * Products in cart don't fit to the coupon
      *
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyCouponWhichIsNotApplicable()
     {
         $couponCode = '2?ds5!2d';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->excludeProductPerCoupon($couponCode, 'simple');
-
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -305,6 +206,7 @@ public function testApplyCouponWhichIsNotApplicable()
      * @param string $message
      * @dataProvider dataProviderUpdateWithMissedRequiredParameters
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @expectedException \Exception
      */
     public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
@@ -321,12 +223,8 @@ public function testApplyCouponWithMissedRequiredParameters(string $input, strin
 }
 QUERY;
 
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -346,55 +244,19 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         ];
     }
 
-    /**
-     * @param string $couponCode
-     * @param string $sku
-     * @throws \Exception
-     */
-    private function excludeProductPerCoupon(string $couponCode, string $sku)
-    {
-        $this->coupon->loadByCode($couponCode);
-        $ruleId = $this->coupon->getRuleId();
-        $salesRule = $this->ruleRepository->getById($ruleId);
-
-        /** @var ConditionInterface $conditionProductSku */
-        $conditionProductSku = $this->conditionFactory->create();
-        $conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
-        $conditionProductSku->setAttributeName('sku');
-        $conditionProductSku->setValue('1');
-        $conditionProductSku->setOperator('!=');
-        $conditionProductSku->setValue($sku);
-
-        /** @var ConditionInterface $conditionProductFound */
-        $conditionProductFound = $this->conditionFactory->create();
-        $conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
-        $conditionProductFound->setValue('1');
-        $conditionProductFound->setAggregatorType('all');
-        $conditionProductFound->setConditions([$conditionProductSku]);
-
-        /** @var ConditionInterface $conditionCombine */
-        $conditionCombine = $this->conditionFactory->create();
-        $conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
-        $conditionCombine->setValue('1');
-        $conditionCombine->setAggregatorType('all');
-        $conditionCombine->setConditions([$conditionProductFound]);
-
-        $salesRule->setCondition($conditionCombine);
-        $this->ruleRepository->save($salesRule);
-    }
-
     /**
      * Retrieve customer authorization headers
      *
-     * @param string $email
+     * @param string $username
      * @param string $password
      * @return array
      * @throws AuthenticationException
      */
-    private function prepareAuthorizationHeaders(string $email, string $password): array
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
     {
-        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-        return ['Authorization' => 'Bearer ' . $customerToken];
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
     }
 
     /**
@@ -402,7 +264,7 @@ private function prepareAuthorizationHeaders(string $email, string $password): a
      * @param string $couponCode
      * @return string
      */
-    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    private function getQuery(string $maskedQuoteId, string $couponCode): string
     {
         return <<<QUERY
 mutation {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
index 51644a9fe8c55..4fd1c713db5d4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -7,14 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\SalesRule\Api\Data\ConditionInterface;
-use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
-use Magento\SalesRule\Api\RuleRepositoryInterface;
-use Magento\SalesRule\Model\Coupon;
-use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -24,67 +17,27 @@
 class ApplyCouponToCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var Quote
-     */
-    private $quote;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var CouponResourceInterface
-     */
-    protected $couponResource;
-
-    /**
-     * @var Coupon
-     */
-    private $coupon;
-
-    /**
-     * @var RuleRepositoryInterface
-     */
-    private $ruleRepository;
-
-    /**
-     * @var ConditionInterfaceFactory
-     */
-    private $conditionFactory;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     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->couponResource = $objectManager->get(CouponResourceInterface::class);
-        $this->coupon = $objectManager->create(Coupon::class);
-        $this->ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
-        $this->conditionFactory = $objectManager->get(ConditionInterfaceFactory::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      */
     public function testApplyCouponToCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('applyCouponToCart', $response);
@@ -92,7 +45,9 @@ public function testApplyCouponToCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @expectedException \Exception
      * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
@@ -100,14 +55,8 @@ public function testApplyCouponToCart()
     public function testApplyCouponTwice()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey("applyCouponToCart", $response);
@@ -117,7 +66,8 @@ public function testApplyCouponTwice()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @expectedException \Exception
      * @expectedExceptionMessage Cart does not contain products.
@@ -125,53 +75,41 @@ public function testApplyCouponTwice()
     public function testApplyCouponToCartWithoutItems()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * _security
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @expectedException \Exception
      */
     public function testApplyCouponToCustomerCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyNonExistentCouponToCart()
     {
-        $couponCode = '1%q#f5';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $couponCode = 'non_existent_coupon_code';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         $this->graphQlQuery($query);
     }
@@ -183,35 +121,27 @@ public function testApplyNonExistentCouponToCart()
     public function testApplyCouponToNonExistentCart()
     {
         $couponCode = '2?ds5!2d';
-        $maskedQuoteId = '1hk3y1842h1n';
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_coupon_expired.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyExpiredCoupon()
     {
         $couponCode = '2?ds5!2d';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->coupon->loadByCode($couponCode);
-
-        $yesterday = new \DateTime();
-        $yesterday->add(\DateInterval::createFromDateString('-1 day'));
-        $this->coupon->setExpirationDate($yesterday->format('Y-m-d'));
-        $this->couponResource->save($this->coupon);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         $this->graphQlQuery($query);
     }
@@ -219,23 +149,19 @@ public function testApplyExpiredCoupon()
     /**
      * Products in cart don't fit to the coupon
      *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyCouponWhichIsNotApplicable()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->excludeProductPerCoupon($couponCode, 'simple');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         $this->graphQlQuery($query);
     }
@@ -243,6 +169,8 @@ public function testApplyCouponWhichIsNotApplicable()
     /**
      * @param string $input
      * @param string $message
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @dataProvider dataProviderUpdateWithMissedRequiredParameters
      * @expectedException \Exception
      */
@@ -281,49 +209,12 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         ];
     }
 
-    /**
-     * @param string $couponCode
-     * @param string $sku
-     * @throws \Exception
-     */
-    private function excludeProductPerCoupon(string $couponCode, string $sku)
-    {
-        $this->coupon->loadByCode($couponCode);
-        $ruleId = $this->coupon->getRuleId();
-        $salesRule = $this->ruleRepository->getById($ruleId);
-
-        /** @var ConditionInterface $conditionProductSku */
-        $conditionProductSku = $this->conditionFactory->create();
-        $conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
-        $conditionProductSku->setAttributeName('sku');
-        $conditionProductSku->setValue('1');
-        $conditionProductSku->setOperator('!=');
-        $conditionProductSku->setValue($sku);
-
-        /** @var ConditionInterface $conditionProductFound */
-        $conditionProductFound = $this->conditionFactory->create();
-        $conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
-        $conditionProductFound->setValue('1');
-        $conditionProductFound->setAggregatorType('all');
-        $conditionProductFound->setConditions([$conditionProductSku]);
-
-        /** @var ConditionInterface $conditionCombine */
-        $conditionCombine = $this->conditionFactory->create();
-        $conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
-        $conditionCombine->setValue('1');
-        $conditionCombine->setAggregatorType('all');
-        $conditionCombine->setConditions([$conditionProductFound]);
-
-        $salesRule->setCondition($conditionCombine);
-        $this->ruleRepository->save($salesRule);
-    }
-
     /**
      * @param string $maskedQuoteId
      * @param string $couponCode
      * @return string
      */
-    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    private function getQuery(string $maskedQuoteId, string $couponCode): string
     {
         return <<<QUERY
 mutation {
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php
new file mode 100644
index 0000000000000..5316b184ecd15
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\SalesRule\Model\CouponFactory;
+use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponResourceInterface $couponResource */
+$couponResource = Bootstrap::getObjectManager()->get(CouponResourceInterface::class);
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode('2?ds5!2d');
+$yesterday = new \DateTime();
+$yesterday->add(\DateInterval::createFromDateString('-1 day'));
+$coupon->setExpirationDate($yesterday->format('Y-m-d'));
+$couponResource->save($coupon);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php
new file mode 100644
index 0000000000000..32c3d78bafd09
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_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\SalesRule\Model\CouponFactory;
+use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponResourceInterface $couponResource */
+$couponResource = Bootstrap::getObjectManager()->get(CouponResourceInterface::class);
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode('2?ds5!2d');
+
+if ($coupon->getId()) {
+    $coupon->setExpirationDate(null);
+    $couponResource->save($coupon);
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
new file mode 100644
index 0000000000000..e58c6b21d8d23
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Model\CouponFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+/** @var ConditionInterfaceFactory $conditionFactory */
+$conditionFactory = Bootstrap::getObjectManager()->get(ConditionInterfaceFactory::class);
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
+
+$couponCode = '2?ds5!2d';
+$sku = 'simple_product';
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode($couponCode);
+$ruleId = $coupon->getRuleId();
+$salesRule = $ruleRepository->getById($ruleId);
+
+/** @var ConditionInterface $conditionProductSku */
+$conditionProductSku = $conditionFactory->create();
+$conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
+$conditionProductSku->setAttributeName('sku');
+$conditionProductSku->setValue('1');
+$conditionProductSku->setOperator('!=');
+$conditionProductSku->setValue($sku);
+
+/** @var ConditionInterface $conditionProductFound */
+$conditionProductFound = $conditionFactory->create();
+$conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
+$conditionProductFound->setValue('1');
+$conditionProductFound->setAggregatorType('all');
+$conditionProductFound->setConditions([$conditionProductSku]);
+
+/** @var ConditionInterface $conditionCombine */
+$conditionCombine = $conditionFactory->create();
+$conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
+$conditionCombine->setValue('1');
+$conditionCombine->setAggregatorType('all');
+$conditionCombine->setConditions([$conditionProductFound]);
+
+$salesRule->setCondition($conditionCombine);
+$ruleRepository->save($salesRule);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php
new file mode 100644
index 0000000000000..86ab253f1d3c0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Model\CouponFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+/** @var ConditionInterfaceFactory $conditionFactory */
+$conditionFactory = Bootstrap::getObjectManager()->get(ConditionInterfaceFactory::class);
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
+
+$couponCode = '2?ds5!2d';
+$sku = 'simple_product';
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode($couponCode);
+
+if ($coupon->getId()) {
+    $ruleId = $coupon->getRuleId();
+    $salesRule = $ruleRepository->getById($ruleId);
+
+    /** @var ConditionInterface $conditionCombine */
+    $conditionCombine = $conditionFactory->create();
+    $conditionCombine->setConditions([]);
+
+    $salesRule->setCondition($conditionCombine);
+    $ruleRepository->save($salesRule);
+}

From 639e97b7cbc287c6e435ab1cc8d0ae7cb82d4076 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Mon, 8 Apr 2019 11:35:52 +0530
Subject: [PATCH 1002/1055] Translated exception message

---
 app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
index 418cb93900610..ea8a44a1122b4 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
@@ -75,7 +75,7 @@ public function execute()
             $this->logger->critical($e);
             $this->messageManager->addExceptionMessage(
                 $e,
-                'The order #' . $quote->getReservedOrderId() . ' cannot be processed.'
+                __('The order #%1 cannot be processed.', $quote->getReservedOrderId())
             );
         }
 

From fd5d25455f4213d0dffbdfb76aa3ded264db3c2f Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Mon, 8 Apr 2019 12:10:01 +0530
Subject: [PATCH 1003/1055] Translate comment in DHL config settings

---
 app/code/Magento/Dhl/etc/adminhtml/system.xml | 2 +-
 app/code/Magento/Dhl/i18n/en_US.csv           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Dhl/etc/adminhtml/system.xml b/app/code/Magento/Dhl/etc/adminhtml/system.xml
index 37b653225c7b9..7ab37de2f3658 100644
--- a/app/code/Magento/Dhl/etc/adminhtml/system.xml
+++ b/app/code/Magento/Dhl/etc/adminhtml/system.xml
@@ -31,7 +31,7 @@
                 <field id="account" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Account Number</label>
                 </field>
-                <field id="content_type" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                <field id="content_type" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Content Type (Non Domestic)</label>
                     <comment>Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)</comment>
                     <source_model>Magento\Dhl\Model\Source\Contenttype</source_model>
diff --git a/app/code/Magento/Dhl/i18n/en_US.csv b/app/code/Magento/Dhl/i18n/en_US.csv
index a5532c2cea963..0e4c7a8385b93 100644
--- a/app/code/Magento/Dhl/i18n/en_US.csv
+++ b/app/code/Magento/Dhl/i18n/en_US.csv
@@ -61,6 +61,7 @@ Title,Title
 Password,Password
 "Account Number","Account Number"
 "Content Type","Content Type"
+"Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)","Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)"
 "Calculate Handling Fee","Calculate Handling Fee"
 "Handling Applied","Handling Applied"
 """Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."

From 4fd2e310703db7f4f13904bbb8743f19058cd0b3 Mon Sep 17 00:00:00 2001
From: Karan Shah <karan.shah@krishtechnolabs.com>
Date: Mon, 8 Apr 2019 15:29:15 +0530
Subject: [PATCH 1004/1055] Typography_change

---
 .../Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
index 0e21e566d5e75..4654144ce6873 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -75,7 +75,7 @@ public function getElementHtml()
     }
 
     /**
-     * Execute method getElementHtml from parrent class
+     * Execute method getElementHtml from parent class
      *
      * @return string
      */

From caf6843e1b8cb61f3f9b58adbda81f08b58ea0a2 Mon Sep 17 00:00:00 2001
From: vagrant <eino.keskitalo@vaimo.com>
Date: Mon, 8 Apr 2019 16:12:17 +0200
Subject: [PATCH 1005/1055] Remove unused payment variable from order data.

The $payment variable is overwritten in the foreach loop.
---
 .../testsuite/Magento/Sales/_files/order_list.php        | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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 1f4253f18487c..8a1da8e8a3eb1 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
@@ -24,8 +24,7 @@
         'subtotal' => 120.00,
         'base_grand_total' => 120.00,
         'store_id' => 1,
-        'website_id' => 1,
-        'payment' => $payment
+        'website_id' => 1
     ],
     [
         'increment_id' => '100000003',
@@ -35,8 +34,7 @@
         'base_grand_total' => 140.00,
         'subtotal' => 140.00,
         'store_id' => 0,
-        'website_id' => 0,
-        'payment' => $payment
+        'website_id' => 0
     ],
     [
         'increment_id' => '100000004',
@@ -46,8 +44,7 @@
         'base_grand_total' => 140.00,
         'subtotal' => 140.00,
         'store_id' => 1,
-        'website_id' => 1,
-        'payment' => $payment
+        'website_id' => 1
     ],
 ];
 

From 241450e4e669885ff229ab192a9237498c1b1214 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Mon, 8 Apr 2019 16:41:45 +0200
Subject: [PATCH 1006/1055] [Checkout Coverage] Place order for guest

---
 .../Model/Resolver/PlaceOrder.php             |   7 +
 .../GraphQl/Quote/Guest/PlaceOrderTest.php    | 134 ++++++++++++++++++
 .../Quote/_files/guest/set_guest_email.php    |  24 ++++
 3 files changed, 165 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
index 3bd46a664f2ab..1672474bb3ddd 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/PlaceOrder.php
@@ -65,6 +65,13 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId());
 
+        if ($context->getUserId() === 0) {
+            if (!$cart->getCustomerEmail()) {
+                throw new GraphQlInputException(__("Guest email for cart is missing. Please enter"));
+            }
+            $cart->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);
+        }
+
         try {
             $orderId = $this->cartManagement->placeOrder($cart->getId());
             $order = $this->orderRepository->get($orderId);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
new file mode 100644
index 0000000000000..d102a8eb72df2
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Framework\Registry;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for placing an order for guest
+ */
+class PlaceOrderTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $orderCollectionFactory;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+     */
+    public function testPlaceOrder()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('placeOrder', $response);
+        self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_id']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+     */
+    public function testPlaceOrderWithNoEmail()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage("Guest email for cart is missing. Please enter");
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+mutation {
+  placeOrder(input: {cart_id: "{$maskedQuoteId}"}) {
+    order {
+      order_id
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function tearDown()
+    {
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+
+        $orderCollection = $this->orderCollectionFactory->create();
+        foreach ($orderCollection as $order) {
+            $this->orderRepository->delete($order);
+        }
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+
+        parent::tearDown();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php
new file mode 100644
index 0000000000000..4e214f4310044
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var CartRepositoryInterface  $cartRepository */
+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+
+$quote->setCustomerEmail('customer@example.com');
+$cartRepository->save($quote);

From c7a770fa1efb6fb966f2ee1342fadb4c496f880f Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Mon, 8 Apr 2019 10:26:38 -0500
Subject: [PATCH 1007/1055] MC-15440: Product Page Gallery Load Optimization

---
 app/code/Magento/Catalog/Helper/Image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index cc2a1cd7cb481..9b8d0ad75a8c9 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -765,7 +765,7 @@ protected function getImageFile()
     protected function parseSize($string)
     {
         $size = explode('x', strtolower($string));
-        if (sizeof($size) == 2) {
+        if (count($size) == 2) {
             return ['width' => $size[0] > 0 ? $size[0] : null, 'height' => $size[1] > 0 ? $size[1] : null];
         }
         return false;

From 05f345873c3e9567569a5dd63949f490acf0f37a Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Mon, 8 Apr 2019 18:06:26 +0200
Subject: [PATCH 1008/1055] Additional test cases

---
 .../GraphQl/Quote/Guest/PlaceOrderTest.php    | 139 ++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
index d102a8eb72df2..648b8265ee674 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
@@ -97,6 +97,145 @@ public function testPlaceOrderWithNoEmail()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     */
+    public function testPlaceOrderWithNoItemsInCart()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage(
+            'Unable to place order: A server error stopped your order from being placed. ' .
+            'Please try to place your order again'
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testPlaceOrderWithNoShippingAddress()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage(
+            'Unable to place order: Some addresses can\'t be used due to the configurations for specific countries'
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     */
+    public function testPlaceOrderWithNoShippingMethod()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage(
+            'Unable to place order: The shipping method is missing. Select the shipping method and try again'
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testPlaceOrderWithNoBillingAddress()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessageRegExp(
+            '/Unable to place order: Please check the billing address information*/'
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testPlaceOrderWithNoPaymentMethod()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage('Unable to place order: Enter a valid payment method and try again');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
+     */
+    public function testPlaceOrderWithOutOfStockProduct()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessage('Unable to place order: Some of the products are out of stock');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_shipping_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/enable_offline_payment_methods.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+     */
+    public function testPlaceOrderOfAnotherCustomerCart()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+        $query = $this->getQuery($maskedQuoteId);
+
+        self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string

From 3352abdc715ef0446684d4e866da1d72e56d4fc5 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 11:19:40 -0500
Subject: [PATCH 1009/1055] GraphQL-544: Replace deprecated fixtures in
 RemoveItemFromCartTest

---
 .../Quote/Customer/RemoveItemFromCartTest.php | 209 +++++++-----------
 .../GetQuoteItemIdByReservedQuoteIdAndSku.php |  66 ++++++
 .../Quote/Guest/RemoveItemFromCartTest.php    | 143 ++++++------
 3 files changed, 212 insertions(+), 206 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
index 5f023086e89e1..1b6d1f3b14383 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -7,11 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteItemIdByReservedQuoteIdAndSku;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -26,49 +24,37 @@ class RemoveItemFromCartTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var QuoteFactory
+     * @var GetQuoteItemIdByReservedQuoteIdAndSku
      */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
+    private $getQuoteItemIdByReservedQuoteIdAndSku;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getQuoteItemIdByReservedQuoteIdAndSku = $objectManager->get(
+            GetQuoteItemIdByReservedQuoteIdAndSku::class
+        );
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveItemFromCart()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $itemId);
+        $query = $this->getQuery($maskedQuoteId, $itemId);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         $this->assertArrayHasKey('removeItemFromCart', $response);
@@ -83,116 +69,24 @@ public function testRemoveItemFromCart()
      */
     public function testRemoveItemFromNonExistentCart()
     {
-        $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
+        $query = $this->getQuery('non_existent_masked_id', 1);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveNonExistentItem()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $notExistentItemId = 999;
 
         $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $notExistentItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-     */
-    public function testRemoveItemIfItemIsNotBelongToCart()
-    {
-        $firstQuote = $this->quoteFactory->create();
-        $this->quoteResource->load($firstQuote, 'test_quote', 'reserved_order_id');
-        $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
-
-        $secondQuote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $secondQuote,
-            'test_order_with_virtual_product_without_address',
-            'reserved_order_id'
-        );
-        $secondQuote->setCustomerId(1);
-        $this->quoteResource->save($secondQuote);
-        $secondQuoteItemId = (int)$secondQuote
-            ->getItemByProduct($this->productRepository->get('virtual-product'))
-            ->getId();
-
-        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
-
-        $query = $this->prepareMutationQuery($firstQuoteMaskedId, $secondQuoteItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-     */
-    public function testRemoveItemFromGuestCart()
-    {
-        $guestQuote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $guestQuote,
-            'test_quote',
-            'reserved_order_id'
-        );
-        $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
-        $guestQuoteItemId = (int)$guestQuote
-            ->getItemByProduct($this->productRepository->get('virtual-product'))
-            ->getId();
-
-        $this->expectExceptionMessage(
-            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
-        );
-
-        $query = $this->prepareMutationQuery($guestQuoteMaskedId, $guestQuoteItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-     */
-    public function testRemoveItemFromAnotherCustomerCart()
-    {
-        $anotherCustomerQuote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $anotherCustomerQuote,
-            'test_order_with_virtual_product_without_address',
-            'reserved_order_id'
-        );
-        $anotherCustomerQuote->setCustomerId(2);
-        $this->quoteResource->save($anotherCustomerQuote);
-
-        $anotherCustomerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$anotherCustomerQuote->getId());
-        $anotherCustomerQuoteItemId = (int)$anotherCustomerQuote
-            ->getItemByProduct($this->productRepository->get('virtual-product'))
-            ->getId();
-
-        $this->expectExceptionMessage(
-            "The current user cannot perform operations on cart \"$anotherCustomerQuoteMaskedId\""
-        );
-
-        $query = $this->prepareMutationQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId);
+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
@@ -240,12 +134,77 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         ];
     }
 
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     */
+    public function testRemoveItemIfItemIsNotBelongToCart()
+    {
+        $firstQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $secondQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
+            'test_order_with_virtual_product',
+            'virtual-product'
+        );
+
+        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+
+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemFromGuestCart()
+    {
+        $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $guestQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
+        );
+
+        $query = $this->getQuery($guestQuoteMaskedId, $guestQuoteItemId);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemFromAnotherCustomerCart()
+    {
+        $anotherCustomerQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $anotherCustomerQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
+            'test_quote',
+            'simple_product'
+        );
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$anotherCustomerQuoteMaskedId\""
+        );
+
+        $query = $this->getQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param int $itemId
      * @return string
      */
-    private function prepareMutationQuery(string $maskedQuoteId, int $itemId): string
+    private function getQuery(string $maskedQuoteId, int $itemId): string
     {
         return <<<QUERY
 mutation {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php
new file mode 100644
index 0000000000000..6f027babc0e27
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\QuoteFactory;
+
+/**
+ * Get quote item id by reserved order id and product sku
+ */
+class GetQuoteItemIdByReservedQuoteIdAndSku
+{
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @param QuoteFactory $quoteFactory
+     * @param QuoteResource $quoteResource
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(
+        QuoteFactory $quoteFactory,
+        QuoteResource $quoteResource,
+        ProductRepositoryInterface $productRepository
+    ) {
+        $this->quoteFactory = $quoteFactory;
+        $this->quoteResource = $quoteResource;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Get quote item id by reserved order id and product sku
+     *
+     * @param string $reservedOrderId
+     * @param string $sku
+     * @return int
+     * @throws NoSuchEntityException
+     */
+    public function execute(string $reservedOrderId, string $sku): int
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $product = $this->productRepository->get($sku);
+
+        return (int)$quote->getItemByProduct($product)->getId();
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
index a306b29e51197..294230c658aa0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
@@ -7,10 +7,8 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteItemIdByReservedQuoteIdAndSku;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -20,45 +18,35 @@
 class RemoveItemFromCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var QuoteFactory
+     * @var GetQuoteItemIdByReservedQuoteIdAndSku
      */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
+    private $getQuoteItemIdByReservedQuoteIdAndSku;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getQuoteItemIdByReservedQuoteIdAndSku = $objectManager->get(
+            GetQuoteItemIdByReservedQuoteIdAndSku::class
+        );
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveItemFromCart()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $itemId);
+        $query = $this->getQuery($maskedQuoteId, $itemId);
         $response = $this->graphQlQuery($query);
 
         $this->assertArrayHasKey('removeItemFromCart', $response);
@@ -72,69 +60,23 @@ public function testRemoveItemFromCart()
      */
     public function testRemoveItemFromNonExistentCart()
     {
-        $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
+        $query = $this->getQuery('non_existent_masked_id', 1);
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveNonExistentItem()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $notExistentItemId = 999;
 
         $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $notExistentItemId);
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * Test mutation is only able to remove quote item belonging to the requested cart
-     *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-     */
-    public function testRemoveItemIfItemIsNotBelongToCart()
-    {
-        $firstQuote = $this->quoteFactory->create();
-        $this->quoteResource->load($firstQuote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-        $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
-
-        $secondQuote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $secondQuote,
-            'test_order_with_virtual_product_without_address',
-            'reserved_order_id'
-        );
-        $secondQuoteItemId = (int)$secondQuote
-            ->getItemByProduct($this->productRepository->get('virtual-product'))
-            ->getId();
-
-        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
-
-        $query = $this->prepareMutationQuery($firstQuoteMaskedId, $secondQuoteItemId);
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * Test mutation is only able to remove quote item belonging to the requested cart
-     *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     */
-    public function testRemoveItemFromCustomerCart()
-    {
-        $customerQuote = $this->quoteFactory->create();
-        $this->quoteResource->load($customerQuote, 'test_order_1', 'reserved_order_id');
-        $customerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$customerQuote->getId());
-        $customerQuoteItemId = (int)$customerQuote->getItemByProduct($this->productRepository->get('simple'))->getId();
-
-        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
-
-        $query = $this->prepareMutationQuery($customerQuoteMaskedId, $customerQuoteItemId);
+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
         $this->graphQlQuery($query);
     }
 
@@ -181,12 +123,51 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         ];
     }
 
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
+    public function testRemoveItemIfItemIsNotBelongToCart()
+    {
+        $firstQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $secondQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
+            'test_order_with_virtual_product_without_address',
+            'virtual-product'
+        );
+
+        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+
+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemFromCustomerCart()
+    {
+        $customerQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $customerQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
+
+        $query = $this->getQuery($customerQuoteMaskedId, $customerQuoteItemId);
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param int $itemId
      * @return string
      */
-    private function prepareMutationQuery(string $maskedQuoteId, int $itemId): string
+    private function getQuery(string $maskedQuoteId, int $itemId): string
     {
         return <<<QUERY
 mutation {

From fa079c94c9c0a6d3cd7d9dca3b52d3394de50934 Mon Sep 17 00:00:00 2001
From: Riccardo Tempesta <riccardo.tempesta@gmail.com>
Date: Fri, 29 Mar 2019 18:20:33 +0100
Subject: [PATCH 1010/1055] FIX for issue #21916 - Elasticsearch6 generation
 does not exist Magento was not checking concrete class while applying
 plugins, this commit prevents virtual types to be autogenerated

---
 .../Magento/Framework/Code/Generator.php      | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index 4dec7d1a28146..ba4213f398008 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -8,6 +8,7 @@
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\EntityAbstract;
 use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
 use Magento\Framework\Filesystem\Driver\File;
@@ -232,7 +233,21 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re
     {
         if (!$resultEntityType || !$sourceClassName) {
             return self::GENERATION_ERROR;
-        } elseif ($this->definedClasses->isClassLoadableFromDisk($resultClass)) {
+        }
+
+        /** @var ConfigInterface $omConfig */
+        $omConfig = $this->objectManager->get(ConfigInterface::class);
+        $virtualTypes = $omConfig->getVirtualTypes();
+
+        /**
+         * Do not try to autogenerate virtual types
+         * For example virtual types with names overlapping autogenerated suffixes
+         */
+        if (isset($virtualTypes[$resultClass])) {
+            return self::GENERATION_SKIP;
+        }
+
+        if ($this->definedClasses->isClassLoadableFromDisk($resultClass)) {
             $generatedFileName = $this->_ioObject->generateResultFileName($resultClass);
             /**
              * Must handle two edge cases: a competing process has generated the class and written it to disc already,
@@ -244,9 +259,12 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re
                 $this->_ioObject->includeFile($generatedFileName);
             }
             return self::GENERATION_SKIP;
-        } elseif (!isset($this->_generatedEntities[$resultEntityType])) {
+        }
+
+        if (!isset($this->_generatedEntities[$resultEntityType])) {
             throw new \InvalidArgumentException('Unknown generation entity.');
         }
+
         return false;
     }
 }

From b946dd0eae58d0cc0ccb9bb5e6be6b8aea4b7a77 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 12:18:28 -0500
Subject: [PATCH 1011/1055] GraphQL-540: Replace deprecated
 Magento/Checkout/_files/quote_with_address_saved.php fixture in
 SetUpsShippingMethodsOnCartTest

---
 .../Ups/SetUpsShippingMethodsOnCartTest.php   | 49 ++++++++++---------
 .../Ups/_files/enable_ups_shipping_method.php |  1 +
 .../enable_ups_shipping_method_rollback.php   |  1 +
 3 files changed, 29 insertions(+), 22 deletions(-)
 rename dev/tests/integration/testsuite/Magento/{ => GraphQl}/Ups/_files/enable_ups_shipping_method.php (87%)
 rename dev/tests/integration/testsuite/Magento/{ => GraphQl}/Ups/_files/enable_ups_shipping_method_rollback.php (84%)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index 838017b3455df..a46cf6f0e16b7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -55,39 +55,44 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      *
-     * @param string $carrierMethodCode
-     * @param string $carrierMethodLabel
+     * @param string $methodCode
+     * @param string $methodLabel
      * @dataProvider availableForCartShippingMethods
      */
-    public function testSetAvailableForCartUpsShippingMethod(string $carrierMethodCode, string $carrierMethodLabel)
+    public function testSetAvailableUpsShippingMethodOnCart(string $methodCode, string $methodLabel)
     {
         $quoteReservedId = 'test_quote';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $shippingAddressId,
-            self::CARRIER_CODE,
-            $carrierMethodCode
-        );
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
+        $response = $this->graphQlQuery($query);
 
-        $response = $this->sendRequestWithToken($query);
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
 
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        $expectedResult = [
-            'carrier_code' => self::CARRIER_CODE,
-            'method_code' => $carrierMethodCode,
-            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
-        ];
-        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
@@ -96,7 +101,7 @@ public function testSetAvailableForCartUpsShippingMethod(string $carrierMethodCo
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      *
      * @param string $carrierMethodCode
      * @param string $carrierMethodLabel
diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method.php b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
similarity index 87%
rename from dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method.php
rename to dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
index 5c6c60866fafb..ffdc215d50a68 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
 declare(strict_types=1);
 
 use Magento\Framework\App\Config\Storage\Writer;
diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method_rollback.php
similarity index 84%
rename from dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php
rename to dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method_rollback.php
index 6d7894879f97b..243ec0217a0bb 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/_files/enable_ups_shipping_method_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Ups/_files/enable_ups_shipping_method_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// TODO: Should be removed in scope of https://github.com/magento/graphql-ce/issues/167
 declare(strict_types=1);
 
 use Magento\Framework\App\Config\Storage\Writer;

From fd0ebf8c075d13ec72385c3bc7b7860146af3a07 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 13:05:06 -0500
Subject: [PATCH 1012/1055] GraphQL-479: [Test Coverage] 'ApplyCouponToCart'
 functionality

---
 .../Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index 885e8705dc3d9..486f7cd0c27a7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -110,6 +110,7 @@ public function testApplyCouponToGuestCart()
     }
 
     /**
+     * _security
      * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php

From c11b10bbfeccd8f142cec31495d944bd7f94b9c5 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 13:31:29 -0500
Subject: [PATCH 1013/1055] GraphQL-512: 'address.street' needs refactoring to
 support as many lines as defined by admin

---
 .../Model/Cart/QuoteAddress/Validator.php     | 45 -------------------
 .../Model/Cart/QuoteAddressFactory.php        | 19 +++++++-
 .../Customer/SetBillingAddressOnCartTest.php  |  2 +-
 .../Customer/SetShippingAddressOnCartTest.php |  2 +-
 .../Guest/SetBillingAddressOnCartTest.php     |  2 +-
 .../Guest/SetShippingAddressOnCartTest.php    |  2 +-
 6 files changed, 22 insertions(+), 50 deletions(-)
 delete mode 100644 app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php
deleted file mode 100644
index 8cf2478d8f8b6..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\QuoteGraphQl\Model\Cart\QuoteAddress;
-
-use Magento\Customer\Helper\Address as AddressHelper;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
-
-/**
- * Validate Quote Address
- */
-class Validator
-{
-    /**
-     * @var AddressHelper
-     */
-    private $addressHelper;
-
-    /**
-     * @param AddressHelper $addressHelper
-     */
-    public function __construct(AddressHelper $addressHelper)
-    {
-        $this->addressHelper = $addressHelper;
-    }
-
-    /**
-     * Additional Quote Address validation for the GraphQl endpoint
-     *
-     * @param QuoteAddress $quoteAddress
-     * @throws GraphQlInputException
-     */
-    public function validate(QuoteAddress $quoteAddress)
-    {
-        $maxAllowedLineCount = $this->addressHelper->getStreetLines();
-        if (is_array($quoteAddress->getStreet()) && count($quoteAddress->getStreet()) > $maxAllowedLineCount) {
-            throw new GraphQlInputException(__('"Street Address" cannot contain more than %1 lines.', $maxAllowedLineCount));
-        }
-    }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
index 582055bc6e13d..13d6a1d3dce70 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -7,6 +7,7 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
@@ -30,16 +31,24 @@ class QuoteAddressFactory
      */
     private $getCustomerAddress;
 
+    /**
+     * @var AddressHelper
+     */
+    private $addressHelper;
+
     /**
      * @param BaseQuoteAddressFactory $quoteAddressFactory
      * @param GetCustomerAddress $getCustomerAddress
+     * @param AddressHelper $addressHelper
      */
     public function __construct(
         BaseQuoteAddressFactory $quoteAddressFactory,
-        GetCustomerAddress $getCustomerAddress
+        GetCustomerAddress $getCustomerAddress,
+        AddressHelper $addressHelper
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
         $this->getCustomerAddress = $getCustomerAddress;
+        $this->addressHelper = $addressHelper;
     }
 
     /**
@@ -47,11 +56,19 @@ public function __construct(
      *
      * @param array $addressInput
      * @return QuoteAddress
+     * @throws GraphQlInputException
      */
     public function createBasedOnInputData(array $addressInput): QuoteAddress
     {
         $addressInput['country_id'] = $addressInput['country_code'] ?? '';
 
+        $maxAllowedLineCount = $this->addressHelper->getStreetLines();
+        if (is_array($addressInput['street']) && count($addressInput['street']) > $maxAllowedLineCount) {
+            throw new GraphQlInputException(
+                __('"Street Address" cannot contain more than %1 lines.', $maxAllowedLineCount)
+            );
+        }
+
         $quoteAddress = $this->quoteAddressFactory->create();
         $quoteAddress->addData($addressInput);
         return $quoteAddress;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index f5bc6276b10e8..b7b6fb5851666 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -495,7 +495,7 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index f731ff5b89db2..0756ba6aeaf22 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -488,7 +488,7 @@ public function testSetMultipleNewShippingAddresses()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 421dbeb813a4c..d253b6f39b0db 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -314,7 +314,7 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index 38a835ba89232..a6981e11799fb 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -247,7 +247,7 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */

From c4acbfffb4f4b9b201a9f1488160e6442affda24 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 14:14:48 -0500
Subject: [PATCH 1014/1055] GraphQL-470: Creating/getting Cart queries should
 support Store context

---
 .../Model/Cart/GetCartForUser.php             |   2 +-
 .../Quote/Customer/CreateEmptyCartTest.php    | 118 ++++++++++++------
 .../Quote/Guest/CreateEmptyCartTest.php       |  85 ++++++++++---
 3 files changed, 150 insertions(+), 55 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index ea86dca06271a..3506ffc8c8792 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -85,7 +85,7 @@ public function execute(string $cartHash, ?int $customerId): Quote
         }
 
         if ((int)$cart->getStoreId() !== (int)$this->storeManager->getStore()->getId()) {
-            throw new GraphQlAuthorizationException(
+            throw new GraphQlNoSuchEntityException(
                 __(
                     'Wrong store code specified for cart "%masked_cart_id"',
                     ['masked_cart_id' => $cartHash]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
index 7539945456530..86b0d3010c0e3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
@@ -7,8 +7,11 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Quote\Api\GuestCartRepositoryInterface;
@@ -29,16 +32,39 @@ class CreateEmptyCartTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var ResourceConnection
+     * @var QuoteResource
      */
-    private $resourceConnection;
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var string
+     */
+    private $maskedQuoteId;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->resourceConnection = $objectManager->get(ResourceConnection::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->maskedQuoteIdToQuoteId = $objectManager->get(MaskedQuoteIdToQuoteIdInterface::class);
+        $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
     }
 
     /**
@@ -46,27 +72,18 @@ protected function setUp()
      */
     public function testCreateEmptyCart()
     {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
-
-        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $query = $this->getQuery();
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMapWithCustomerToken());
 
         self::assertArrayHasKey('createEmptyCart', $response);
+        self::assertNotEmpty($response['createEmptyCart']);
 
-        $maskedCartId = $response['createEmptyCart'];
-        $guestCart = $this->guestCartRepository->get($maskedCartId);
+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+        $this->maskedQuoteId = $response['createEmptyCart'];
 
         self::assertNotNull($guestCart->getId());
         self::assertEquals(1, $guestCart->getCustomer()->getId());
-        self::assertSame('default', $guestCart->getStore()->getCode());
-
-        $this->deleteCreatedQuote($guestCart->getId());
+        self::assertEquals('default', $guestCart->getStore()->getCode());
     }
 
     /**
@@ -75,40 +92,63 @@ public function testCreateEmptyCart()
      */
     public function testCreateEmptyCartWithNotDefaultStore()
     {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
-
-        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken, 'Store' => 'fixture_second_store'];
+        $query = $this->getQuery();
 
+        $headerMap = $this->getHeaderMapWithCustomerToken();
+        $headerMap['Store'] = 'fixture_second_store';
         $response = $this->graphQlQuery($query, [], '', $headerMap);
 
         self::assertArrayHasKey('createEmptyCart', $response);
+        self::assertNotEmpty($response['createEmptyCart']);
 
-        $maskedCartId = $response['createEmptyCart'];
         /* guestCartRepository is used for registered customer to get the cart hash */
-        $guestCart = $this->guestCartRepository->get($maskedCartId);
+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+        $this->maskedQuoteId = $response['createEmptyCart'];
 
         self::assertNotNull($guestCart->getId());
         self::assertEquals(1, $guestCart->getCustomer()->getId());
-        self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
+        self::assertEquals('fixture_second_store', $guestCart->getStore()->getCode());
+    }
 
-        $this->deleteCreatedQuote($guestCart->getId());
+    /**
+     * @return string
+     */
+    private function getQuery(): string
+    {
+        return <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
     }
 
     /**
-     * Delete active quote for customer by customer id.
-     * This is needed to have ability to create new quote for another store and not return the active one.
-     * @see QuoteManagement::createCustomerCart
-     *
-     * @param $quoteId
+     * @param string $username
+     * @param string $password
+     * @return array
      */
-    private function deleteCreatedQuote($quoteId)
+    private function getHeaderMapWithCustomerToken(
+        string $username = 'customer@example.com',
+        string $password = 'password'
+    ): array {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+
+    public function tearDown()
     {
-        $connection = $this->resourceConnection->getConnection();
-        $connection->query('DELETE FROM quote WHERE entity_id = ' . $quoteId);
+        if (null !== $this->maskedQuoteId) {
+            $quoteId = $this->maskedQuoteIdToQuoteId->execute($this->maskedQuoteId);
+
+            $quote = $this->quoteFactory->create();
+            $this->quoteResource->load($quote, $quoteId);
+            $this->quoteResource->delete($quote);
+
+            $quoteIdMask = $this->quoteIdMaskFactory->create();
+            $quoteIdMask->setQuoteId($quoteId)
+                ->delete();
+        }
+        parent::tearDown();
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
index b283e7ef721a8..fe46a1edcdf1a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
@@ -7,6 +7,10 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Quote\Api\GuestCartRepositoryInterface;
@@ -21,28 +25,55 @@ class CreateEmptyCartTest extends GraphQlAbstract
      */
     private $guestCartRepository;
 
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var string
+     */
+    private $maskedQuoteId;
+
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->maskedQuoteIdToQuoteId = $objectManager->get(MaskedQuoteIdToQuoteIdInterface::class);
+        $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
     }
 
     public function testCreateEmptyCart()
     {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
+        $query = $this->getQuery();
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('createEmptyCart', $response);
+        self::assertNotEmpty($response['createEmptyCart']);
 
-        $maskedCartId = $response['createEmptyCart'];
-        $guestCart = $this->guestCartRepository->get($maskedCartId);
+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+        $this->maskedQuoteId = $response['createEmptyCart'];
 
         self::assertNotNull($guestCart->getId());
         self::assertNull($guestCart->getCustomer()->getId());
+        self::assertEquals('default', $guestCart->getStore()->getCode());
     }
 
     /**
@@ -50,22 +81,46 @@ public function testCreateEmptyCart()
      */
     public function testCreateEmptyCartWithNotDefaultStore()
     {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
+        $query = $this->getQuery();
         $headerMap = ['Store' => 'fixture_second_store'];
-
         $response = $this->graphQlQuery($query, [], '', $headerMap);
 
         self::assertArrayHasKey('createEmptyCart', $response);
+        self::assertNotEmpty($response['createEmptyCart']);
 
-        $maskedCartId = $response['createEmptyCart'];
-        $guestCart = $this->guestCartRepository->get($maskedCartId);
+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+        $this->maskedQuoteId = $response['createEmptyCart'];
 
         self::assertNotNull($guestCart->getId());
         self::assertNull($guestCart->getCustomer()->getId());
         self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
     }
+
+    /**
+     * @return string
+     */
+    private function getQuery(): string
+    {
+        return <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+    }
+
+    public function tearDown()
+    {
+        if (null !== $this->maskedQuoteId) {
+            $quoteId = $this->maskedQuoteIdToQuoteId->execute($this->maskedQuoteId);
+
+            $quote = $this->quoteFactory->create();
+            $this->quoteResource->load($quote, $quoteId);
+            $this->quoteResource->delete($quote);
+
+            $quoteIdMask = $this->quoteIdMaskFactory->create();
+            $quoteIdMask->setQuoteId($quoteId)
+                ->delete();
+        }
+        parent::tearDown();
+    }
 }

From 722afe3c9fe5c44783a54ae1b9d7feac33542d07 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 15:08:33 -0500
Subject: [PATCH 1015/1055] GraphQL-512: 'address.street' needs refactoring to
 support as many lines as defined by admin

---
 .../Magento/GraphQl/Customer/CreateCustomerAddressTest.php     | 3 +++
 1 file changed, 3 insertions(+)

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 4ea19f08e3c1c..264a2c7de4783 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -13,6 +13,9 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 
+/**
+ * Create customer address tests
+ */
 class CreateCustomerAddressTest extends GraphQlAbstract
 {
     /**

From 9a4ff36ec163899b781efa6e52033ea1902dc166 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 17:07:12 -0500
Subject: [PATCH 1016/1055] GraphQL-470: Creating/getting Cart queries should
 support Store context

---
 .../Magento/GraphQl/Quote/Customer/GetCartTest.php   | 12 ++++++------
 .../Magento/GraphQl/Quote/Guest/GetCartTest.php      | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index 8201c60144b15..19b72b9e3ca4c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -129,8 +129,8 @@ public function testGetInactiveCart()
      */
     public function testGetCartWithNotDefaultStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = $this->getHeaderMap();
         $headerMap['Store'] = 'fixture_second_store';
@@ -150,8 +150,8 @@ public function testGetCartWithNotDefaultStore()
      */
     public function testGetCartWithWrongStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = $this->getHeaderMap();
         $headerMap['Store'] = 'fixture_second_store';
@@ -167,8 +167,8 @@ public function testGetCartWithWrongStore()
      */
     public function testGetCartWithNotExistingStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = $this->getHeaderMap();
         $headerMap['Store'] = 'not_existing_store';
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 2b2ea4179ed02..832e15058a4ee 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -102,8 +102,8 @@ public function testGetInactiveCart()
      */
     public function testGetCartWithNotDefaultStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store_guest');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store_guest');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = ['Store' => 'fixture_second_store'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -121,8 +121,8 @@ public function testGetCartWithNotDefaultStore()
      */
     public function testGetCartWithWrongStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = ['Store' => 'fixture_second_store'];
         $this->graphQlQuery($query, [], '', $headerMap);
@@ -137,10 +137,10 @@ public function testGetCartWithWrongStore()
      */
     public function testGetCartWithNotExistingStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store_guest');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store_guest');
 
         $headerMap['Store'] = 'not_existing_store';
-        $query = $this->getCartQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->graphQlQuery($query, [], '', $headerMap);
     }

From 3f0530a6d408a2978397550570c2cffe5c5786ce Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 9 Apr 2019 00:22:07 -0500
Subject: [PATCH 1017/1055] GraphQL-479: [Test Coverage] 'ApplyCouponToCart'
 functionality

---
 .../Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php     | 1 +
 .../Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index 486f7cd0c27a7..f0d9400b1866b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -174,6 +174,7 @@ public function testApplyCouponToNonExistentCart()
      */
     public function testApplyExpiredCoupon()
     {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/574');
         $couponCode = '2?ds5!2d';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
index 4fd1c713db5d4..045a28834e0dd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -139,6 +139,7 @@ public function testApplyCouponToNonExistentCart()
      */
     public function testApplyExpiredCoupon()
     {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/574');
         $couponCode = '2?ds5!2d';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);

From cc4b444f42e281c1899cebb6aafb9c8dd63b38c9 Mon Sep 17 00:00:00 2001
From: Ansari <ziyaurrahman@krishtechnolabs.com>
Date: Tue, 9 Apr 2019 14:31:45 +0530
Subject: [PATCH 1018/1055] Spelling Correction

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b86c7b79a0cbd..9d15fe00b54f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4136,7 +4136,7 @@ Tests:
   * Moved Multishipping functionality to newly created module Multishipping
   * Extracted Product duplication behavior from Product model to Product\Copier model
   * Replaced event "catalog_model_product_duplicate" with composite Product\Copier model
-  * Replaced event "catalog_product_prepare_save" with controller product initialization helper that can be customozed via plugins
+  * Replaced event "catalog_product_prepare_save" with controller product initialization helper that can be customized via plugins
   * Consolidated Authorize.Net functionality in single module Authorizenet
   * Eliminated dependency of Sales module on Shipping and Usa modules
   * Eliminated dependency of Shipping module on Customer module

From 4b44e4a3f21e1b484e661e9de66dab7afa5e4bf7 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 9 Apr 2019 09:45:03 -0500
Subject: [PATCH 1019/1055] MC-15734: Create new GraphQL script for our
 benchmark - part 2

---
 setup/performance-toolkit/benchmark.jmx | 474 +++++++++++++++++++++++-
 1 file changed, 470 insertions(+), 4 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 2035da9d58265..31ccf845a625d 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -39866,13 +39866,13 @@ vars.putObject("randomIntGenerator", random);
       </BeanShellSampler>
       <hashTree/>
     
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
       <stringProp name="BeanShellSampler.query">
 import java.util.Random;
 
 Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("simple_products_list").size());
-product = props.get("simple_products_list").get(number);
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
 
 vars.put("product_url_key", product.get("url_key"));
 vars.put("product_id", product.get("id"));
@@ -39883,7 +39883,7 @@ vars.put("product_sku", product.get("sku"));
       <stringProp name="BeanShellSampler.filename"/>
       <stringProp name="BeanShellSampler.parameters"/>
       <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
     <hashTree/>
   
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Search by product_name" enabled="true">
@@ -40782,6 +40782,239 @@ vars.put("product_sku", product.get("sku"));
       <hashTree/>
     </hashTree>
   
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update Simple Product qty In Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  updateCartItems(input: {\n    cart_id: \"${quote_id}\"\n    cart_items: [\n      {\n        cart_item_id: ${item_id}\n        quantity: 5\n      }\n    ]\n  }) {\n    cart {\n      items {\n        id\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/update_simple_product_qty_in_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="664196114">{"data":{"updateCartItems":{"cart":{"items":[{"id":"${item_id}","qty":5}]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Billing Address On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"test region\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        address_type\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_billing_address_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1147076914">{"data":{"setBillingAddressOnCart":{"cart":{"billing_address":{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"},"address_type":"BILLING"}}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Address On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"test region\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        address_type\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_address_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1671866339">{"data":{"setShippingAddressesOnCart":{"cart":{"shipping_addresses":[{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"},"address_type":"SHIPPING"}]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Payment Method On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setPaymentMethodOnCart(input: {\n    cart_id: \"${quote_id}\", \n    payment_method: {\n      code: \"checkmo\"\n    }\n  }) {\n    cart {\n      selected_payment_method {\n        code\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_payment_method_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1830199373">{"data":{"setPaymentMethodOnCart":{"cart":{"selected_payment_method":{"code":"checkmo"}}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Current Shipping Address" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    shipping_addresses {\n      address_id\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_current_shipping_address.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">address_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.shipping_addresses[0].address_id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Method On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingMethodsOnCart(input: \n    {\n      cart_id: \"${quote_id}\", \n      shipping_methods: [{\n        cart_address_id: ${address_id}\n        carrier_code: \"flatrate\"\n        method_code: \"flatrate\"\n      }]\n    }) {\n    cart {\n      shipping_addresses {\n        selected_shipping_method {\n          carrier_code\n          method_code\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_method_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="644143859">{"data":{"setShippingMethodsOnCart":{"cart":{"shipping_addresses":[{"selected_shipping_method":{"carrier_code":"flatrate","method_code":"flatrate"}}]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Simple Product From Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
@@ -41070,6 +41303,239 @@ vars.put("product_sku", product.get("sku"));
       <hashTree/>
     </hashTree>
   
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update Configurable Product qty In Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  updateCartItems(input: {\n    cart_id: \"${quote_id}\"\n    cart_items: [\n      {\n        cart_item_id: ${item_id}\n        quantity: 5\n      }\n    ]\n  }) {\n    cart {\n      items {\n        id\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/update_configurable_product_qty_in_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="664196114">{"data":{"updateCartItems":{"cart":{"items":[{"id":"${item_id}","qty":5}]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Billing Address On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"test region\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        address_type\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_billing_address_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1147076914">{"data":{"setBillingAddressOnCart":{"cart":{"billing_address":{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"},"address_type":"BILLING"}}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Address On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"test region\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        address_type\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_address_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1671866339">{"data":{"setShippingAddressesOnCart":{"cart":{"shipping_addresses":[{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"},"address_type":"SHIPPING"}]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Payment Method On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setPaymentMethodOnCart(input: {\n    cart_id: \"${quote_id}\", \n    payment_method: {\n      code: \"checkmo\"\n    }\n  }) {\n    cart {\n      selected_payment_method {\n        code\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_payment_method_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1830199373">{"data":{"setPaymentMethodOnCart":{"cart":{"selected_payment_method":{"code":"checkmo"}}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Current Shipping Address" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    shipping_addresses {\n      address_id\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_current_shipping_address.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">address_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.shipping_addresses[0].address_id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Method On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingMethodsOnCart(input: \n    {\n      cart_id: \"${quote_id}\", \n      shipping_methods: [{\n        cart_address_id: ${address_id}\n        carrier_code: \"flatrate\"\n        method_code: \"flatrate\"\n      }]\n    }) {\n    cart {\n      shipping_addresses {\n        selected_shipping_method {\n          carrier_code\n          method_code\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_method_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="644143859">{"data":{"setShippingMethodsOnCart":{"cart":{"shipping_addresses":[{"selected_shipping_method":{"carrier_code":"flatrate","method_code":"flatrate"}}]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Configurable Product From Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">

From 288dec36c94dc7372ccb540095434cab815607f1 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 9 Apr 2019 10:11:43 -0500
Subject: [PATCH 1020/1055] 229: [GraphQL caching] Add support for queries via
 HTTP GET

---
 .../CatalogInventory/AddProductToCartTest.php |  3 +++
 .../Customer/ChangeCustomerPasswordTest.php   |  3 +++
 .../Customer/CreateCustomerAddressTest.php    |  2 +-
 .../Customer/DeleteCustomerAddressTest.php    |  3 +++
 .../Customer/SubscriptionStatusTest.php       |  3 +++
 .../Customer/UpdateCustomerAddressTest.php    |  3 +++
 .../GraphQl/Customer/UpdateCustomerTest.php   |  3 +++
 .../AddConfigurableProductToCartTest.php      |  3 +++
 .../Quote/AddSimpleProductToCartTest.php      |  3 +++
 .../Quote/Customer/ApplyCouponToCartTest.php  | 22 +++++++++----------
 .../GraphQl/Quote/Customer/PlaceOrderTest.php | 18 +++++++--------
 .../Customer/RemoveCouponFromCartTest.php     | 12 +++++-----
 .../Customer/SetBillingAddressOnCartTest.php  |  2 +-
 .../Customer/SetShippingAddressOnCartTest.php |  2 +-
 .../Quote/Guest/ApplyCouponToCartTest.php     | 20 ++++++++---------
 .../Quote/Guest/RemoveCouponFromCartTest.php  | 10 ++++-----
 .../Guest/SetBillingAddressOnCartTest.php     |  2 +-
 .../Guest/SetShippingAddressOnCartTest.php    |  2 +-
 .../GraphQl/SendFriend/SendFriendTest.php     |  6 ++++-
 .../Vault/CustomerPaymentTokensTest.php       |  3 +++
 20 files changed, 78 insertions(+), 47 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
index 0e7ada49dfd38..6616b40257f7d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -13,6 +13,9 @@
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 
+/**
+ * Test for adding products to cart
+ */
 class AddProductToCartTest extends GraphQlAbstract
 {
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
index d147229f55a2d..ab6a1d4b464dd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
@@ -14,6 +14,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
+/**
+ * Test change customer password
+ */
 class ChangeCustomerPasswordTest extends GraphQlAbstract
 {
     /**
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 eb5dc9e371dcf..891c74ca3c1e2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -264,7 +264,7 @@ public function testCreateCustomerAddressWithRedundantStreetLine()
         $password = 'password';
 
         self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
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 c25d8a7183514..bdfd428a78c20 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
@@ -13,6 +13,9 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 
+/**
+ * Delete customer address tests
+ */
 class DeleteCustomerAddressTest extends GraphQlAbstract
 {
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
index 6d9782dae87d4..2b54c97cd1e97 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
@@ -12,6 +12,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
+/**
+ * Tests for subscription status
+ */
 class SubscriptionStatusTest extends GraphQlAbstract
 {
     /**
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 bfb07ccf4149c..e7a7eda2897b2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -14,6 +14,9 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 
+/**
+ * Update customer address tests
+ */
 class UpdateCustomerAddressTest extends GraphQlAbstract
 {
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
index d4f8053826bcf..08933f47191b9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
@@ -13,6 +13,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
+/**
+ * Tests for update customer
+ */
 class UpdateCustomerTest extends GraphQlAbstract
 {
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php
index d8df8db800d8c..f585469177bcd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php
@@ -13,6 +13,9 @@
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 
+/**
+ * Add configurable product to cart tests
+ */
 class AddConfigurableProductToCartTest extends GraphQlAbstract
 {
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
index 4334a3d6785d6..65ed38ae90f5b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
@@ -13,6 +13,9 @@
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 
+/**
+ * Add simple product to cart tests
+ */
 class AddSimpleProductToCartTest extends GraphQlAbstract
 {
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index f0d9400b1866b..5a2221a184294 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -47,7 +47,7 @@ public function testApplyCouponToCart()
         $couponCode = '2?ds5!2d';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('applyCouponToCart', $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
@@ -67,12 +67,12 @@ public function testApplyCouponTwice()
         $couponCode = '2?ds5!2d';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey("applyCouponToCart", $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -89,7 +89,7 @@ public function testApplyCouponToCartWithoutItems()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -106,7 +106,7 @@ public function testApplyCouponToGuestCart()
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -125,7 +125,7 @@ public function testApplyCouponToAnotherCustomerCart()
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer_two@example.com'));
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer_two@example.com'));
     }
 
     /**
@@ -142,7 +142,7 @@ public function testApplyNonExistentCouponToCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -159,7 +159,7 @@ public function testApplyCouponToNonExistentCart()
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -179,7 +179,7 @@ public function testApplyExpiredCoupon()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -200,7 +200,7 @@ public function testApplyCouponWhichIsNotApplicable()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -226,7 +226,7 @@ public function testApplyCouponWithMissedRequiredParameters(string $input, strin
 QUERY;
 
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
index 4220f8932caa1..b7d3b546ba194 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
@@ -77,7 +77,7 @@ public function testPlaceOrder()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
 
         $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
@@ -98,7 +98,7 @@ public function testPlaceOrderWithNoItemsInCart()
             'Unable to place order: A server error stopped your order from being placed. ' .
             'Please try to place your order again'
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -116,7 +116,7 @@ public function testPlaceOrderWithNoShippingAddress()
         self::expectExceptionMessage(
             'Unable to place order: Some addresses can\'t be used due to the configurations for specific countries'
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -135,7 +135,7 @@ public function testPlaceOrderWithNoShippingMethod()
         self::expectExceptionMessage(
             'Unable to place order: The shipping method is missing. Select the shipping method and try again'
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -156,7 +156,7 @@ public function testPlaceOrderWithNoBillingAddress()
         self::expectExceptionMessageRegExp(
             '/Unable to place order: Please check the billing address information*/'
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -176,7 +176,7 @@ public function testPlaceOrderWithNoPaymentMethod()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessage('Unable to place order: Enter a valid payment method and try again');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -197,7 +197,7 @@ public function testPlaceOrderWithOutOfStockProduct()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessage('Unable to place order: Some of the products are out of stock');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -220,7 +220,7 @@ public function testPlaceOrderOfGuestCart()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -243,7 +243,7 @@ public function testPlaceOrderOfAnotherCustomerCart()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
index feba8c5c64259..ce1c85417b165 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -50,7 +50,7 @@ public function testRemoveCouponFromCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('removeCouponFromCart', $response);
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
@@ -66,7 +66,7 @@ public function testRemoveCouponFromNonExistentCart()
         $maskedQuoteId = 'non_existent_masked_id';
         $query = $this->getQuery($maskedQuoteId);
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -80,7 +80,7 @@ public function testRemoveCouponFromEmptyCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId);
 
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -94,7 +94,7 @@ public function testRemoveCouponFromCartIfCouponWasNotSet()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('removeCouponFromCart', $response);
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
@@ -115,7 +115,7 @@ public function testRemoveCouponFromGuestCart()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -132,7 +132,7 @@ public function testRemoveCouponFromAnotherCustomerCart()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 6cf2209254af9..553408880baa0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -533,7 +533,7 @@ public function testSetNewBillingAddressWithRedundantStreetLine()
 }
 QUERY;
         self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index af3ff3aab7499..6b097e028ffe5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -529,7 +529,7 @@ public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
 QUERY;
 
         self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
index 045a28834e0dd..affe36ea8617d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -38,7 +38,7 @@ public function testApplyCouponToCart()
         $couponCode = '2?ds5!2d';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('applyCouponToCart', $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
@@ -57,12 +57,12 @@ public function testApplyCouponTwice()
         $couponCode = '2?ds5!2d';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey("applyCouponToCart", $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -78,7 +78,7 @@ public function testApplyCouponToCartWithoutItems()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -95,7 +95,7 @@ public function testApplyCouponToCustomerCart()
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -111,7 +111,7 @@ public function testApplyNonExistentCouponToCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -125,7 +125,7 @@ public function testApplyCouponToNonExistentCart()
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -144,7 +144,7 @@ public function testApplyExpiredCoupon()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -164,7 +164,7 @@ public function testApplyCouponWhichIsNotApplicable()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -190,7 +190,7 @@ public function testApplyCouponWithMissedRequiredParameters(string $input, strin
 QUERY;
 
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
index edb5f9cbf267c..5adb6ce65db6f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
@@ -42,7 +42,7 @@ public function testRemoveCouponFromCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('removeCouponFromCart', $response);
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
@@ -57,7 +57,7 @@ public function testRemoveCouponFromNonExistentCart()
         $maskedQuoteId = 'non_existent_masked_id';
         $query = $this->getQuery($maskedQuoteId);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -70,7 +70,7 @@ public function testRemoveCouponFromEmptyCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId);
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -83,7 +83,7 @@ public function testRemoveCouponFromCartIfCouponWasNotSet()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('removeCouponFromCart', $response);
         self::assertNull($response['removeCouponFromCart']['cart']['applied_coupon']['code']);
@@ -104,7 +104,7 @@ public function testRemoveCouponFromCustomerCart()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 96a0fab9348de..5b0e4cfdb6c52 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -353,7 +353,7 @@ public function testSetNewBillingAddressRedundantStreetLine()
 QUERY;
 
         self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index 009d2cfbb1e55..888b0e87734b6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -287,7 +287,7 @@ public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
 }
 QUERY;
         self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
index b40a2b787fe81..ae6faae7650b9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/SendFriend/SendFriendTest.php
@@ -12,6 +12,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
+/**
+ * Tests for send email to friend
+ */
 class SendFriendTest extends GraphQlAbstract
 {
 
@@ -269,7 +272,8 @@ public function testLimitMessagesPerHour()
             "You can't send messages more than {$sendFriend->getMaxSendsToFriend()} times an hour."
         );
 
-        for ($i = 0; $i <= $sendFriend->getMaxSendsToFriend() + 1; $i++) {
+        $maxSendToFriends = $sendFriend->getMaxSendsToFriend();
+        for ($i = 0; $i <= $maxSendToFriends + 1; $i++) {
             $this->graphQlMutation($query);
         }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
index b2d89828f211f..45c82906d255d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Vault/CustomerPaymentTokensTest.php
@@ -14,6 +14,9 @@
 use Magento\Vault\Model\ResourceModel\PaymentToken as TokenResource;
 use Magento\Vault\Model\ResourceModel\PaymentToken\CollectionFactory;
 
+/**
+ * Tests for customer payment tokens
+ */
 class CustomerPaymentTokensTest extends GraphQlAbstract
 {
     /**

From 75684cadfe6231e352c959cbd0648612489b533a Mon Sep 17 00:00:00 2001
From: Riccardo Tempesta <riccardo.tempesta@gmail.com>
Date: Tue, 9 Apr 2019 18:38:04 +0200
Subject: [PATCH 1021/1055] Added test coverage for virtual types code
 generation

---
 .../Code/Test/Unit/GeneratorTest.php          | 169 +++++++++++++++---
 1 file changed, 140 insertions(+), 29 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index 9cc93f7620b1f..98700ae8917f1 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Code\Test\Unit;
 
 use Magento\Framework\Code\Generator;
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\ObjectManager\ConfigInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\ObjectManager\Code\Generator\Factory;
 use Magento\Framework\ObjectManager\Code\Generator\Proxy;
@@ -17,13 +21,14 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Code\Generator\EntityAbstract;
 use Magento\GeneratedClass\Factory as GeneratedClassFactory;
+use RuntimeException;
 
 class GeneratorTest extends TestCase
 {
     /**
      * Class name parameter value
      */
-    const SOURCE_CLASS = 'testClassName';
+    private const SOURCE_CLASS = 'testClassName';
 
     /**
      * Expected generated entities
@@ -58,6 +63,19 @@ class GeneratorTest extends TestCase
      */
     private $loggerMock;
 
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var ConfigInterface|MockObject
+     */
+    private $objectManagerConfigMock;
+
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->definedClassesMock = $this->createMock(DefinedClasses::class);
@@ -65,6 +83,12 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManagerConfigMock = $this->getMockBuilder(ConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->model = new Generator(
             $this->ioObjectMock,
@@ -78,7 +102,7 @@ protected function setUp()
         );
     }
 
-    public function testGetGeneratedEntities()
+    public function testGetGeneratedEntities(): void
     {
         $this->model = new Generator(
             $this->ioObjectMock,
@@ -91,22 +115,58 @@ public function testGetGeneratedEntities()
     /**
      * @param string $className
      * @param string $entityType
-     * @expectedException \RuntimeException
+     * @expectedException RuntimeException
      * @dataProvider generateValidClassDataProvider
      */
-    public function testGenerateClass($className, $entityType)
+    public function testGenerateClass($className, $entityType): void
     {
-        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
         $fullClassName = $className . $entityType;
+
         $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $objectManagerMock->expects($this->once())->method('create')->willReturn($entityGeneratorMock);
-        $this->model->setObjectManager($objectManagerMock);
-        $this->model->generateClass($fullClassName);
+        $this->objectManagerMock
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($entityGeneratorMock);
+
+        $this->objectManagerConfigMock
+            ->expects($this->once())
+            ->method('getVirtualTypes')
+            ->willReturn([]);
+        $this->objectManagerMock
+            ->expects($this->once())
+            ->method('get')
+            ->with(ConfigInterface::class)
+            ->willReturn($this->objectManagerConfigMock);
+        $this->model->setObjectManager($this->objectManagerMock);
+
+        $this->assertSame(
+            Generator::GENERATION_SUCCESS,
+            $this->model->generateClass(GeneratedClassFactory::class)
+        );
     }
 
-    public function testGenerateClassWithWrongName()
+    public function testShouldNotGenerateVirtualType(): void
+    {
+        $this->objectManagerConfigMock
+            ->expects($this->once())
+            ->method('getVirtualTypes')
+            ->willReturn([GeneratedClassFactory::class => GeneratedClassFactory::class]);
+        $this->objectManagerMock
+            ->expects($this->once())
+            ->method('get')
+            ->with(ConfigInterface::class)
+            ->willReturn($this->objectManagerConfigMock);
+        $this->model->setObjectManager($this->objectManagerMock);
+
+        $this->assertSame(
+            Generator::GENERATION_SKIP,
+            $this->model->generateClass(GeneratedClassFactory::class)
+        );
+    }
+
+    public function testGenerateClassWithWrongName(): void
     {
         $this->assertEquals(
             Generator::GENERATION_ERROR,
@@ -115,25 +175,42 @@ public function testGenerateClassWithWrongName()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException RuntimeException
      */
-    public function testGenerateClassWhenClassIsNotGenerationSuccess()
+    public function testGenerateClassWhenClassIsNotGenerationSuccess(): void
     {
         $expectedEntities = array_values($this->expectedEntities);
         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
-        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+
         $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $objectManagerMock->expects($this->once())->method('create')->willReturn($entityGeneratorMock);
-        $this->model->setObjectManager($objectManagerMock);
-        $this->model->generateClass($resultClassName);
+        $this->objectManagerMock
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($entityGeneratorMock);
+
+        $this->objectManagerConfigMock
+            ->expects($this->once())
+            ->method('getVirtualTypes')
+            ->willReturn([]);
+        $this->objectManagerMock
+            ->expects($this->once())
+            ->method('get')
+            ->with(ConfigInterface::class)
+            ->willReturn($this->objectManagerConfigMock);
+        $this->model->setObjectManager($this->objectManagerMock);
+
+        $this->assertSame(
+            Generator::GENERATION_SUCCESS,
+            $this->model->generateClass($resultClassName)
+        );
     }
 
     /**
      * @inheritdoc
      */
-    public function testGenerateClassWithErrors()
+    public function testGenerateClassWithErrors(): void
     {
         $expectedEntities = array_values($this->expectedEntities);
         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
@@ -148,17 +225,15 @@ public function testGenerateClassWithErrors()
             . 'directory permission is set to write --- the requested class did not generate properly, then '
             . 'you must add the generated class object to the signature of the related construct method, only.';
         $FinalErrorMessage = implode(PHP_EOL, $errorMessages) . "\n" . $mainErrorMessage;
-        $this->expectException(\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage($FinalErrorMessage);
 
-        /** @var ObjectManagerInterface|Mock $objectManagerMock */
-        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
         /** @var EntityAbstract|Mock $entityGeneratorMock */
         $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $objectManagerMock->expects($this->once())
+        $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->willReturn($entityGeneratorMock);
         $entityGeneratorMock->expects($this->once())
@@ -177,26 +252,62 @@ public function testGenerateClassWithErrors()
         $this->loggerMock->expects($this->once())
             ->method('critical')
             ->with($FinalErrorMessage);
-        $this->model->setObjectManager($objectManagerMock);
-        $this->model->generateClass($resultClassName);
+
+        $this->objectManagerConfigMock
+            ->expects($this->once())
+            ->method('getVirtualTypes')
+            ->willReturn([]);
+        $this->objectManagerMock
+            ->expects($this->once())
+            ->method('get')
+            ->with(ConfigInterface::class)
+            ->willReturn($this->objectManagerConfigMock);
+        $this->model->setObjectManager($this->objectManagerMock);
+
+        $this->assertSame(
+            Generator::GENERATION_SUCCESS,
+            $this->model->generateClass($resultClassName)
+        );
     }
 
     /**
      * @dataProvider trueFalseDataProvider
+     * @param $fileExists
      */
-    public function testGenerateClassWithExistName($fileExists)
+    public function testGenerateClassWithExistName($fileExists): void
     {
         $this->definedClassesMock->expects($this->any())
             ->method('isClassLoadableFromDisk')
             ->willReturn(true);
 
         $resultClassFileName = '/Magento/Path/To/Class.php';
-        $this->ioObjectMock->expects($this->once())->method('generateResultFileName')->willReturn($resultClassFileName);
-        $this->ioObjectMock->expects($this->once())->method('fileExists')->willReturn($fileExists);
+
+        $this->objectManagerConfigMock
+            ->expects($this->once())
+            ->method('getVirtualTypes')
+            ->willReturn([]);
+        $this->objectManagerMock
+            ->expects($this->once())
+            ->method('get')
+            ->with(ConfigInterface::class)
+            ->willReturn($this->objectManagerConfigMock);
+        $this->model->setObjectManager($this->objectManagerMock);
+
+        $this->ioObjectMock
+            ->expects($this->once())
+            ->method('generateResultFileName')
+            ->willReturn($resultClassFileName);
+        $this->ioObjectMock
+            ->expects($this->once())
+            ->method('fileExists')
+            ->willReturn($fileExists);
+
         $includeFileInvokeCount = $fileExists ? 1 : 0;
-        $this->ioObjectMock->expects($this->exactly($includeFileInvokeCount))->method('includeFile');
+        $this->ioObjectMock
+            ->expects($this->exactly($includeFileInvokeCount))
+            ->method('includeFile');
 
-        $this->assertEquals(
+        $this->assertSame(
             Generator::GENERATION_SKIP,
             $this->model->generateClass(GeneratedClassFactory::class)
         );
@@ -205,7 +316,7 @@ public function testGenerateClassWithExistName($fileExists)
     /**
      * @return array
      */
-    public function trueFalseDataProvider()
+    public function trueFalseDataProvider(): array
     {
         return [[true], [false]];
     }
@@ -215,7 +326,7 @@ public function trueFalseDataProvider()
      *
      * @return array
      */
-    public function generateValidClassDataProvider()
+    public function generateValidClassDataProvider(): array
     {
         $data = [];
         foreach ($this->expectedEntities as $generatedEntity) {

From 0135d54081229cacbf68699a12f675653c7325ad Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Tue, 9 Apr 2019 13:12:02 -0500
Subject: [PATCH 1022/1055] MC-15734: Create new GraphQL script for our
 benchmark - part 2

---
 setup/performance-toolkit/benchmark.jmx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 31ccf845a625d..cfabe613a0ea1 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -409,9 +409,9 @@
             <stringProp name="Argument.value">${__P(graphqlGetNavigationMenuByCategoryIdPercentage,0)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
-          <elementProp name="graphqlGetProductSearchByProductNamePercentage" elementType="Argument">
-            <stringProp name="Argument.name">graphqlGetProductSearchByProductNamePercentage</stringProp>
-            <stringProp name="Argument.value">${__P(graphqlGetProductSearchByProductNamePercentage,0)}</stringProp>
+          <elementProp name="graphqlGetProductDetailByProductNamePercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetProductDetailByProductNamePercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetProductDetailByProductNamePercentage,0)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="graphqlGetProductSearchByTextAndCategoryIdPercentage" elementType="Argument">
@@ -39803,11 +39803,11 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Product Search by product_name" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Product Detail by product_name" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${graphqlGetProductSearchByProductNamePercentage}</stringProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetProductDetailByProductNamePercentage}</stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
     <hashTree>
         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
@@ -39828,7 +39828,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Product Search by product_name");
+                vars.put("testLabel", "Get Product Detail by product_name");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -39886,7 +39886,7 @@ vars.put("product_sku", product.get("sku"));
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
     <hashTree/>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Search by product_name" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Detail by product_name" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
@@ -39911,7 +39911,7 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_product_search_by_product_name.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_product_detail_by_product_name.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">

From 2e01743926de7410d160aebdedd4f2ccbfdaddcf Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Wed, 10 Apr 2019 10:40:20 +0300
Subject: [PATCH 1023/1055] Use proper variables for tooltip styles on tablet
 devices

---
 .../web/css/source/module/checkout/_tooltip.less              | 4 ++--
 1 file changed, 2 insertions(+), 2 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 664726ddfd798..abc990c56f651 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
@@ -173,10 +173,10 @@
         width: 0;
     }
     .field-tooltip .field-tooltip-content::before {
-        border-bottom-color: @color-gray40;
+        border-bottom-color: @checkout-tooltip-content__border-color;
     }
     .field-tooltip .field-tooltip-content::after {
-        border-bottom-color: @color-gray-light01;
+        border-bottom-color: @checkout-tooltip-content__background-color;
         top: 1px;
     }
 }

From 457c52290ac47f24d2e1f96451a9eb383a97aeb0 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 10 Apr 2019 14:39:14 +0300
Subject: [PATCH 1024/1055] graphQl-579: added test coverage for setting
 disabled shipping method

---
 .../Quote/Customer/SetShippingMethodsOnCartTest.php       | 8 ++++++++
 .../GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php  | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 9219b5a67022c..0730423589f89 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -251,6 +251,14 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
                 }]',
                 'Could not find a cart with ID "non_existent_masked_id"'
             ],
+            'disabled_shipping_method' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "freeshipping"
+                    method_code: "freeshipping"
+                }]',
+                'Carrier with such method not found: freeshipping, freeshipping'
+            ]
         ];
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 2eac002253ff0..862f454194ece 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -270,6 +270,14 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
                 }]',
                 'Could not find a cart with ID "non_existent_masked_id"'
             ],
+            'disabled_shipping_method' => [
+                'cart_id: "cart_id_value", shipping_methods: [{
+                    cart_address_id: cart_address_id_value
+                    carrier_code: "freeshipping"
+                    method_code: "freeshipping"
+                }]',
+                'Carrier with such method not found: freeshipping, freeshipping'
+            ],
         ];
     }
 

From 3f7728250fd4a9d07582833dcd9ee47cc1bfadf9 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 10 Apr 2019 14:54:46 +0300
Subject: [PATCH 1025/1055] graphQl-580: set disabled payment method test
 coverage

---
 .../Customer/SetPaymentMethodOnCartTest.php   | 28 ++++++++++++++++---
 .../Guest/SetPaymentMethodOnCartTest.php      | 27 +++++++++++++++---
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index 73feefe2b094b..81f7c973c7d6e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -7,10 +7,12 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Exception;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\OfflinePayments\Model\Cashondelivery;
 use Magento\OfflinePayments\Model\Checkmo;
+use Magento\OfflinePayments\Model\Purchaseorder;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -66,7 +68,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
@@ -105,7 +107,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage The requested Payment Method is not available.
      */
     public function testSetNonExistentPaymentMethod()
@@ -120,7 +122,7 @@ public function testSetNonExistentPaymentMethod()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
     public function testSetPaymentOnNonExistentCart()
@@ -180,7 +182,7 @@ public function testSetPaymentMethodToAnotherCustomerCart()
      *
      * @param string $input
      * @param string $message
-     * @throws \Exception
+     * @throws Exception
      * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
      */
     public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
@@ -204,6 +206,24 @@ public function testSetPaymentMethodWithoutRequiredParameters(string $input, str
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @expectedException Exception
+     * @expectedExceptionMessage The requested Payment Method is not available.
+     */
+    public function testSetDisabledPaymentOnCart()
+    {
+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * @return array
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 879d0fd917291..8250765f9dd5d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -7,9 +7,11 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
+use Exception;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\OfflinePayments\Model\Cashondelivery;
 use Magento\OfflinePayments\Model\Checkmo;
+use Magento\OfflinePayments\Model\Purchaseorder;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -57,7 +59,7 @@ public function testSetPaymentOnCartWithSimpleProduct()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testSetPaymentOnCartWithSimpleProductAndWithoutAddress()
@@ -94,7 +96,7 @@ public function testSetPaymentOnCartWithVirtualProduct()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage The requested Payment Method is not available.
      */
     public function testSetNonExistentPaymentMethod()
@@ -107,7 +109,7 @@ public function testSetNonExistentPaymentMethod()
     }
 
     /**
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
      */
     public function testSetPaymentOnNonExistentCart()
@@ -149,7 +151,7 @@ public function testSetPaymentMethodToCustomerCart()
      * @param string $input
      * @param string $message
      * @dataProvider dataProviderSetPaymentMethodWithoutRequiredParameters
-     * @throws \Exception
+     * @throws Exception
      */
     public function testSetPaymentMethodWithoutRequiredParameters(string $input, string $message)
     {
@@ -216,6 +218,23 @@ public function testReSetPayment()
         self::assertEquals($methodCode, $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @expectedException Exception
+     * @expectedExceptionMessage The requested Payment Method is not available.
+     */
+    public function testSetDisabledPaymentOnCart()
+    {
+        $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode

From 8e40ce20f1b604d73fb43fb5a5b985316999d693 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 10 Apr 2019 15:20:50 +0300
Subject: [PATCH 1026/1055] graphQl-581: set shipping method on an empty cart
 test coverage

---
 .../Customer/SetShippingMethodsOnCartTest.php | 33 ++++++++++++++++---
 .../Guest/SetShippingMethodsOnCartTest.php    | 33 ++++++++++++++++---
 2 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 9219b5a67022c..d1b1c66c92ed1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Exception;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
@@ -132,7 +133,7 @@ public function testReSetShippingMethod()
      * @param string $input
      * @param string $message
      * @dataProvider dataProviderSetShippingMethodWithWrongParameters
-     * @throws \Exception
+     * @throws Exception
      */
     public function testSetShippingMethodWithWrongParameters(string $input, string $message)
     {
@@ -261,7 +262,7 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage You cannot specify multiple shipping methods.
      */
     public function testSetMultipleShippingMethods()
@@ -307,7 +308,7 @@ public function testSetMultipleShippingMethods()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      */
     public function testSetShippingMethodToGuestCart()
     {
@@ -336,7 +337,7 @@ public function testSetShippingMethodToGuestCart()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      */
     public function testSetShippingMethodToAnotherCustomerCart()
     {
@@ -422,6 +423,30 @@ private function getQuery(
 QUERY;
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     *
+     * @expectedException Exception
+     * @expectedExceptionMessage The shipping method can't be set for an empty cart. Add an item to cart and try again.
+     */
+    public function testSetShippingMethodOnAnEmptyCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $carrierCode = 'flatrate';
+        $methodCode = 'flatrate';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * @param string $username
      * @param string $password
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 2eac002253ff0..00d90c5368c47 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
+use Exception;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\GraphQl\Quote\GetQuoteShippingAddressIdByReservedQuoteId;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -85,7 +86,7 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage The shipping address is missing. Set the address and try again.
      */
     public function testSetShippingMethodOnCartWithSimpleProductAndWithoutAddress()
@@ -151,7 +152,7 @@ public function testReSetShippingMethod()
      * @param string $input
      * @param string $message
      * @dataProvider dataProviderSetShippingMethodWithWrongParameters
-     * @throws \Exception
+     * @throws Exception
      */
     public function testSetShippingMethodWithWrongParameters(string $input, string $message)
     {
@@ -279,7 +280,7 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @expectedException \Exception
+     * @expectedException Exception
      * @expectedExceptionMessage You cannot specify multiple shipping methods.
      */
     public function testSetMultipleShippingMethods()
@@ -325,7 +326,7 @@ public function testSetMultipleShippingMethods()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      *
-     * @expectedException \Exception
+     * @expectedException Exception
      */
     public function testSetShippingMethodToCustomerCart()
     {
@@ -373,6 +374,30 @@ public function testSetShippingMethodIfGuestIsNotOwnerOfAddress()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/quote_with_address.php
+     *
+     * @expectedException Exception
+     * @expectedExceptionMessage The shipping method can't be set for an empty cart. Add an item to cart and try again.
+     */
+    public function testSetShippingMethodOnAnEmptyCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $carrierCode = 'flatrate';
+        $methodCode = 'flatrate';
+        $quoteAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute('test_quote');
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $methodCode,
+            $carrierCode,
+            $quoteAddressId
+        );
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $shippingMethodCode

From 601e205e10f89640de535b2f0482a773b98afa93 Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Wed, 10 Apr 2019 15:46:40 +0300
Subject: [PATCH 1027/1055] Use 'lib-css' utility

---
 .../web/css/source/module/checkout/_tooltip.less              | 4 ++--
 1 file changed, 2 insertions(+), 2 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 abc990c56f651..ddf33de6820e7 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
@@ -173,10 +173,10 @@
         width: 0;
     }
     .field-tooltip .field-tooltip-content::before {
-        border-bottom-color: @checkout-tooltip-content__border-color;
+        .lib-css(border-bottom-color, @checkout-tooltip-content__border-color);
     }
     .field-tooltip .field-tooltip-content::after {
-        border-bottom-color: @checkout-tooltip-content__background-color;
+        .lib-css(border-bottom-color, @checkout-tooltip-content__background-color);
         top: 1px;
     }
 }

From 921f7b90bbc32e2759bffdb93529b864b479f41b Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 10 Apr 2019 16:43:51 +0300
Subject: [PATCH 1028/1055] magento/magento2#20832: MFTF test fix.

---
 .../Test/Mftf/Section/StorefrontPanelHeaderSection.xml      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
index 1955c6a417ba9..a06b099220b56 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -12,8 +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"/>
+        <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/>
+        <element name="customerWelcomeMenu" type="text" selector=".panel.header .greet.welcome .customer-menu"/>
+        <element name="customerLogoutLink" type="text" selector=".panel.header .greet.welcome .customer-menu .authorization-link a" timeout="30"/>
     </section>
 </sections>

From ad6581211a31bb3d8b69f400cb97f14bf582d307 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 10 Apr 2019 17:05:02 +0300
Subject: [PATCH 1029/1055] magento/magento2#21821: Static test fix.

---
 .../backend/web/css/source/forms/fields/_field-tooltips.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
index e5891e39648fc..befd27fa57df6 100755
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_field-tooltips.less
@@ -22,7 +22,7 @@
 @field-tooltip-content__width: 32rem;
 @field-tooltip-content__z-index: 1;
 
-@field-tooltip-action__margin-left: 0rem;
+@field-tooltip-action__margin-left: 0;
 
 //
 //  Form Fields

From f0be69a9c195bee0acb8d0117d499aa1db0b175b Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 10 Apr 2019 13:30:07 -0500
Subject: [PATCH 1030/1055] GraphQL-382: Test coverage of Adding simple/virtual
 product to shopping cart

---
 .../CatalogInventory/AddProductToCartTest.php |  52 +++---
 .../AddConfigurableProductToCartTest.php      |  63 ++------
 ...pleProductWithCustomOptionsToCartTest.php} | 152 ++----------------
 ...ualProductWithCustomOptionsToCartTest.php} |  42 ++---
 .../Guest/AddSimpleProductToCartTest.php      | 102 ++++++++++++
 .../_files/product_simple_with_options.php    |   1 +
 .../product_simple_with_options_rollback.php  |   3 +-
 .../Catalog/_files/product_virtual.php        |   5 +-
 .../_files/product_virtual_rollback.php       |   3 +-
 .../_files/product_virtual_with_options.php   |   1 +
 .../product_virtual_with_options_rollback.php |   2 +-
 11 files changed, 168 insertions(+), 258 deletions(-)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/{Quote => ConfigurableProduct}/AddConfigurableProductToCartTest.php (60%)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/{AddSimpleProductToCartTest.php => AddSimpleProductWithCustomOptionsToCartTest.php} (56%)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/{AddVirtualProductToCartTest.php => AddVirtualProductWithCustomOptionsToCartTest.php} (81%)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
index 17c2af8dc59d0..86e71d9914fe3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -7,28 +7,19 @@
 
 namespace Magento\GraphQl\CatalogInventory;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 
+/**
+ * Add simple product to cart testcases related to inventory
+ */
 class AddProductToCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @inheritdoc
@@ -36,9 +27,7 @@ class AddProductToCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
@@ -51,11 +40,10 @@ public function testAddProductIfQuantityIsNotAvailable()
     {
         $sku = 'simple';
         $qty = 200;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
-        $maskedQuoteId = $this->getMaskedQuoteId();
-        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
         $this->graphQlQuery($query);
-        self::fail('Should be "The requested qty is not available" error message.');
     }
 
     /**
@@ -71,22 +59,26 @@ public function testAddMoreProductsThatAllowed()
 
         $sku = 'custom-design-simple-product';
         $qty = 7;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
-        $maskedQuoteId = $this->getMaskedQuoteId();
-        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
         $this->graphQlQuery($query);
-        self::fail('Should be "The most you may purchase is 5." error message.');
     }
 
     /**
-     * @return string
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Please enter a number greater than 0 in this field.
      */
-    public function getMaskedQuoteId() : string
+    public function testAddSimpleProductToCartWithNegativeQty()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $sku = 'simple';
+        $qty = -2;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
+        $this->graphQlQuery($query);
     }
 
     /**
@@ -95,7 +87,7 @@ public function getMaskedQuoteId() : string
      * @param int $qty
      * @return string
      */
-    public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty) : string
+    private function getQuery(string $maskedQuoteId, string $sku, int $qty) : string
     {
         return <<<QUERY
 mutation {  
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
similarity index 60%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
index b3f16c8734203..e4ae59cc0d281 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddConfigurableProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
@@ -5,30 +5,21 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\Quote;
+namespace Magento\GraphQl\ConfigurableProduct;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 
+/**
+ * Add configurable product to cart testcases
+ */
 class AddConfigurableProductToCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var Quote
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quote;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @inheritdoc
@@ -36,9 +27,7 @@ class AddConfigurableProductToCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quote = $objectManager->create(Quote::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
@@ -49,12 +38,11 @@ public function testAddConfigurableProductToCart()
     {
         $variantSku = 'simple_41';
         $qty = 2;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
-        $maskedQuoteId = $this->getMaskedQuoteId();
-
-        $query = $this->getAddConfigurableProductMutationQuery($maskedQuoteId, $variantSku, $qty);
-
+        $query = $this->getQuery($maskedQuoteId, $variantSku, $qty);
         $response = $this->graphQlQuery($query);
+
         $cartItems = $response['addConfigurableProductsToCart']['cart']['items'];
         self::assertEquals($qty, $cartItems[0]['qty']);
         self::assertEquals($variantSku, $cartItems[0]['product']['sku']);
@@ -70,10 +58,9 @@ public function testAddProductIfQuantityIsNotAvailable()
     {
         $variantSku = 'simple_41';
         $qty = 200;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
-        $maskedQuoteId = $this->getMaskedQuoteId();
-        $query = $this->getAddConfigurableProductMutationQuery($maskedQuoteId, $variantSku, $qty);
-
+        $query = $this->getQuery($maskedQuoteId, $variantSku, $qty);
         $this->graphQlQuery($query);
     }
 
@@ -87,35 +74,19 @@ public function testAddOutOfStockProduct()
     {
         $variantSku = 'simple_1010';
         $qty = 1;
-        $maskedQuoteId = $this->getMaskedQuoteId();
-        $query = $this->getAddConfigurableProductMutationQuery($maskedQuoteId, $variantSku, $qty);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
+        $query = $this->getQuery($maskedQuoteId, $variantSku, $qty);
         $this->graphQlQuery($query);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function getMaskedQuoteId()
-    {
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-        return $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-    }
-
     /**
      * @param string $maskedQuoteId
-     * @param string $sku
+     * @param string $variantSku
      * @param int $qty
-     *
      * @return string
      */
-    private function getAddConfigurableProductMutationQuery(string $maskedQuoteId, string $variantSku, int $qty): string
+    private function getQuery(string $maskedQuoteId, string $variantSku, int $qty): string
     {
         return <<<QUERY
 mutation {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
similarity index 56%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
index e6a5395b0d7b3..6da1b2c9b54c9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
@@ -8,28 +8,18 @@
 namespace Magento\GraphQl\Quote;
 
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
-class AddSimpleProductToCartTest extends GraphQlAbstract
+/**
+ * Add simple product with custom options to cart testcases
+ */
+class AddSimpleProductWithCustomOptionsToCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @var ProductCustomOptionRepositoryInterface
@@ -42,9 +32,7 @@ class AddSimpleProductToCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->productCustomOptionsRepository = $objectManager->get(ProductCustomOptionRepositoryInterface::class);
     }
 
@@ -59,14 +47,13 @@ public function testAddSimpleProductWithOptions()
     {
         $sku = 'simple';
         $qty = 1;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $customOptionsValues = $this->getCustomOptionsValuesForQuery($sku);
 
         /* Generate customizable options fragment for GraphQl request */
         $queryCustomizableOptions = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
 
-        $maskedQuoteId = $this->getMaskedQuoteId();
-
         $query = <<<QUERY
 mutation {  
   addSimpleProductsToCart(
@@ -114,126 +101,6 @@ public function testAddSimpleProductWithOptions()
         }
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     */
-    public function testAddSimpleProductToCart()
-    {
-        $sku = 'simple';
-        $qty = 2;
-        $maskedQuoteId = $this->getMaskedQuoteId();
-
-        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
-        $response = $this->graphQlQuery($query);
-        self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
-
-        self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][0]['qty']);
-        self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage Please enter a number greater than 0 in this field.
-     */
-    public function testAddSimpleProductToCartWithNegativeQty()
-    {
-        $sku = 'simple';
-        $qty = -2;
-        $maskedQuoteId = $this->getMaskedQuoteId();
-
-        $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @return string
-     */
-    private function getMaskedQuoteId() : string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
-    /**
-     * @param string $maskedQuoteId
-     * @param string $sku
-     * @param int $qty
-     * @return string
-     */
-    public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty): string
-    {
-        return <<<QUERY
-mutation {  
-  addSimpleProductsToCart(
-    input: {
-      cart_id: "{$maskedQuoteId}"
-      cartItems: [
-        {
-          data: {
-            qty: $qty
-            sku: "$sku"
-          }
-        }
-      ]
-    }
-  ) {
-    cart {
-      items {
-        qty
-        product {
-          sku
-        }
-      }
-    }
-  }
-}
-QUERY;
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage Could not find a cart with ID "wrong_cart_hash"
-     */
-    public function testAddProductWithWrongCartHash()
-    {
-        $sku = 'simple';
-        $qty = 1;
-
-        $maskedQuoteId = 'wrong_cart_hash';
-
-        $query = <<<QUERY
-mutation {  
-  addSimpleProductsToCart(
-    input: {
-      cart_id: "{$maskedQuoteId}"
-      cartItems: [
-        {
-          data: {
-            qty: $qty
-            sku: "$sku"
-          }
-        }
-      ]
-    }
-  ) {
-    cart {
-      items {
-        qty
-      }
-    }
-  }
-}
-QUERY;
-
-        $this->graphQlQuery($query);
-    }
-
     /**
      * Test adding a simple product with empty values for required options
      *
@@ -244,8 +111,7 @@ public function testAddSimpleProductWithNoRequiredOptionsSet()
     {
         $sku = 'simple';
         $qty = 1;
-
-        $maskedQuoteId = $this->getMaskedQuoteId();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = <<<QUERY
 mutation {  
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
similarity index 81%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
index da4e6de2d0aa6..1e1ee91336107 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
@@ -7,28 +7,19 @@
 
 namespace Magento\GraphQl\Quote;
 
-use Magento\Quote\Model\QuoteFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 
-class AddVirtualProductToCartTest extends GraphQlAbstract
+/**
+ * Add virtual product with custom options to cart testcases
+ */
+class AddVirtualProductWithCustomOptionsToCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-    /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
      * @var ProductCustomOptionRepositoryInterface
@@ -41,9 +32,7 @@ class AddVirtualProductToCartTest extends GraphQlAbstract
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->productCustomOptionsRepository = $objectManager->get(ProductCustomOptionRepositoryInterface::class);
     }
 
@@ -58,14 +47,13 @@ public function testAddVirtualProductWithOptions()
     {
         $sku = 'virtual';
         $qty = 1;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $customOptionsValues = $this->getCustomOptionsValuesForQuery($sku);
 
         /* Generate customizable options fragment for GraphQl request */
         $queryCustomizableOptions = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
 
-        $maskedQuoteId = $this->getMaskedQuoteId();
-
         $query = <<<QUERY
 mutation {  
   addVirtualProductsToCart(
@@ -123,8 +111,7 @@ public function testAddVirtualProductWithNoRequiredOptionsSet()
     {
         $sku = 'virtual';
         $qty = 1;
-
-        $maskedQuoteId = $this->getMaskedQuoteId();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = <<<QUERY
 mutation {  
@@ -194,15 +181,4 @@ private function getCustomOptionsValuesForQuery(string $sku): array
 
         return $customOptionsValues;
     }
-
-    /**
-     * @return string
-     */
-    public function getMaskedQuoteId() : string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
new file mode 100644
index 0000000000000..3270449f3e8dd
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Add simple product to cart testcases
+ */
+class AddSimpleProductToCartTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddSimpleProductToCart()
+    {
+        $sku = 'simple';
+        $qty = 2;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+
+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
+        $response = $this->graphQlQuery($query);
+        self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
+
+        self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][0]['qty']);
+        self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testAddProductToNonExistentCart()
+    {
+        $sku = 'simple';
+        $qty = 1;
+        $maskedQuoteId = 'non_existent_masked_id';
+
+        $query = $this->getQuery($maskedQuoteId, $sku, $qty);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $sku
+     * @param int $qty
+     * @return string
+     */
+    private function getQuery(string $maskedQuoteId, string $sku, int $qty): string
+    {
+        return <<<QUERY
+mutation {  
+  addSimpleProductsToCart(
+    input: {
+      cart_id: "{$maskedQuoteId}"
+      cartItems: [
+        {
+          data: {
+            qty: $qty
+            sku: "$sku"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      items {
+        qty
+        product {
+          sku
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
index fa8046fef3975..a401db8eb2bf7 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
index 2d783a6d07522..8863da1cd2782 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 /** @var \Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
@@ -18,8 +19,6 @@
     $repository->delete($product);
 } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
     //Entity already deleted
-} catch (\Magento\Framework\Exception\StateException $e) {
-
 }
 
 $registry->unregister('isSecureArea');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
index 8f42436f08a31..838ae2b9a2aa6 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
@@ -3,12 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 
-$productFactory = Bootstrap::getObjectManager()->get(ProductFactory::class);
+$productFactory = Bootstrap::getObjectManager()->get(ProductInterfaceFactory::class);
 $product = $productFactory->create();
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
     ->setId(21)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
index 84039adc416aa..f5568ced2c96a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -15,7 +16,7 @@
 $registry->register('isSecureArea', true);
 
 $productRepository = Bootstrap::getObjectManager()
-    ->create(ProductRepositoryInterface::class);
+    ->get(ProductRepositoryInterface::class);
 
 try {
     $product = $productRepository->get('virtual-product', false, null, true);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
index c07eb0f35b0fd..c1f981cefa646 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
index 070e2890df413..f46cdc13d3263 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options_rollback.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 /** @var \Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
@@ -18,7 +19,6 @@
     $repository->delete($product);
 } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
     //Entity already deleted
-} catch (\Magento\Framework\Exception\StateException $e) {
 }
 
 $registry->unregister('isSecureArea');

From 9e8519de2367581ff26dc76432e88a7ccbf987d8 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Thu, 11 Apr 2019 12:24:00 +0200
Subject: [PATCH 1031/1055] Tests refactoring based on new fixtures principle

---
 .../GraphQl/Quote/Customer/CartTotalsTest.php | 47 ++++++++-----
 .../GraphQl/Quote/Guest/CartTotalsTest.php    | 53 +++++++++------
 .../_files/product_simple_with_tax.php        | 45 -------------
 .../product_simple_with_tax_rollback.php      |  8 ---
 .../_files/quote_with_address_guest.php       | 61 -----------------
 .../quote_with_address_guest_rollback.php     | 21 ------
 .../_files/quote_with_customer_no_address.php | 48 -------------
 ...uote_with_customer_no_address_rollback.php | 22 ------
 .../_files/quote_with_tax_customer.php        | 67 -------------------
 .../quote_with_tax_customer_rollback.php      | 22 ------
 .../Checkout/_files/quote_with_tax_guest.php  | 63 -----------------
 .../_files/quote_with_tax_guest_rollback.php  | 21 ------
 .../_files/customer_with_tax_group.php        | 10 ---
 .../customer_with_tax_group_rollback.php      |  7 --
 .../_files/apply_tax_for_simple_product.php   | 26 +++++++
 .../Tax/_files/tax_rule_for_region_1.php      | 53 +++++++++++++++
 .../_files/tax_rule_for_region_1_rollback.php | 38 +++++++++++
 17 files changed, 181 insertions(+), 431 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax_rollback.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest_rollback.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address_rollback.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer_rollback.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest_rollback.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
index 8dc6650b68f91..4a25e9331d86e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
@@ -49,34 +49,46 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_tax_customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
      */
     public function testGetCartTotalsWithTaxApplied()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_tax');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
         $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
         $response = $this->sendRequestWithToken($query);
 
         self::assertArrayHasKey('prices', $response['cart']);
         $pricesResponse = $response['cart']['prices'];
-        self::assertEquals(10.83, $pricesResponse['grand_total']['value']);
-        self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+        self::assertEquals(21.5, $pricesResponse['grand_total']['value']);
+        self::assertEquals(21.5, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
 
         $appliedTaxesResponse = $pricesResponse['applied_taxes'];
 
-        self::assertEquals('US-CA-*-Rate 1', $appliedTaxesResponse[0]['label']);
-        self::assertEquals(0.83, $appliedTaxesResponse[0]['amount']['value']);
+        self::assertEquals('US-TEST-*-Rate-1', $appliedTaxesResponse[0]['label']);
+        self::assertEquals(1.5, $appliedTaxesResponse[0]['amount']['value']);
         self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
      */
     public function testGetTotalsWithNoTaxApplied()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
         $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
         $response = $this->sendRequestWithToken($query);
 
@@ -92,19 +104,22 @@ public function testGetTotalsWithNoTaxApplied()
      * The totals calculation is based on quote address.
      * But the totals should be calculated even if no address is set
      *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_customer_no_address.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testGetCartTotalsWithNoAddressSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
         $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
         $response = $this->sendRequestWithToken($query);
 
         $pricesResponse = $response['cart']['prices'];
-        self::assertEquals(10, $pricesResponse['grand_total']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_including_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+        self::assertEquals(20, $pricesResponse['grand_total']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
         self::assertEmpty($pricesResponse['applied_taxes']);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
index 19ef071b5040d..9fec6fdfd2697 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
@@ -42,42 +42,52 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_tax_guest.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
      */
     public function testGetCartTotalsWithTaxApplied()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_tax');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
         $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('prices', $response['cart']);
         $pricesResponse = $response['cart']['prices'];
-        self::assertEquals(10.83, $pricesResponse['grand_total']['value']);
-        self::assertEquals(10.83, $pricesResponse['subtotal_including_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+        self::assertEquals(21.5, $pricesResponse['grand_total']['value']);
+        self::assertEquals(21.5, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
 
         $appliedTaxesResponse = $pricesResponse['applied_taxes'];
 
-        self::assertEquals('US-CA-*-Rate 1', $appliedTaxesResponse[0]['label']);
-        self::assertEquals(0.83, $appliedTaxesResponse[0]['amount']['value']);
+        self::assertEquals('US-TEST-*-Rate-1', $appliedTaxesResponse[0]['label']);
+        self::assertEquals(1.5, $appliedTaxesResponse[0]['amount']['value']);
         self::assertEquals('USD', $appliedTaxesResponse[0]['amount']['currency']);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_guest.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
      */
     public function testGetTotalsWithNoTaxApplied()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
         $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         $pricesResponse = $response['cart']['prices'];
-        self::assertEquals(10, $pricesResponse['grand_total']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_including_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+        self::assertEquals(20, $pricesResponse['grand_total']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
         self::assertEmpty($pricesResponse['applied_taxes']);
     }
 
@@ -85,19 +95,22 @@ public function testGetTotalsWithNoTaxApplied()
      * The totals calculation is based on quote address.
      * But the totals should be calculated even if no address is set
      *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @group recent
      */
     public function testGetCartTotalsWithNoAddressSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
         $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         $pricesResponse = $response['cart']['prices'];
-        self::assertEquals(10, $pricesResponse['grand_total']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_including_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_excluding_tax']['value']);
-        self::assertEquals(10, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
+        self::assertEquals(20, $pricesResponse['grand_total']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_including_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_excluding_tax']['value']);
+        self::assertEquals(20, $pricesResponse['subtotal_with_discount_excluding_tax']['value']);
         self::assertEmpty($pricesResponse['applied_taxes']);
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax.php
deleted file mode 100644
index 00c2e66736468..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\ProductFactory;
-use Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory as TaxClassCollectionFactory;
-use Magento\Tax\Model\ClassModel as TaxClassModel;
-use Magento\TestFramework\Helper\Bootstrap;
-
-$objectManager = Bootstrap::getObjectManager();
-/** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(ProductRepositoryInterface::class);
-/** @var ProductFactory $productFactory */
-$productFactory = $objectManager->create(ProductFactory::class);
-$product = $productFactory->create();
-$product
-    ->setTypeId('simple')
-    ->setId(1)
-    ->setAttributeSetId(4)
-    ->setWebsiteIds([1])
-    ->setName('Simple Product')
-    ->setSku('simple')
-    ->setPrice(10)
-    ->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(['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1])
-    ->setQty(22);
-
-
-/** @var TaxClassCollectionFactory $taxClassCollectionFactory */
-$taxClassCollectionFactory = $objectManager->create(TaxClassCollectionFactory::class);
-$taxClassCollection = $taxClassCollectionFactory->create();
-
-/** @var TaxClassModel $taxClass */
-$taxClassCollection->addFieldToFilter('class_type', TaxClassModel::TAX_CLASS_TYPE_PRODUCT);
-$taxClass = $taxClassCollection->getFirstItem();
-
-$product->setCustomAttribute('tax_class_id', $taxClass->getClassId());
-$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax_rollback.php
deleted file mode 100644
index a7d58fdf7f6f6..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_tax_rollback.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-require __DIR__ . '/product_simple_rollback.php';
-require __DIR__ . '/../../Tax/_files/tax_classes_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest.php
deleted file mode 100644
index da496f01ec05d..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Quote\Api\Data\AddressInterface;
-use Magento\Quote\Model\Quote;
-
-require __DIR__ . '/../../../Magento/Catalog/_files/products.php';
-
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-/** @var AddressInterface $quoteAddress */
-$quoteAddress = $objectManager->create(AddressInterface::class);
-$quoteAddress->setData(
-    [
-        'telephone' => 3468676,
-        'postcode' => 75477,
-        'country_id' => 'US',
-        'city' => 'CityM',
-        'company' => 'CompanyName',
-        'street' => 'Green str, 67',
-        'lastname' => 'Smith',
-        'firstname' => 'John',
-        'region_id' => 1
-    ]
-);
-
-/** @var Quote $quote */
-$quote = $objectManager->create(Quote::class);
-$quote->setStoreId(
-    1
-)->setIsActive(
-    true
-)->setIsMultiShipping(
-    false
-)->setShippingAddress(
-    $quoteAddress
-)->setBillingAddress(
-    $quoteAddress
-)->setCheckoutMethod(
-    'customer'
-)->setReservedOrderId(
-    'test_order_1'
-)->addProduct(
-    $product
-);
-
-$quoteRepository = $objectManager->get(
-    \Magento\Quote\Api\CartRepositoryInterface::class
-);
-
-$quoteRepository->save($quote);
-
-/** @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();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest_rollback.php
deleted file mode 100644
index 3130ca9353e92..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_guest_rollback.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdMask;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\ObjectManager;
-
-require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
-
-/** @var $objectManager ObjectManager */
-$objectManager = Bootstrap::getObjectManager();
-$quote = $objectManager->create(Quote::class);
-$quote->load('test_order_1', 'reserved_order_id')->delete();
-
-/** @var QuoteIdMask $quoteIdMask */
-$quoteIdMask = $objectManager->create(QuoteIdMask::class);
-$quoteIdMask->delete($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address.php
deleted file mode 100644
index ef030f8bcd923..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Quote\Model\Quote;
-
-require __DIR__ . '/../../Customer/_files/customer.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/products.php';
-
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
-$customer = $customerRepository->get('customer@example.com');
-
-/** @var Quote $quote */
-$quote = $objectManager->create(Quote::class);
-$quote->setStoreId(
-    1
-)->setIsActive(
-    true
-)->setIsMultiShipping(
-    false
-)->assignCustomer(
-    $customer
-)->setCheckoutMethod(
-    'customer'
-)->setReservedOrderId(
-    'test_order_1'
-)->addProduct(
-    $product
-);
-
-$quoteRepository = $objectManager->get(
-    \Magento\Quote\Api\CartRepositoryInterface::class
-);
-
-$quoteRepository->save($quote);
-
-/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-$quoteIdMask = $objectManager
-    ->get(\Magento\Quote\Model\QuoteIdMaskFactory::class)
-    ->create();
-$quoteIdMask->setQuoteId($quote->getId());
-$quoteIdMask->setDataChanges(true);
-$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address_rollback.php
deleted file mode 100644
index 83c80d736c16b..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_no_address_rollback.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdMask;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\ObjectManager;
-
-require __DIR__ . '/../../Customer/_files/customer_rollback.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
-
-/** @var $objectManager ObjectManager */
-$objectManager = Bootstrap::getObjectManager();
-$quote = $objectManager->create(Quote::class);
-$quote->load('test_order_1', 'reserved_order_id')->delete();
-
-/** @var QuoteIdMask $quoteIdMask */
-$quoteIdMask = $objectManager->create(QuoteIdMask::class);
-$quoteIdMask->delete($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php
deleted file mode 100644
index e9cb45b546a4e..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\Quote\Address;
-
-require __DIR__ . '/../../Customer/_files/customer_with_tax_group.php';
-require __DIR__ . '/../../Customer/_files/customer_address.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_tax.php';
-
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-/** @var AddressRepositoryInterface $addressRepository */
-$addressRepository = $objectManager->get(AddressRepositoryInterface::class);
-$customerAddress = $addressRepository->getById(1);
-$customerAddress->setRegionId(12); // Taxable region
-$addressRepository->save($customerAddress);
-/** @var CustomerRepositoryInterface $customerRepository */
-$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
-$customer = $customerRepository->get('customer@example.com');
-
-/** @var Address  $quoteAddress */
-$quoteAddress = $objectManager->create(Address::class);
-$quoteAddress->importCustomerAddressData($customerAddress);
-
-/** @var Quote $quote */
-$quote = $objectManager->create(Quote::class);
-$quote->setStoreId(
-    1
-)->setIsActive(
-    true
-)->setIsMultiShipping(
-    false
-)->assignCustomer(
-    $customer
-)->setShippingAddress(
-    $quoteAddress
-)->setBillingAddress(
-    $quoteAddress
-)->setCheckoutMethod(
-    'customer'
-)->setReservedOrderId(
-    'test_order_tax'
-)->addProduct(
-    $product
-);
-
-$quote->getShippingAddress()->setRegionId(12);
-
-$quoteRepository = $objectManager->get(
-    \Magento\Quote\Api\CartRepositoryInterface::class
-);
-
-$quoteRepository->save($quote);
-
-/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-$quoteIdMask = $objectManager
-    ->get(\Magento\Quote\Model\QuoteIdMaskFactory::class)
-    ->create();
-$quoteIdMask->setQuoteId($quote->getId());
-$quoteIdMask->setDataChanges(true);
-$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer_rollback.php
deleted file mode 100644
index 1e1eb326d7c8a..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_customer_rollback.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdMask;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\ObjectManager;
-
-require __DIR__ . '/../../Customer/_files/customer_with_tax_group_rollback.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_tax_rollback.php';
-
-/** @var $objectManager ObjectManager */
-$objectManager = Bootstrap::getObjectManager();
-$quote = $objectManager->create(Quote::class);
-$quote->load('test_order_tax', 'reserved_order_id')->delete();
-
-/** @var QuoteIdMask $quoteIdMask */
-$quoteIdMask = $objectManager->create(QuoteIdMask::class);
-$quoteIdMask->delete($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
deleted file mode 100644
index 78d5b0739d763..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Quote\Api\Data\AddressInterface;
-use Magento\Quote\Model\Quote;
-
-require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_tax.php';
-
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-/** @var AddressInterface $quoteAddress */
-$quoteAddress = $objectManager->create(AddressInterface::class);
-$quoteAddress->setData(
-    [
-        'telephone' => 3468676,
-        'postcode' => 75477,
-        'country_id' => 'US',
-        'city' => 'CityM',
-        'company' => 'CompanyName',
-        'street' => 'Green str, 67',
-        'lastname' => 'Smith',
-        'firstname' => 'John',
-        'region_id' => 12
-    ]
-);
-
-/** @var Quote $quote */
-$quote = $objectManager->create(Quote::class);
-$quote->setStoreId(
-    1
-)->setIsActive(
-    true
-)->setIsMultiShipping(
-    false
-)->setShippingAddress(
-    $quoteAddress
-)->setBillingAddress(
-    $quoteAddress
-)->setCheckoutMethod(
-    'guest'
-)->setReservedOrderId(
-    'test_order_tax'
-)->addProduct(
-    $product
-);
-
-$quote->getShippingAddress()->setRegionId(12);
-
-$quoteRepository = $objectManager->get(
-    \Magento\Quote\Api\CartRepositoryInterface::class
-);
-
-$quoteRepository->save($quote);
-
-/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
-$quoteIdMask = $objectManager
-    ->get(\Magento\Quote\Model\QuoteIdMaskFactory::class)
-    ->create();
-$quoteIdMask->setQuoteId($quote->getId());
-$quoteIdMask->setDataChanges(true);
-$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest_rollback.php
deleted file mode 100644
index 6fcbdf7276de2..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_tax_guest_rollback.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdMask;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\ObjectManager;
-
-require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_tax_rollback.php';
-
-/** @var $objectManager ObjectManager */
-$objectManager = Bootstrap::getObjectManager();
-$quote = $objectManager->create(Quote::class);
-$quote->load('test_order_tax', 'reserved_order_id')->delete();
-
-/** @var QuoteIdMask $quoteIdMask */
-$quoteIdMask = $objectManager->create(QuoteIdMask::class);
-$quoteIdMask->delete($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group.php
deleted file mode 100644
index 4792df5cdb2f7..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-require __DIR__ . '/customer.php';
-
-$customer->setGroupId(3); // 3 is a predefined retailer group
-$customer->save();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group_rollback.php
deleted file mode 100644
index 48a09a41c7e07..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_tax_group_rollback.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-require __DIR__ . '/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
new file mode 100644
index 0000000000000..9968704517ecd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Tax\Model\ClassModel as TaxClassModel;
+use Magento\Tax\Model\ResourceModel\TaxClass\CollectionFactory as TaxClassCollectionFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple_product');
+
+/** @var TaxClassCollectionFactory $taxClassCollectionFactory */
+$taxClassCollectionFactory = $objectManager->get(TaxClassCollectionFactory::class);
+$taxClassCollection = $taxClassCollectionFactory->create();
+
+/** @var TaxClassModel $taxClass */
+$taxClassCollection->addFieldToFilter('class_type', TaxClassModel::TAX_CLASS_TYPE_PRODUCT);
+$taxClass = $taxClassCollection->getFirstItem();
+
+$product->setCustomAttribute('tax_class_id', $taxClass->getClassId());
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
new file mode 100644
index 0000000000000..aca55bd8414f6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Tax\Api\Data\TaxRateInterface;
+use Magento\Tax\Api\Data\TaxRuleInterface;
+use Magento\Tax\Api\TaxRateRepositoryInterface;
+use Magento\Tax\Api\TaxRuleRepositoryInterface;
+use Magento\Tax\Model\Calculation\Rate;
+use Magento\Tax\Model\Calculation\RateFactory;
+use Magento\Tax\Model\Calculation\RateRepository;
+use Magento\Tax\Model\Calculation\Rule;
+use Magento\Tax\Model\Calculation\RuleFactory;
+use Magento\Tax\Model\TaxRuleRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Api\DataObjectHelper;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var RateFactory $rateFactory */
+$rateFactory = $objectManager->get(RateFactory::class);
+/** @var RuleFactory $ruleFactory */
+$ruleFactory = $objectManager->get(RuleFactory::class);
+/** @var RateRepository $rateRepository */
+$rateRepository = $objectManager->get(TaxRateRepositoryInterface::class);
+/** @var TaxRuleRepository $ruleRepository */
+$ruleRepository = $objectManager->get(TaxRuleRepositoryInterface::class);
+/** @var Rate $rate */
+$rate = $rateFactory->create();
+$rateData = [
+    Rate::KEY_COUNTRY_ID => 'US',
+    Rate::KEY_REGION_ID => '1',
+    Rate::KEY_POSTCODE => '*',
+    Rate::KEY_CODE => 'US-TEST-*-Rate-1',
+    Rate::KEY_PERCENTAGE_RATE => '7.5',
+];
+$dataObjectHelper->populateWithArray($rate, $rateData, TaxRateInterface::class);
+$rateRepository->save($rate);
+
+$rule = $ruleFactory->create();
+$ruleData = [
+    Rule::KEY_CODE=> 'GraphQl Test Rule',
+    Rule::KEY_PRIORITY => '0',
+    Rule::KEY_POSITION => '0',
+    Rule::KEY_CUSTOMER_TAX_CLASS_IDS => [3],
+    Rule::KEY_PRODUCT_TAX_CLASS_IDS => [2],
+    Rule::KEY_TAX_RATE_IDS => [$rate->getId()],
+];
+$dataObjectHelper->populateWithArray($rule, $ruleData, TaxRuleInterface::class);
+$ruleRepository->save($rule);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1_rollback.php
new file mode 100644
index 0000000000000..aba1960624ed4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_1_rollback.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Tax\Api\TaxRateRepositoryInterface;
+use Magento\Tax\Api\TaxRuleRepositoryInterface;
+use Magento\Tax\Model\Calculation\Rate;
+use Magento\Tax\Model\Calculation\RateFactory;
+use Magento\Tax\Model\Calculation\RateRepository;
+use Magento\Tax\Model\Calculation\Rule;
+use Magento\Tax\Model\Calculation\RuleFactory;
+use Magento\Tax\Model\TaxRuleRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Tax\Model\ResourceModel\Calculation\Rate as RateResource;
+use Magento\Tax\Model\ResourceModel\Calculation\Rule as RuleResource;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var RateFactory $rateFactory */
+$rateFactory = $objectManager->get(RateFactory::class);
+/** @var RuleFactory $ruleFactory */
+$ruleFactory = $objectManager->get(RuleFactory::class);
+/** @var RateRepository $rateRepository */
+$rateRepository = $objectManager->get(TaxRateRepositoryInterface::class);
+/** @var TaxRuleRepository $ruleRepository */
+$ruleRepository = $objectManager->get(TaxRuleRepositoryInterface::class);
+/** @var RateResource $rateResource */
+$rateResource = $objectManager->get(RateResource::class);
+/** @var RuleResource $ruleResource */
+$ruleResource = $objectManager->get(RuleResource::class);
+
+$rate = $rateFactory->create();
+$rateResource->load($rate, 'US-TEST-*-Rate-1', Rate::KEY_CODE);
+$rule = $ruleFactory->create();
+$ruleResource->load($rule, 'GraphQl Test Rule', Rule::KEY_CODE);
+$ruleRepository->delete($rule);
+$rateRepository->delete($rate);

From a2b2aa0e5db615843ba00bf332aca0b38fe3236b Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 11 Apr 2019 15:47:21 +0300
Subject: [PATCH 1032/1055] magento/magento2#20832: MFTF test fix.

---
 .../Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml   | 4 ++--
 .../Test/Mftf/Section/StorefrontPanelHeaderSection.xml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
index fc5c1b881752e..c3b92b1af7f82 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
@@ -9,8 +9,8 @@
 <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}}"
+        <conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
+                          dependentSelector="{{StorefrontPanelHeaderSection.customerLogoutLink}}"
                           visible="false"
                           stepKey="clickHeaderCustomerMenuButton" />
         <click selector="{{StorefrontPanelHeaderSection.customerLogoutLink}}" stepKey="clickSignOutButton" />
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
index 0505aa908f2a0..3610532c5356b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -16,8 +16,8 @@
         <element name="createAnAccountLink" type="select" selector="//div[@class='panel wrapper']//li/a[contains(.,'Create an Account')]" timeout="30"/>
         <element name="notYouLink" type="button" selector=".greet.welcome span a"/>
         <element name="customerWelcome" type="text" selector=".panel.header .greet.welcome"/>
-        <element name="customerWelcomeMenu" type="text" selector=".panel.header .greet.welcome .customer-menu"/>
+        <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-name"/>
         <element name="customerLoginLink" type="button" selector=".panel.header .header.links .authorization-link a" timeout="30"/>
-        <element name="customerLogoutLink" type="text" selector=".panel.header .greet.welcome .customer-menu .authorization-link a" timeout="30"/>
+        <element name="customerLogoutLink" type="text" selector=".panel.header .customer-welcome .customer-menu .authorization-link a" timeout="30"/>
     </section>
 </sections>

From 6d873304742ee5114ec661d6b799bd2f0a4f3cff Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 11 Apr 2019 17:39:28 +0300
Subject: [PATCH 1033/1055] Fix static tests.

---
 lib/internal/Magento/Framework/Code/Generator.php          | 3 +++
 .../Magento/Framework/Code/Test/Unit/GeneratorTest.php     | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index ba4213f398008..b46c8c681bb52 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -14,6 +14,9 @@
 use Magento\Framework\Filesystem\Driver\File;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Class code generator.
+ */
 class Generator
 {
     const GENERATION_SUCCESS = 'success';
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index 98700ae8917f1..2753561683385 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -23,6 +23,11 @@
 use Magento\GeneratedClass\Factory as GeneratedClassFactory;
 use RuntimeException;
 
+/**
+ * Tests for code generator.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class GeneratorTest extends TestCase
 {
     /**
@@ -143,7 +148,7 @@ public function testGenerateClass($className, $entityType): void
 
         $this->assertSame(
             Generator::GENERATION_SUCCESS,
-            $this->model->generateClass(GeneratedClassFactory::class)
+            $this->model->generateClass($fullClassName)
         );
     }
 

From c5fc16047c84f3c458c31011080fcca85182e669 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Thu, 11 Apr 2019 13:13:49 -0500
Subject: [PATCH 1034/1055] MC-15824: Create new GraphQL script for our
 benchmark - part 3

---
 setup/performance-toolkit/benchmark.jmx | 2648 +++++++++++++++++++----
 1 file changed, 2272 insertions(+), 376 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index cfabe613a0ea1..760cba726def6 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -374,6 +374,16 @@
             <stringProp name="Argument.value">${__P(graphqlAddSimpleProductToCartPercentage,0)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="graphqlCheckoutByGuestPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlCheckoutByGuestPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlCheckoutByGuestPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlCreateEmptyCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlCreateEmptyCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlCreateEmptyCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="graphqlGetCategoryListByCategoryIdPercentage" elementType="Argument">
             <stringProp name="Argument.name">graphqlGetCategoryListByCategoryIdPercentage</stringProp>
             <stringProp name="Argument.value">${__P(graphqlGetCategoryListByCategoryIdPercentage,0)}</stringProp>
@@ -399,6 +409,11 @@
             <stringProp name="Argument.value">${__P(graphqlGetConfigurableProductDetailsByProductUrlKeyPercentage,0)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="graphqlGetEmptyCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetEmptyCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetEmptyCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="graphqlGetListOfProductsByCategoryIdPercentage" elementType="Argument">
             <stringProp name="Argument.name">graphqlGetListOfProductsByCategoryIdPercentage</stringProp>
             <stringProp name="Argument.value">${__P(graphqlGetListOfProductsByCategoryIdPercentage,0)}</stringProp>
@@ -409,11 +424,6 @@
             <stringProp name="Argument.value">${__P(graphqlGetNavigationMenuByCategoryIdPercentage,0)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
-          <elementProp name="graphqlGetProductDetailByProductNamePercentage" elementType="Argument">
-            <stringProp name="Argument.name">graphqlGetProductDetailByProductNamePercentage</stringProp>
-            <stringProp name="Argument.value">${__P(graphqlGetProductDetailByProductNamePercentage,0)}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
           <elementProp name="graphqlGetProductSearchByTextAndCategoryIdPercentage" elementType="Argument">
             <stringProp name="Argument.name">graphqlGetProductSearchByTextAndCategoryIdPercentage</stringProp>
             <stringProp name="Argument.value">${__P(graphqlGetProductSearchByTextAndCategoryIdPercentage,0)}</stringProp>
@@ -429,6 +439,36 @@
             <stringProp name="Argument.value">${__P(graphqlGetSimpleProductDetailsByProductUrlKeyPercentage,0)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="graphqlRemoveConfigurableProductFromCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlRemoveConfigurableProductFromCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlRemoveConfigurableProductFromCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlRemoveSimpleProductFromCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlRemoveSimpleProductFromCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlRemoveSimpleProductFromCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlSetBillingAddressOnCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlSetBillingAddressOnCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlSetBillingAddressOnCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlSetShippingAddressOnCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlSetShippingAddressOnCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlSetShippingAddressOnCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlUpdateConfigurableProductQtyInCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlUpdateConfigurableProductQtyInCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlUpdateConfigurableProductQtyInCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="graphqlUpdateSimpleProductQtyInCartPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlUpdateSimpleProductQtyInCartPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlUpdateSimpleProductQtyInCartPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="graphqlUrlInfoByUrlKeyPercentage" elementType="Argument">
             <stringProp name="Argument.name">graphqlUrlInfoByUrlKeyPercentage</stringProp>
             <stringProp name="Argument.value">${__P(graphqlUrlInfoByUrlKeyPercentage,0)}</stringProp>
@@ -39803,130 +39843,6 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Product Detail by product_name" enabled="true">
-      <intProp name="ThroughputController.style">1</intProp>
-      <boolProp name="ThroughputController.perThread">false</boolProp>
-      <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${graphqlGetProductDetailByProductNamePercentage}</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
-    <hashTree>
-        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
-            <stringProp name="script">
-var testLabel = "${testLabel}" ? " (${testLabel})" : "";
-if (testLabel
-    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
-) {
-    if (sampler.getName().indexOf(testLabel) == -1) {
-       sampler.setName(sampler.getName() + testLabel);
-    }
-} else if (sampler.getName().indexOf("SetUp - ") == -1) {
-    sampler.setName("SetUp - " + sampler.getName());
-}
-            </stringProp>
-            <stringProp name="scriptLanguage">javascript</stringProp>
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
-        <hashTree/>
-        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
-            <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Product Detail by product_name");
-            </stringProp>
-            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-        </BeanShellSampler>
-        <hashTree/>
-    
-    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
-      <collectionProp name="HeaderManager.headers">
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Content-Type</stringProp>
-          <stringProp name="Header.value">application/json</stringProp>
-        </elementProp>
-        <elementProp name="" elementType="Header">
-          <stringProp name="Header.name">Accept</stringProp>
-          <stringProp name="Header.value">*/*</stringProp>
-        </elementProp>
-      </collectionProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
-    <hashTree/>
-  
-      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
-        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
-        <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-
-Random random = new Random();
-if (${seedForRandom} &gt; 0) {
-    random.setSeed(${seedForRandom} + ${__threadNum});
-}
-
-vars.putObject("randomIntGenerator", random);
-        </stringProp>
-        <stringProp name="BeanShellSampler.filename"/>
-        <stringProp name="BeanShellSampler.parameters"/>
-        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-      </BeanShellSampler>
-      <hashTree/>
-    
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-      <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("configurable_products_list").size());
-product = props.get("configurable_products_list").get(number);
-
-vars.put("product_url_key", product.get("url_key"));
-vars.put("product_id", product.get("id"));
-vars.put("product_name", product.get("title"));
-vars.put("product_uenc", product.get("uenc"));
-vars.put("product_sku", product.get("sku"));
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Product Detail by product_name" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_product_detail_by_product_name.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  </hashTree>
-
-  
     <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Product Search by text and category_id" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
@@ -40583,11 +40499,11 @@ vars.putObject("category", categories[number]);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Add Simple Product To Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Create Empty Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${graphqlAddSimpleProductToCartPercentage}</stringProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlCreateEmptyCartPercentage}</stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
     <hashTree>
         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
@@ -40608,7 +40524,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Add Simple Product To Cart");
+                vars.put("testLabel", "Create Empty Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -40646,26 +40562,118 @@ vars.putObject("randomIntGenerator", random);
       </BeanShellSampler>
       <hashTree/>
     
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
-      <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("simple_products_list").size());
-product = props.get("simple_products_list").get(number);
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
 
-vars.put("product_url_key", product.get("url_key"));
-vars.put("product_id", product.get("id"));
-vars.put("product_name", product.get("title"));
-vars.put("product_uenc", product.get("uenc"));
-vars.put("product_sku", product.get("sku"));
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Empty Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetEmptyCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Get Empty Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
     <hashTree/>
   
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
@@ -40702,8 +40710,1775 @@ vars.put("product_sku", product.get("sku"));
         <stringProp name="SUBJECT">BODY</stringProp>
       </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
       <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1901638450">{"data":{"cart":{"items":[]}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Set Shipping Address On Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlSetShippingAddressOnCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Set Shipping Address On Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Address On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"test region\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        address_type\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_address_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1671866339">{"data":{"setShippingAddressesOnCart":{"cart":{"shipping_addresses":[{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"},"address_type":"SHIPPING"}]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Set Billing Address On Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlSetBillingAddressOnCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Set Billing Address On Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Billing Address On Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"test region\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        address_type\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_billing_address_on_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1147076914">{"data":{"setBillingAddressOnCart":{"cart":{"billing_address":{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"},"address_type":"BILLING"}}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Add Simple Product To Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlAddSimpleProductToCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Add Simple Product To Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          data: {\n            qty: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        qty\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Add Configurable Product To Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlAddConfigurableProductToCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Add Configurable Product To Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    
+    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
+      <stringProp name="VAR">product_option</stringProp>
+      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
+      <stringProp name="DEFAULT"/>
+      <stringProp name="VARIABLE"/>
+      <stringProp name="SUBJECT">BODY</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            qty: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        qty\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
+          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Update Simple Product Qty In Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlUpdateSimpleProductQtyInCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Update Simple Product Qty In Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          data: {\n            qty: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        qty\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update Simple Product qty In Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  updateCartItems(input: {\n    cart_id: \"${quote_id}\"\n    cart_items: [\n      {\n        cart_item_id: ${item_id}\n        quantity: 5\n      }\n    ]\n  }) {\n    cart {\n      items {\n        id\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/update_simple_product_qty_in_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="664196114">{"data":{"updateCartItems":{"cart":{"items":[{"id":"${item_id}","qty":5}]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Update Configurable Product Qty In Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlUpdateConfigurableProductQtyInCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Update Configurable Product Qty In Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    
+    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
+      <stringProp name="VAR">product_option</stringProp>
+      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
+      <stringProp name="DEFAULT"/>
+      <stringProp name="VARIABLE"/>
+      <stringProp name="SUBJECT">BODY</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+    <hashTree/>
+  </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            qty: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        qty\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
+          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update Configurable Product qty In Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  updateCartItems(input: {\n    cart_id: \"${quote_id}\"\n    cart_items: [\n      {\n        cart_item_id: ${item_id}\n        quantity: 5\n      }\n    ]\n  }) {\n    cart {\n      items {\n        id\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/update_configurable_product_qty_in_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="664196114">{"data":{"updateCartItems":{"cart":{"items":[{"id":"${item_id}","qty":5}]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Remove Simple Product From Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlRemoveSimpleProductFromCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Remove Simple Product From Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
     </hashTree>
   
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
@@ -40780,93 +42555,242 @@ vars.put("product_sku", product.get("sku"));
         <stringProp name="SUBJECT">BODY</stringProp>
       </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
       <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update Simple Product qty In Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  updateCartItems(input: {\n    cart_id: \"${quote_id}\"\n    cart_items: [\n      {\n        cart_item_id: ${item_id}\n        quantity: 5\n      }\n    ]\n  }) {\n    cart {\n      items {\n        id\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/update_simple_product_qty_in_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="664196114">{"data":{"updateCartItems":{"cart":{"items":[{"id":"${item_id}","qty":5}]}}}}</stringProp>
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Simple Product From Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  removeItemFromCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_item_id: ${item_id}\n    }\n  ) {\n    cart {\n      items {\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_simple_product_from_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1452665323">{"data":{"removeItemFromCart":{"cart":{"items":[]}}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Remove Configurable Product From Cart" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlRemoveConfigurableProductFromCartPercentage}</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
+    <hashTree>
+        <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
+            <stringProp name="script">
+var testLabel = "${testLabel}" ? " (${testLabel})" : "";
+if (testLabel
+    &amp;&amp; sampler.getClass().getName() == 'org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy'
+) {
+    if (sampler.getName().indexOf(testLabel) == -1) {
+       sampler.setName(sampler.getName() + testLabel);
+    }
+} else if (sampler.getName().indexOf("SetUp - ") == -1) {
+    sampler.setName("SetUp - " + sampler.getName());
+}
+            </stringProp>
+            <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/setup_label.jmx</stringProp></JSR223PreProcessor>
+        <hashTree/>
+        <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
+            <stringProp name="BeanShellSampler.query">
+                vars.put("testLabel", "Remove Configurable Product From Cart");
+            </stringProp>
+            <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+        </BeanShellSampler>
+        <hashTree/>
+    
+    <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+      <collectionProp name="HeaderManager.headers">
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Content-Type</stringProp>
+          <stringProp name="Header.value">application/json</stringProp>
+        </elementProp>
+        <elementProp name="" elementType="Header">
+          <stringProp name="Header.name">Accept</stringProp>
+          <stringProp name="Header.value">*/*</stringProp>
+        </elementProp>
+      </collectionProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/api/header_manager_before_token.jmx</stringProp></HeaderManager>
+    <hashTree/>
+  
+      <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Init Random Generator" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/init_random_generator_setup.jmx</stringProp>
+        <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = new Random();
+if (${seedForRandom} &gt; 0) {
+    random.setSeed(${seedForRandom} + ${__threadNum});
+}
+
+vars.putObject("randomIntGenerator", random);
+        </stringProp>
+        <stringProp name="BeanShellSampler.filename"/>
+        <stringProp name="BeanShellSampler.parameters"/>
+        <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+      </BeanShellSampler>
+      <hashTree/>
+    
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
+      <hashTree/>
+    </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="" elementType="HTTPArgument">
+            <boolProp name="HTTPArgument.always_encode">false</boolProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+      <stringProp name="HTTPSampler.contentEncoding"/>
+      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
+      <stringProp name="HTTPSampler.method">POST</stringProp>
+      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+      <boolProp name="HTTPSampler.monitor">false</boolProp>
+      <stringProp name="HTTPSampler.embedded_url_re"/>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">8</intProp>
+        <intProp name="Assertion.test_type">2</intProp>
       </ResponseAssertion>
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Billing Address On Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"test region\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        address_type\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_billing_address_on_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1147076914">{"data":{"setBillingAddressOnCart":{"cart":{"billing_address":{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"},"address_type":"BILLING"}}}}}</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">8</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Address On Cart" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"test region\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        address_type\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -40885,27 +42809,36 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_address_on_cart.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1671866339">{"data":{"setShippingAddressesOnCart":{"cart":{"shipping_addresses":[{"firstname":"test firstname","lastname":"test lastname","company":"test company","street":["test street 1","test street 2"],"city":"test city","postcode":"887766","telephone":"88776655","country":{"code":"US","label":"US"},"address_type":"SHIPPING"}]}}}}</stringProp>
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">8</intProp>
+        <intProp name="Assertion.test_type">2</intProp>
       </ResponseAssertion>
       <hashTree/>
-    </hashTree>
+    
+    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
+      <stringProp name="VAR">product_option</stringProp>
+      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
+      <stringProp name="DEFAULT"/>
+      <stringProp name="VARIABLE"/>
+      <stringProp name="SUBJECT">BODY</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+    <hashTree/>
+  </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Payment Method On Cart" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  setPaymentMethodOnCart(input: {\n    cart_id: \"${quote_id}\", \n    payment_method: {\n      code: \"checkmo\"\n    }\n  }) {\n    cart {\n      selected_payment_method {\n        code\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            qty: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        qty\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -40924,27 +42857,28 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_payment_method_on_cart.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1830199373">{"data":{"setPaymentMethodOnCart":{"cart":{"selected_payment_method":{"code":"checkmo"}}}}}</stringProp>
+          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
+          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">8</intProp>
+        <intProp name="Assertion.test_type">2</intProp>
       </ResponseAssertion>
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Current Shipping Address" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    shipping_addresses {\n      address_id\n      }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -40963,59 +42897,29 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_current_shipping_address.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
       <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">address_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.shipping_addresses[0].address_id</stringProp>
+        <stringProp name="VAR">item_id</stringProp>
+        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
         <stringProp name="DEFAULT"/>
         <stringProp name="VARIABLE"/>
         <stringProp name="SUBJECT">BODY</stringProp>
       </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
       <hashTree/>
-    </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Set Shipping Method On Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingMethodsOnCart(input: \n    {\n      cart_id: \"${quote_id}\", \n      shipping_methods: [{\n        cart_address_id: ${address_id}\n        carrier_code: \"flatrate\"\n        method_code: \"flatrate\"\n      }]\n    }) {\n    cart {\n      shipping_addresses {\n        selected_shipping_method {\n          carrier_code\n          method_code\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/set_shipping_method_on_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="644143859">{"data":{"setShippingMethodsOnCart":{"cart":{"shipping_addresses":[{"selected_shipping_method":{"carrier_code":"flatrate","method_code":"flatrate"}}]}}}}</stringProp>
+          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">8</intProp>
+        <intProp name="Assertion.test_type">2</intProp>
       </ResponseAssertion>
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Simple Product From Cart" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Configurable Product From Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
@@ -41040,7 +42944,7 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_simple_product_from_cart.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_configurable_product_from_cart.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
@@ -41056,11 +42960,11 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Add Configurable Product To Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Checkout By Guest" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
-      <stringProp name="ThroughputController.percentThroughput">${graphqlAddConfigurableProductToCartPercentage}</stringProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlCheckoutByGuestPercentage}</stringProp>
     <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/scenario_controller_tmpl.jmx</stringProp></ThroughputController>
     <hashTree>
         <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="Set Test Label" enabled="true">
@@ -41081,7 +42985,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Add Configurable Product To Cart");
+                vars.put("testLabel", "Checkout By Guest");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -41119,33 +43023,13 @@ vars.putObject("randomIntGenerator", random);
       </BeanShellSampler>
       <hashTree/>
     
-    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
-      <stringProp name="BeanShellSampler.query">
-import java.util.Random;
-
-Random random = vars.getObject("randomIntGenerator");
-number = random.nextInt(props.get("configurable_products_list").size());
-product = props.get("configurable_products_list").get(number);
-
-vars.put("product_url_key", product.get("url_key"));
-vars.put("product_id", product.get("id"));
-vars.put("product_name", product.get("title"));
-vars.put("product_uenc", product.get("uenc"));
-vars.put("product_sku", product.get("sku"));
-      </stringProp>
-      <stringProp name="BeanShellSampler.filename"/>
-      <stringProp name="BeanShellSampler.parameters"/>
-      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
-    <hashTree/>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -41164,36 +43048,35 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
+      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
+        <stringProp name="VAR">quote_id</stringProp>
+        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <hashTree/>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
+          <stringProp name="1404608713">{"data":{"createEmptyCart":"</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
         <intProp name="Assertion.test_type">2</intProp>
       </ResponseAssertion>
       <hashTree/>
-    
-    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
-      <stringProp name="VAR">product_option</stringProp>
-      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
-      <stringProp name="DEFAULT"/>
-      <stringProp name="VARIABLE"/>
-      <stringProp name="SUBJECT">BODY</stringProp>
-    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-    <hashTree/>
-  </hashTree>
+    </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create Empty Cart" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Empty Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  createEmptyCart\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -41212,26 +43095,47 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/create_empty_cart.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_empty_cart.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract cart id" enabled="true">
-        <stringProp name="VAR">quote_id</stringProp>
-        <stringProp name="JSONPATH">$.data.createEmptyCart</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1901638450">{"data":{"cart":{"items":[]}}}</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">8</intProp>
+      </ResponseAssertion>
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("configurable_products_list").size());
+product = props.get("configurable_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/configurable_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Configurable Product Details by name" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            qty: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        qty\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"query productDetailByName($name: String, $onServer: Boolean!) {\n    products(filter: { name: { eq: $name } }) {\n        items {\n            id\n            sku\n            name\n            ... on ConfigurableProduct {\n                configurable_options {\n                    attribute_code\n                    attribute_id\n                    id\n                    label\n                    values {\n                        default_label\n                        label\n                        store_label\n                        use_default_value\n                        value_index\n                    }\n                }\n                variants {\n                    product {\n                        #fashion_color\n                        #fashion_size\n                        id\n                        media_gallery_entries {\n                            disabled\n                            file\n                            label\n                            position\n                        }\n                        sku\n                        stock_status\n                    }\n                }\n            }\n            meta_title @include(if: $onServer)\n            meta_keyword @include(if: $onServer)\n            meta_description @include(if: $onServer)\n        }\n    }\n}","variables":{"name":"${product_name}","onServer":false},"operationName":"productDetailByName"}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -41250,28 +43154,36 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_configurable_product_details_by_name.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
-          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
+          <stringProp name="1201352014">"sku":"${product_sku}","name":"${product_name}"</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
         <intProp name="Assertion.test_type">2</intProp>
       </ResponseAssertion>
       <hashTree/>
-    </hashTree>
+    
+    <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract Configurable Product option" enabled="true">
+      <stringProp name="VAR">product_option</stringProp>
+      <stringProp name="JSONPATH">$.data.products.items[0].variants[0].product.sku</stringProp>
+      <stringProp name="DEFAULT"/>
+      <stringProp name="VARIABLE"/>
+      <stringProp name="SUBJECT">BODY</stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/extract_configurable_product_option.jmx</stringProp></com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+    <hashTree/>
+  </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Configurable Product To Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  addConfigurableProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          variant_sku: \"${product_option}\"\n          data: {\n            qty: 2\n            sku: \"${product_option}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        id\n        qty\n        product {\n          name\n          sku\n        }\n        ... on ConfigurableCartItem {\n          configurable_options {\n            option_label\n          }\n        }\n    }\n  }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -41290,26 +43202,48 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_configurable_product_to_cart.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">item_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
+      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+        <collectionProp name="Asserion.test_strings">
+          <stringProp name="1421843282">addConfigurableProductsToCart</stringProp>
+          <stringProp name="675049292">"sku":"${product_option}"</stringProp>
+        </collectionProp>
+        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+        <boolProp name="Assertion.assume_success">false</boolProp>
+        <intProp name="Assertion.test_type">2</intProp>
+      </ResponseAssertion>
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Update Configurable Product qty In Cart" enabled="true">
+    <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
+      <stringProp name="BeanShellSampler.query">
+import java.util.Random;
+
+Random random = vars.getObject("randomIntGenerator");
+number = random.nextInt(props.get("simple_products_list").size());
+product = props.get("simple_products_list").get(number);
+
+vars.put("product_url_key", product.get("url_key"));
+vars.put("product_id", product.get("id"));
+vars.put("product_name", product.get("title"));
+vars.put("product_uenc", product.get("uenc"));
+vars.put("product_sku", product.get("sku"));
+      </stringProp>
+      <stringProp name="BeanShellSampler.filename"/>
+      <stringProp name="BeanShellSampler.parameters"/>
+      <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/product_browsing_and_adding_items_to_the_cart/simple_products_setup.jmx</stringProp></BeanShellSampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Add Simple Product To Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  updateCartItems(input: {\n    cart_id: \"${quote_id}\"\n    cart_items: [\n      {\n        cart_item_id: ${item_id}\n        quantity: 5\n      }\n    ]\n  }) {\n    cart {\n      items {\n        id\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"mutation {  \n  addSimpleProductsToCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cartItems: [\n        {\n          data: {\n            qty: 2\n            sku: \"${product_sku}\"\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      items {\n        qty\n        product {\n          sku\n        }\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -41328,16 +43262,17 @@ vars.put("product_sku", product.get("sku"));
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/update_configurable_product_qty_in_cart.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/add_simple_product_to_cart.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="664196114">{"data":{"updateCartItems":{"cart":{"items":[{"id":"${item_id}","qty":5}]}}}}</stringProp>
+          <stringProp name="1421843282">addSimpleProductsToCart</stringProp>
+          <stringProp name="-1173443935">"sku":"${product_sku}"</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">8</intProp>
+        <intProp name="Assertion.test_type">2</intProp>
       </ResponseAssertion>
       <hashTree/>
     </hashTree>
@@ -41535,45 +43470,6 @@ vars.put("product_sku", product.get("sku"));
       </ResponseAssertion>
       <hashTree/>
     </hashTree>
-  
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Remove Configurable Product From Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  removeItemFromCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      cart_item_id: ${item_id}\n    }\n  ) {\n    cart {\n      items {\n        qty\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/remove_configurable_product_from_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="1452665323">{"data":{"removeItemFromCart":{"cart":{"items":[]}}}}</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">8</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
   </hashTree>
 
   </hashTree>

From 4d84b348c26b4695ec47d9304bb6c83b124306cc Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Thu, 11 Apr 2019 15:18:07 -0500
Subject: [PATCH 1035/1055] MC-15824: Create new GraphQL script for our
 benchmark - part 3

---
 setup/performance-toolkit/benchmark.jmx | 314 +-----------------------
 1 file changed, 8 insertions(+), 306 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 760cba726def6..7207dd53be92d 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -40872,7 +40872,7 @@ vars.putObject("randomIntGenerator", random);
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Empty Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
@@ -40897,24 +40897,16 @@ vars.putObject("randomIntGenerator", random);
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_empty_cart.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">item_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+          <stringProp name="1901638450">{"data":{"cart":{"items":[]}}}</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
+        <intProp name="Assertion.test_type">8</intProp>
       </ResponseAssertion>
       <hashTree/>
     </hashTree>
@@ -41070,7 +41062,7 @@ vars.putObject("randomIntGenerator", random);
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Empty Cart" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">
@@ -41095,24 +41087,16 @@ vars.putObject("randomIntGenerator", random);
       <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
       <boolProp name="HTTPSampler.monitor">false</boolProp>
       <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_empty_cart.jmx</stringProp>
     </HTTPSamplerProxy>
     <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">item_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
       <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
         <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
+          <stringProp name="1901638450">{"data":{"cart":{"items":[]}}}</stringProp>
         </collectionProp>
         <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
         <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
+        <intProp name="Assertion.test_type">8</intProp>
       </ResponseAssertion>
       <hashTree/>
     </hashTree>
@@ -41268,53 +41252,6 @@ vars.putObject("randomIntGenerator", random);
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">item_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
       <stringProp name="BeanShellSampler.query">
 import java.util.Random;
@@ -41487,53 +41424,6 @@ vars.putObject("randomIntGenerator", random);
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">item_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
       <stringProp name="BeanShellSampler.query">
 import java.util.Random;
@@ -41754,53 +41644,6 @@ vars.putObject("randomIntGenerator", random);
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">item_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
       <stringProp name="BeanShellSampler.query">
 import java.util.Random;
@@ -42059,53 +41902,6 @@ vars.putObject("randomIntGenerator", random);
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">item_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
       <stringProp name="BeanShellSampler.query">
 import java.util.Random;
@@ -42412,53 +42208,6 @@ vars.putObject("randomIntGenerator", random);
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">item_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Simple Product Data" enabled="true">
       <stringProp name="BeanShellSampler.query">
 import java.util.Random;
@@ -42717,53 +42466,6 @@ vars.putObject("randomIntGenerator", random);
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Cart" enabled="true">
-      <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
-      <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
-        <collectionProp name="Arguments.arguments">
-          <elementProp name="" elementType="HTTPArgument">
-            <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      qty\n      product {\n        sku\n      }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
-            <stringProp name="Argument.metadata">=</stringProp>
-          </elementProp>
-        </collectionProp>
-      </elementProp>
-      <stringProp name="HTTPSampler.domain"/>
-      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
-      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
-      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
-      <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
-      <stringProp name="HTTPSampler.contentEncoding"/>
-      <stringProp name="HTTPSampler.path">${base_path}graphql</stringProp>
-      <stringProp name="HTTPSampler.method">POST</stringProp>
-      <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-      <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-      <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-      <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-      <boolProp name="HTTPSampler.monitor">false</boolProp>
-      <stringProp name="HTTPSampler.embedded_url_re"/>
-      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/graphql/get_cart.jmx</stringProp>
-    </HTTPSamplerProxy>
-    <hashTree>
-      <com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor guiclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.gui.JSONPathExtractorGui" testclass="com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor" testname="Extract item id" enabled="true">
-        <stringProp name="VAR">item_id</stringProp>
-        <stringProp name="JSONPATH">$.data.cart.items[0].id</stringProp>
-        <stringProp name="DEFAULT"/>
-        <stringProp name="VARIABLE"/>
-        <stringProp name="SUBJECT">BODY</stringProp>
-      </com.atlantbh.jmeter.plugins.jsonutils.jsonpathextractor.JSONPathExtractor>
-      <hashTree/>
-      <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
-        <collectionProp name="Asserion.test_strings">
-          <stringProp name="-1486007127">{"data":{"cart":{"items":</stringProp>
-        </collectionProp>
-        <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-        <boolProp name="Assertion.assume_success">false</boolProp>
-        <intProp name="Assertion.test_type">2</intProp>
-      </ResponseAssertion>
-      <hashTree/>
-    </hashTree>
-  
     <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Prepare Configurable Product Data" enabled="true">
       <stringProp name="BeanShellSampler.query">
 import java.util.Random;

From 6c14bd8f4fb4e78044906b483d7e53074b648227 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 12 Apr 2019 12:28:08 +0300
Subject: [PATCH 1036/1055] magento/magento2#20832: Static test fix.

---
 .../Magento/luma/Magento_Theme/web/css/source/_module.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 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 f45a6ee945c0f..dfcc51e0a0a26 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
@@ -112,8 +112,8 @@
                 font-size: @font-size__base;
                 margin: 0 0 0 15px;
 
-                &.customer-welcome{
-                   margin: 0 0 0 5px;
+                &.customer-welcome {
+                    margin: 0 0 0 5px;
                 }
 
                 > a {

From 204675e48423e7472761373cebab698787baffdc Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 12 Apr 2019 13:30:56 +0300
Subject: [PATCH 1037/1055] magento/magento2#20182: Static test fix.

---
 .../Magento/Framework/App/Test/Unit/DocRootLocatorTest.php     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
index fd6c1f208080a..ef4152ba2e49e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\App\DocRootLocator;
 
+/**
+ * Test for Magento\Framework\App\DocRootLocator class.
+ */
 class DocRootLocatorTest extends \PHPUnit\Framework\TestCase
 {
     /**

From 3b2f83a295f7fcb37b4cc385951cc9c584e5c381 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 12 Apr 2019 13:49:27 +0300
Subject: [PATCH 1038/1055] magento/magento2#22210: Static tests fix.

---
 .../Product/Edit/Tab/Attributes/Extend.php       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
index 4654144ce6873..a768e2450bfe8 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
+
 /**
- * Bundle Extended Attribures Block
+ * Bundle Extended Attribures Block.
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @author Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
-
 class Extend extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
 {
     /**
@@ -85,6 +85,8 @@ public function getParentElementHtml()
     }
 
     /**
+     * Get options.
+     *
      * @return array
      */
     public function getOptions()
@@ -106,6 +108,8 @@ public function getOptions()
     }
 
     /**
+     * Is disabled field.
+     *
      * @return bool
      */
     public function isDisabledField()
@@ -118,6 +122,8 @@ public function isDisabledField()
     }
 
     /**
+     * Get product.
+     *
      * @return mixed
      */
     public function getProduct()
@@ -129,6 +135,8 @@ public function getProduct()
     }
 
     /**
+     * Get extended element.
+     *
      * @param string $switchAttributeCode
      * @return \Magento\Framework\Data\Form\Element\Select
      * @throws \Magento\Framework\Exception\LocalizedException

From d189b695f831c099cb050585e76c42d3894ca324 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 12 Apr 2019 14:49:46 +0300
Subject: [PATCH 1039/1055] magento/magento2#22073: Static test fix.

---
 .../Observer/SaveDownloadableOrderItemObserver.php   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index 19339e4484ef6..7c1d2748a3e9c 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -9,6 +9,8 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
+ * Saves data from order to purchased links.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SaveDownloadableOrderItemObserver implements ObserverInterface
@@ -159,7 +161,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                             \Magento\Sales\Model\Order\Item::STATUS_PENDING == $orderStatusToEnableItem ?
                             \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE :
                             \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING
-                       )->setCreatedAt(
+                        )->setCreatedAt(
                             $orderItem->getCreatedAt()
                         )->setUpdatedAt(
                             $orderItem->getUpdatedAt()
@@ -173,6 +175,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     }
 
     /**
+     * Create purchased model.
+     *
      * @return \Magento\Downloadable\Model\Link\Purchased
      */
     protected function _createPurchasedModel()
@@ -181,6 +185,8 @@ protected function _createPurchasedModel()
     }
 
     /**
+     * Create product model.
+     *
      * @return \Magento\Catalog\Model\Product
      */
     protected function _createProductModel()
@@ -189,6 +195,8 @@ protected function _createProductModel()
     }
 
     /**
+     * Create purchased item model.
+     *
      * @return \Magento\Downloadable\Model\Link\Purchased\Item
      */
     protected function _createPurchasedItemModel()
@@ -197,6 +205,8 @@ protected function _createPurchasedItemModel()
     }
 
     /**
+     * Create items collection.
+     *
      * @return \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\Collection
      */
     protected function _createItemsCollection()

From c4ecfdbcaabe16ffa1008068e2e63478b2b34a9f Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 12 Apr 2019 17:26:27 +0300
Subject: [PATCH 1040/1055] magento/magento2#/22201: Static test fix.

---
 app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
index b117c127dff39..863f273225693 100644
--- a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -69,6 +69,7 @@ public function __construct(
 
     /**
      * Overloaded method for getting list of bundle options
+     *
      * Caches result in quote item, because it can be used in cart 'recent view' and on same page in cart checkout
      *
      * @return array

From 260ca860fa6a7630f43731ca6336fab4f099b505 Mon Sep 17 00:00:00 2001
From: "Lopukhov, Stanislav" <lopukhov@adobe.com>
Date: Fri, 12 Apr 2019 09:33:24 -0500
Subject: [PATCH 1041/1055] MC-15826: Create new GraphQL script for our
 benchmark - part 4

---
 setup/performance-toolkit/benchmark.jmx | 84 ++++++++++++-------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 7207dd53be92d..696b1964101a5 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -39225,7 +39225,7 @@ if (name == null) {
             <stringProp name="ThreadGroup.delay"/>
         <stringProp name="TestPlan.comments">mpaf/tool/fragments/_system/thread_group.jmx</stringProp></ThreadGroup>
         <hashTree>
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get List of Products by category_id" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get List of Products by category_id" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -39250,7 +39250,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get List of Products by category_id");
+                vars.put("testLabel", "GraphQL Get List of Products by category_id");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -39347,7 +39347,7 @@ vars.putObject("category", categories[number]);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Simple Product Details by product_url_key" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Simple Product Details by product_url_key" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -39372,7 +39372,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Simple Product Details by product_url_key");
+                vars.put("testLabel", "GraphQL Get Simple Product Details by product_url_key");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -39471,7 +39471,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Simple Product Details by name" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Simple Product Details by name" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -39496,7 +39496,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Simple Product Details by name");
+                vars.put("testLabel", "GraphQL Get Simple Product Details by name");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -39595,7 +39595,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Configurable Product Detail by product_url_key" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Configurable Product Detail by product_url_key" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -39620,7 +39620,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Configurable Product Detail by product_url_key");
+                vars.put("testLabel", "GraphQL Get Configurable Product Detail by product_url_key");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -39719,7 +39719,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Configurable Product Detail by name" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Configurable Product Detail by name" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -39744,7 +39744,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Configurable Product Detail by name");
+                vars.put("testLabel", "GraphQL Get Configurable Product Detail by name");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -39843,7 +39843,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Product Search by text and category_id" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Product Search by text and category_id" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -39868,7 +39868,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Product Search by text and category_id");
+                vars.put("testLabel", "GraphQL Get Product Search by text and category_id");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -39986,7 +39986,7 @@ if (totalCount == null) {
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Category List by category_id" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Category List by category_id" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -40011,7 +40011,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Category List by category_id");
+                vars.put("testLabel", "GraphQL Get Category List by category_id");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -40134,7 +40134,7 @@ function assertCategoryChildren(category, response) {
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Url Info by url_key" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Url Info by url_key" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -40159,7 +40159,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Url Info by url_key");
+                vars.put("testLabel", "GraphQL Get Url Info by url_key");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -40257,7 +40257,7 @@ vars.putObject("category", categories[number]);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Cms Page by id" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Cms Page by id" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -40282,7 +40282,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Cms Page by id");
+                vars.put("testLabel", "GraphQL Get Cms Page by id");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -40377,7 +40377,7 @@ vars.put("cms_page_id", cmsPages[number].id);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Navigation Menu by category_id" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Navigation Menu by category_id" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -40402,7 +40402,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Navigation Menu by category_id");
+                vars.put("testLabel", "GraphQL Get Navigation Menu by category_id");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -40499,7 +40499,7 @@ vars.putObject("category", categories[number]);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Create Empty Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Create Empty Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -40524,7 +40524,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Create Empty Cart");
+                vars.put("testLabel", "GraphQL Create Empty Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -40611,7 +40611,7 @@ vars.putObject("randomIntGenerator", random);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Get Empty Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Empty Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -40636,7 +40636,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Get Empty Cart");
+                vars.put("testLabel", "GraphQL Get Empty Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -40762,7 +40762,7 @@ vars.putObject("randomIntGenerator", random);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Set Shipping Address On Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Set Shipping Address On Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -40787,7 +40787,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Set Shipping Address On Cart");
+                vars.put("testLabel", "GraphQL Set Shipping Address On Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -40952,7 +40952,7 @@ vars.putObject("randomIntGenerator", random);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Set Billing Address On Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Set Billing Address On Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -40977,7 +40977,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Set Billing Address On Cart");
+                vars.put("testLabel", "GraphQL Set Billing Address On Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -41142,7 +41142,7 @@ vars.putObject("randomIntGenerator", random);
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Add Simple Product To Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Add Simple Product To Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -41167,7 +41167,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Add Simple Product To Cart");
+                vars.put("testLabel", "GraphQL Add Simple Product To Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -41314,7 +41314,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Add Configurable Product To Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Add Configurable Product To Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -41339,7 +41339,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Add Configurable Product To Cart");
+                vars.put("testLabel", "GraphQL Add Configurable Product To Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -41534,7 +41534,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Update Simple Product Qty In Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Update Simple Product Qty In Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -41559,7 +41559,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Update Simple Product Qty In Cart");
+                vars.put("testLabel", "GraphQL Update Simple Product Qty In Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -41792,7 +41792,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Update Configurable Product Qty In Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Update Configurable Product Qty In Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -41817,7 +41817,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Update Configurable Product Qty In Cart");
+                vars.put("testLabel", "GraphQL Update Configurable Product Qty In Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -42098,7 +42098,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Remove Simple Product From Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Remove Simple Product From Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -42123,7 +42123,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Remove Simple Product From Cart");
+                vars.put("testLabel", "GraphQL Remove Simple Product From Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -42356,7 +42356,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Remove Configurable Product From Cart" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Remove Configurable Product From Cart" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -42381,7 +42381,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Remove Configurable Product From Cart");
+                vars.put("testLabel", "GraphQL Remove Configurable Product From Cart");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>
@@ -42662,7 +42662,7 @@ vars.put("product_sku", product.get("sku"));
   </hashTree>
 
   
-    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="Checkout By Guest" enabled="true">
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Checkout By Guest" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
       <intProp name="ThroughputController.maxThroughput">1</intProp>
@@ -42687,7 +42687,7 @@ if (testLabel
         <hashTree/>
         <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="SetUp - Set Label" enabled="true">
             <stringProp name="BeanShellSampler.query">
-                vars.put("testLabel", "Checkout By Guest");
+                vars.put("testLabel", "GraphQL Checkout By Guest");
             </stringProp>
             <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
         </BeanShellSampler>

From 101a82ed526e98193ba95cda96a055a75182ce71 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 12 Apr 2019 09:36:31 -0500
Subject: [PATCH 1042/1055] MQE-1492: Deliver weekly mtf-to-mftf PR

- Skip QuickSearchWithTwoCharsEmptyResults
---
 .../CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
index 8c5ea9f8205c4..19db201e91f40 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -107,6 +107,9 @@
             <testCaseId value="MC-14794"/>
             <group value="CatalogSearch"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-15827"/>
+            </skip>
         </annotations>
         <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,2); return ret;" stepKey="getFirstTwoLetters" before="searchStorefront"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">

From ce3097f992dfa2c784be934dd29a1b9401a4f83d Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 12 Apr 2019 17:36:32 +0300
Subject: [PATCH 1043/1055] magento/magento2#22220: Static test fix.

---
 .../integration/testsuite/Magento/Sales/_files/order_list.php    | 1 +
 1 file changed, 1 insertion(+)

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 8a1da8e8a3eb1..99122d72df4b7 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
@@ -9,6 +9,7 @@
 use Magento\Sales\Model\Order\Address as OrderAddress;
 use Magento\Sales\Model\Order\Payment;
 
+// phpcs:ignore Magento2.Security.IncludeFile
 require 'order.php';
 /** @var Order $order */
 /** @var  Order\Payment $payment */

From 87312d4b58e57f70962ebc7078dd87cf2a29ac6c Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 12 Apr 2019 11:36:08 -0500
Subject: [PATCH 1044/1055] GraphQL-564: [Checkout coverage]
 setGuestEmailOnCart mutation

---
 .../testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
index 648b8265ee674..31f60afc1331f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
@@ -226,7 +226,7 @@ public function testPlaceOrderWithOutOfStockProduct()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
      */
-    public function testPlaceOrderOfAnotherCustomerCart()
+    public function testPlaceOrderOfCustomerCart()
     {
         $reservedOrderId = 'test_quote';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);

From 1834026df5298f91ff7fd746e458172a6d299d9b Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 12 Apr 2019 11:56:18 -0500
Subject: [PATCH 1045/1055] GraphQL-295: [Place order] Place order mutation

-- fixes after merge with mainline
---
 .../GraphQl/CatalogInventory/AddProductToCartTest.php       | 6 +++---
 .../AddConfigurableProductToCartTest.php                    | 6 +++---
 .../Quote/AddSimpleProductWithCustomOptionsToCartTest.php   | 4 ++--
 .../Quote/AddVirtualProductWithCustomOptionsToCartTest.php  | 4 ++--
 .../GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php   | 2 +-
 .../GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php | 2 +-
 .../GraphQl/Quote/Guest/AddSimpleProductToCartTest.php      | 4 ++--
 .../GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php      | 2 +-
 .../GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php    | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
index 86e71d9914fe3..99f1dc004c50f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -43,7 +43,7 @@ public function testAddProductIfQuantityIsNotAvailable()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -62,7 +62,7 @@ public function testAddMoreProductsThatAllowed()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -78,7 +78,7 @@ public function testAddSimpleProductToCartWithNegativeQty()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
index e4ae59cc0d281..d22cd14a4ae26 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
@@ -41,7 +41,7 @@ public function testAddConfigurableProductToCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery($maskedQuoteId, $variantSku, $qty);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         $cartItems = $response['addConfigurableProductsToCart']['cart']['items'];
         self::assertEquals($qty, $cartItems[0]['qty']);
@@ -61,7 +61,7 @@ public function testAddProductIfQuantityIsNotAvailable()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery($maskedQuoteId, $variantSku, $qty);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -77,7 +77,7 @@ public function testAddOutOfStockProduct()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery($maskedQuoteId, $variantSku, $qty);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
index 6da1b2c9b54c9..f33ccce82fcb7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
@@ -86,7 +86,7 @@ public function testAddSimpleProductWithOptions()
 }
 QUERY;
 
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('items', $response['addSimpleProductsToCart']['cart']);
         self::assertCount(1, $response['addSimpleProductsToCart']['cart']);
@@ -148,7 +148,7 @@ public function testAddSimpleProductWithNoRequiredOptionsSet()
             'The product\'s required option(s) weren\'t entered. Make sure the options are entered and try again.'
         );
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
index 1e1ee91336107..ffd52bcf7fb15 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
@@ -86,7 +86,7 @@ public function testAddVirtualProductWithOptions()
 }
 QUERY;
 
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('items', $response['addVirtualProductsToCart']['cart']);
         self::assertCount(1, $response['addVirtualProductsToCart']['cart']);
@@ -148,7 +148,7 @@ public function testAddVirtualProductWithNoRequiredOptionsSet()
             'The product\'s required option(s) weren\'t entered. Make sure the options are entered and try again.'
         );
 
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index 93782f93402e1..2604ec5f0a0f9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -221,7 +221,7 @@ public function testSetDisabledPaymentOnCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index e64bbf7a75449..0fc52443e86b9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -452,7 +452,7 @@ public function testSetShippingMethodOnAnEmptyCart()
             $carrierCode,
             $quoteAddressId
         );
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
index 3270449f3e8dd..25221b628e7fb 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
@@ -41,7 +41,7 @@ public function testAddSimpleProductToCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
         self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
 
         self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][0]['qty']);
@@ -61,7 +61,7 @@ public function testAddProductToNonExistentCart()
         $maskedQuoteId = 'non_existent_masked_id';
 
         $query = $this->getQuery($maskedQuoteId, $sku, $qty);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index 33183f175e425..4ea7eac290f80 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -232,7 +232,7 @@ public function testSetDisabledPaymentOnCart()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $methodCode);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 72d6e02ffaadc..59f53d2ad6856 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -403,7 +403,7 @@ public function testSetShippingMethodOnAnEmptyCart()
             $carrierCode,
             $quoteAddressId
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**

From 78f02fa51cd4322bd89785c95805ca4b7359443a Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Sat, 13 Apr 2019 09:27:02 +0300
Subject: [PATCH 1046/1055] magento/graphql-ce#540: Replace deprecated fixture

---
 .../Ups/SetUpsShippingMethodsOnCartTest.php   | 160 ++++++++++++++----
 1 file changed, 124 insertions(+), 36 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index d4e6448eb5fbf..3e2d6d23f6c2d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -55,20 +55,21 @@ protected function setUp()
     }
 
     /**
+     * Set "Next Day Air Early AM" UPS shipping method
+     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
-     *
-     * @param string $carrierMethodCode
-     * @param string $carrierMethodLabel
-     * @dataProvider availableForCartShippingMethods
      */
-    public function testSetAvailableForCartUpsShippingMethod(string $carrierMethodCode, string $carrierMethodLabel)
+    public function testSetNextDayAirEarlyAmUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
+        $carrierMethodCode = '1DM';
+        $carrierMethodLabel = 'Next Day Air Early AM';
+
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
@@ -91,20 +92,21 @@ public function testSetAvailableForCartUpsShippingMethod(string $carrierMethodCo
     }
 
     /**
+     * Set "Next Day Air" UPS shipping method
+     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
-     *
-     * @param string $carrierMethodCode
-     * @param string $carrierMethodLabel
-     * @dataProvider notAvailableForCartShippingMethods
      */
-    public function testSetNotAvailableForCartUpsShippingMethod(string $carrierMethodCode, string $carrierMethodLabel)
+    public function testSetNextDayAirUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
+        $carrierMethodCode = '1DA';
+        $carrierMethodLabel = 'Next Day Air';
+
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
@@ -115,8 +117,41 @@ public function testSetNotAvailableForCartUpsShippingMethod(string $carrierMetho
             $carrierMethodCode
         );
 
-        $this->expectExceptionMessage(
-            "GraphQL response contains errors: Carrier with such method not found: " . self::CARRIER_CODE . ", " . $carrierMethodCode
+        $response = $this->sendRequestWithToken($query);
+
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        $expectedResult = [
+            'carrier_code' => self::CARRIER_CODE,
+            'method_code' => $carrierMethodCode,
+            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
+        ];
+        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+    }
+
+    /**
+     * Set "2nd Day Air" UPS shipping method
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     */
+    public function testSet2ndDayAirUpsShippingMethod()
+    {
+        $quoteReservedId = 'test_quote';
+        $carrierMethodCode = '2DA';
+        $carrierMethodLabel = '2nd Day Air';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
+        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $shippingAddressId,
+            self::CARRIER_CODE,
+            $carrierMethodCode
         );
 
         $response = $this->sendRequestWithToken($query);
@@ -131,56 +166,109 @@ public function testSetNotAvailableForCartUpsShippingMethod(string $carrierMetho
     }
 
     /**
-     * @return array
+     * Set "3 Day Select" UPS shipping method
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
      */
-    public function availableForCartShippingMethods(): array
+    public function testSet3DaySelectUpsShippingMethod()
     {
-        $shippingMethods = ['1DM', '1DA', '2DA', '3DS', 'GND'];
+        $quoteReservedId = 'test_quote';
+        $carrierMethodCode = '3DS';
+        $carrierMethodLabel = '3 Day Select';
 
-        return $this->filterShippingMethodsByCodes($shippingMethods);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
+        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $shippingAddressId,
+            self::CARRIER_CODE,
+            $carrierMethodCode
+        );
+
+        $response = $this->sendRequestWithToken($query);
+
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        $expectedResult = [
+            'carrier_code' => self::CARRIER_CODE,
+            'method_code' => $carrierMethodCode,
+            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
+        ];
+        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
     }
 
     /**
-     * @return array
+     * Set "Ground" UPS shipping method
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
      */
-    public function notAvailableForCartShippingMethods(): array
+    public function testSetGroundUpsShippingMethod()
     {
-        $shippingMethods = ['1DML', '1DAL', '1DAPI', '1DP', '1DPL', '2DM', '2DML', '2DAL', 'GNDCOM', 'GNDRES', 'STD', 'XPR', 'WXS', 'XPRL', 'XDM', 'XDML', 'XPD'];
+        $quoteReservedId = 'test_quote';
+        $carrierMethodCode = 'GND';
+        $carrierMethodLabel = 'Ground';
 
-        return $this->filterShippingMethodsByCodes($shippingMethods);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
+        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $shippingAddressId,
+            self::CARRIER_CODE,
+            $carrierMethodCode
+        );
+
+        $response = $this->sendRequestWithToken($query);
+
+        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
+        $expectedResult = [
+            'carrier_code' => self::CARRIER_CODE,
+            'method_code' => $carrierMethodCode,
+            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
+        ];
+        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
     }
 
+
+
+
+
     /**
-     * @param array $filter
      * @return array
      */
-    private function filterShippingMethodsByCodes(array $filter):array
+    public function notAvailableForCartShippingMethods(): array
     {
-        $result = [];
-        foreach ($this->getAllUpsShippingMethods() as $shippingMethod) {
-            if (in_array($shippingMethod[0], $filter)) {
-                $result[] = $shippingMethod;
-            }
-        }
-        return $result;
+        $shippingMethods = ['1DML', '1DAL', '1DAPI', '1DP', '1DPL', '2DM', '2DML', '2DAL', 'GNDCOM', 'GNDRES', 'STD', 'XPR', 'WXS', 'XPRL', 'XDM', 'XDML', 'XPD'];
+
+        return $this->filterShippingMethodsByCodes($shippingMethods);
     }
 
     private function getAllUpsShippingMethods():array
     {
         return [
-            ['1DM', 'Next Day Air Early AM'],
+            ['1DM', 'Next Day Air Early AM'],              //
             ['1DML', 'Next Day Air Early AM Letter'],
-            ['1DA', 'Next Day Air'],
+            ['1DA', 'Next Day Air'],                       //
             ['1DAL', 'Next Day Air Letter'],
             ['1DAPI', 'Next Day Air Intra (Puerto Rico)'],
             ['1DP', 'Next Day Air Saver'],
             ['1DPL', 'Next Day Air Saver Letter'],
             ['2DM', '2nd Day Air AM'],
             ['2DML', '2nd Day Air AM Letter'],
-            ['2DA', '2nd Day Air'],
+            ['2DA', '2nd Day Air'],                        //
             ['2DAL', '2nd Day Air Letter'],
-            ['3DS', '3 Day Select'],
-            ['GND', 'Ground'],
+            ['3DS', '3 Day Select'],                       //
+            ['GND', 'Ground'],                             //
             ['GNDCOM', 'Ground Commercial'],
             ['GNDRES', 'Ground Residential'],
             ['STD', 'Canada Standard'],

From 8f0c2332e712c174cb8ff946553f87995d9bf4ea Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Sat, 13 Apr 2019 18:35:54 +0300
Subject: [PATCH 1047/1055] magento/graphql-ce#540: Replace deprecated fixture

---
 .../Ups/SetUpsShippingMethodsOnCartTest.php   | 479 +++++++++++-------
 .../Quote/_files/set_new_shipping_address.php |   2 +-
 .../set_new_shipping_canada_address.php       |  43 ++
 3 files changed, 349 insertions(+), 175 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index de05a860f6b06..ccb9257701849 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -14,7 +14,37 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Test for setting "UPS" shipping method on cart
+ * Test for setting "UPS" shipping method on cart. Current class covers the next UPS shipping methods:
+ *
+ * | Code      | Label
+ * --------------------------------------
+ * | 1DM       | Next Day Air Early AM
+ * | 1DA       | Next Day Air
+ * | 2DA       | 2nd Day Air
+ * | 3DS       | 3 Day Select
+ * | GND       | Ground
+ * | STD       | Canada Standard
+ * | XPR       | Worldwide Express
+ * | WXS       | Worldwide Express Saver
+ * | XDM       | Worldwide Express Plus
+ * | XPD       | Worldwide Expedited
+ *
+ * Current class does not cover these UPS shipping methods (depends on sandbox settings)
+ *
+ * | Code      | Label
+ * --------------------------------------
+ * | 1DML      | Next Day Air Early AM Letter
+ * | 1DAL      | Next Day Air Letter
+ * | 1DAPI     | Next Day Air Intra (Puerto Rico)
+ * | 1DP       | Next Day Air Saver
+ * | 1DPL      | Next Day Air Saver Letter
+ * | 2DM       | 2nd Day Air AM
+ * | 2DML      | 2nd Day Air AM Letter
+ * | 2DAL      | 2nd Day Air Letter
+ * | GNDCOM    | Ground Commercial
+ * | GNDRES    | Ground Residential
+ * | XPRL      | Worldwide Express Letter
+ * | XDML      | Worldwide Express Plus Letter
  */
 class SetUpsShippingMethodsOnCartTest extends GraphQlAbstract
 {
@@ -55,24 +85,26 @@ protected function setUp()
     }
 
     /**
+     * Set "Next Day Air Early AM" UPS shipping method
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-     *
-     * @param string $methodCode
-     * @param string $methodLabel
-     * @dataProvider availableForCartShippingMethods
      */
-    public function testSetAvailableUpsShippingMethodOnCart(string $methodCode, string $methodLabel)
+    public function testSetNextDayAirEarlyAmUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
+        $methodCode = '1DM';
+        $methodLabel = 'Next Day Air Early AM';
+
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
         $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
-        $response = $this->graphQlQuery($query);
+        $response = $this->sendRequestWithToken($query);
 
         self::assertArrayHasKey('setShippingMethodsOnCart', $response);
         self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
@@ -96,291 +128,390 @@ public function testSetAvailableUpsShippingMethodOnCart(string $methodCode, stri
     }
 
     /**
-     * Set "Next Day Air Early AM" UPS shipping method
+     * Set "Next Day Air" UPS shipping method
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      */
-    public function testSetNextDayAirEarlyAmUpsShippingMethod()
+    public function testSetNextDayAirUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
-        $carrierMethodCode = '1DM';
-        $carrierMethodLabel = 'Next Day Air Early AM';
+        $methodCode = '1DA';
+        $methodLabel = 'Next Day Air';
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $shippingAddressId,
-            self::CARRIER_CODE,
-            $carrierMethodCode
-        );
-
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
         $response = $this->sendRequestWithToken($query);
 
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        $expectedResult = [
-            'carrier_code' => self::CARRIER_CODE,
-            'method_code' => $carrierMethodCode,
-            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
-        ];
-        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
-     * Set "Next Day Air" UPS shipping method
+     * Set "2nd Day Air" UPS shipping method
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      */
-    public function testSetNextDayAirUpsShippingMethod()
+    public function testSet2ndDayAirUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
-        $carrierMethodCode = '1DA';
-        $carrierMethodLabel = 'Next Day Air';
+        $methodCode = '2DA';
+        $methodLabel = '2nd Day Air';
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $shippingAddressId,
-            self::CARRIER_CODE,
-            $carrierMethodCode
-        );
-
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
         $response = $this->sendRequestWithToken($query);
 
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        $expectedResult = [
-            'carrier_code' => self::CARRIER_CODE,
-            'method_code' => $carrierMethodCode,
-            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
-        ];
-        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
-     * Set "2nd Day Air" UPS shipping method
+     * Set "3 Day Select" UPS shipping method
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      */
-    public function testSet2ndDayAirUpsShippingMethod()
+    public function testSet3DaySelectUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
-        $carrierMethodCode = '2DA';
-        $carrierMethodLabel = '2nd Day Air';
+        $methodCode = '3DS';
+        $methodLabel = '3 Day Select';
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $shippingAddressId,
-            self::CARRIER_CODE,
-            $carrierMethodCode
-        );
-
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
         $response = $this->sendRequestWithToken($query);
 
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        $expectedResult = [
-            'carrier_code' => self::CARRIER_CODE,
-            'method_code' => $carrierMethodCode,
-            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
-        ];
-        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
-     * Set "3 Day Select" UPS shipping method
+     * Set "Ground" UPS shipping method
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      */
-    public function testSet3DaySelectUpsShippingMethod()
+    public function testSetGroundUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
-        $carrierMethodCode = '3DS';
-        $carrierMethodLabel = '3 Day Select';
+        $methodCode = 'GND';
+        $methodLabel = 'Ground';
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $shippingAddressId,
-            self::CARRIER_CODE,
-            $carrierMethodCode
-        );
-
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
         $response = $this->sendRequestWithToken($query);
 
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        $expectedResult = [
-            'carrier_code' => self::CARRIER_CODE,
-            'method_code' => $carrierMethodCode,
-            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
-        ];
-        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
-     * Set "Ground" UPS shipping method
+     * Set "Canada Standard" UPS shipping method
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      */
-    public function testSetGroundUpsShippingMethod()
+    public function testSetCanadaStandardUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
-        $carrierMethodCode = 'GND';
-        $carrierMethodLabel = 'Ground';
+        $methodCode = 'STD';
+        $methodLabel = 'Canada Standard';
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $shippingAddressId,
-            self::CARRIER_CODE,
-            $carrierMethodCode
-        );
-
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
         $response = $this->sendRequestWithToken($query);
 
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        $expectedResult = [
-            'carrier_code' => self::CARRIER_CODE,
-            'method_code' => $carrierMethodCode,
-            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
-        ];
-        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
+     * Set "Worldwide Express" UPS shipping method
+     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/Ups/_files/enable_ups_shipping_method.php
-     *
-     * @param string $carrierMethodCode
-     * @param string $carrierMethodLabel
-     * @dataProvider notAvailableForCartShippingMethods
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      */
-    public function testSetNotAvailableForCartUpsShippingMethod(string $carrierMethodCode, string $carrierMethodLabel)
+    public function testSetWorldwideExpressUpsShippingMethod()
     {
         $quoteReservedId = 'test_quote';
+        $methodCode = 'XPR';
+        $methodLabel = 'Worldwide Express';
+
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
-        $query = $this->getQuery(
-            $maskedQuoteId,
-            $shippingAddressId,
-            self::CARRIER_CODE,
-            $carrierMethodCode
-        );
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
+        $response = $this->sendRequestWithToken($query);
 
-        $this->expectExceptionMessage(
-            "GraphQL response contains errors: Carrier with such method not found: " . self::CARRIER_CODE . ", " . $carrierMethodCode
-        );
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
 
-        $response = $this->sendRequestWithToken($query);
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
 
-        $addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
-        $expectedResult = [
-            'carrier_code' => self::CARRIER_CODE,
-            'method_code' => $carrierMethodCode,
-            'label' => self::CARRIER_LABEL . ' - ' . $carrierMethodLabel,
-        ];
-        self::assertEquals($addressesInformation[0]['selected_shipping_method'], $expectedResult);
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
-     * @return array
+     * Set "Worldwide Express Saver" UPS shipping method
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      */
-    public function availableForCartShippingMethods(): array
+    public function testSetWorldwideExpressSaverUpsShippingMethod()
     {
-        $shippingMethods = ['1DM', '1DA', '2DA', '3DS', 'GND'];
+        $quoteReservedId = 'test_quote';
+        $methodCode = 'WXS';
+        $methodLabel = 'Worldwide Express Saver';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
+        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
+
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
+        $response = $this->sendRequestWithToken($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
 
-        return $this->filterShippingMethodsByCodes($shippingMethods);
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
-     * @return array
+     * Set "Worldwide Express Plus" UPS shipping method
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      */
-    public function notAvailableForCartShippingMethods(): array
+    public function testSetWorldwideExpressPlusUpsShippingMethod()
     {
-        $shippingMethods = ['1DML', '1DAL', '1DAPI', '1DP', '1DPL', '2DM', '2DML', '2DAL', 'GNDCOM', 'GNDRES', 'STD', 'XPR', 'WXS', 'XPRL', 'XDM', 'XDML', 'XPD'];
+        $quoteReservedId = 'test_quote';
+        $methodCode = 'XDM';
+        $methodLabel = 'Worldwide Express Plus';
+
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
+        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
+
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
+        $response = $this->sendRequestWithToken($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
 
-        return $this->filterShippingMethodsByCodes($shippingMethods);
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
-     * @param array $filter
-     * @return array
+     * Set "Worldwide Expedited" UPS shipping method
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
      */
-    private function filterShippingMethodsByCodes(array $filter):array
+    public function testSetWorldwideExpeditedUpsShippingMethod()
     {
-        $result = [];
-        foreach ($this->getAllUpsShippingMethods() as $shippingMethod) {
-            if (in_array($shippingMethod[0], $filter)) {
-                $result[] = $shippingMethod;
-            }
-        }
-        return $result;
-    }
+        $quoteReservedId = 'test_quote';
+        $methodCode = 'XPD';
+        $methodLabel = 'Worldwide Expedited';
 
-    private function getAllUpsShippingMethods():array
-    {
-        return [
-            ['1DM', 'Next Day Air Early AM'],              //
-            ['1DML', 'Next Day Air Early AM Letter'],
-            ['1DA', 'Next Day Air'],                       //
-            ['1DAL', 'Next Day Air Letter'],
-            ['1DAPI', 'Next Day Air Intra (Puerto Rico)'],
-            ['1DP', 'Next Day Air Saver'],
-            ['1DPL', 'Next Day Air Saver Letter'],
-            ['2DM', '2nd Day Air AM'],
-            ['2DML', '2nd Day Air AM Letter'],
-            ['2DA', '2nd Day Air'],                        //
-            ['2DAL', '2nd Day Air Letter'],
-            ['3DS', '3 Day Select'],                       //
-            ['GND', 'Ground'],                             //
-            ['GNDCOM', 'Ground Commercial'],
-            ['GNDRES', 'Ground Residential'],
-            ['STD', 'Canada Standard'],
-            ['XPR', 'Worldwide Express'],
-            ['WXS', 'Worldwide Express Saver'],
-            ['XPRL', 'Worldwide Express Letter'],
-            ['XDM', 'Worldwide Express Plus'],
-            ['XDML', 'Worldwide Express Plus Letter'],
-            ['XPD', 'Worldwide Expedited'],
-        ];
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
+        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
+
+        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
+        $response = $this->sendRequestWithToken($query);
+
+        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
+        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+
+        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+
+        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
+
+        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
+        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
+
+        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
+        self::assertEquals(
+            self::CARRIER_LABEL . ' - ' . $methodLabel,
+            $shippingAddress['selected_shipping_method']['label']
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php
index e17b9e61f82db..54f4d8d0c6e75 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -26,7 +26,7 @@
 
 $quoteAddressData = [
     AddressInterface::KEY_TELEPHONE => 3468676,
-    AddressInterface::KEY_POSTCODE => 75477,
+    AddressInterface::KEY_POSTCODE => '75477',
     AddressInterface::KEY_COUNTRY_ID => 'US',
     AddressInterface::KEY_CITY => 'CityM',
     AddressInterface::KEY_COMPANY => 'CompanyName',
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
new file mode 100644
index 0000000000000..8e60dc904bd4e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\ShippingAddressManagementInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+/** @var AddressInterfaceFactory $quoteAddressFactory */
+$quoteAddressFactory = Bootstrap::getObjectManager()->get(AddressInterfaceFactory::class);
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var ShippingAddressManagementInterface $shippingAddressManagement */
+$shippingAddressManagement = Bootstrap::getObjectManager()->get(ShippingAddressManagementInterface::class);
+
+$quoteAddressData = [
+    AddressInterface::KEY_TELEPHONE => 3468676,
+    AddressInterface::KEY_POSTCODE => 'M4L 1V3',
+    AddressInterface::KEY_COUNTRY_ID => 'CA',
+    AddressInterface::KEY_CITY => 'Toronto',
+    AddressInterface::KEY_COMPANY => 'CompanyName',
+    AddressInterface::KEY_STREET => '500 Kingston Rd',
+    AddressInterface::KEY_LASTNAME => 'Smith',
+    AddressInterface::KEY_FIRSTNAME => 'John',
+    AddressInterface::KEY_REGION_CODE => 'ON',
+];
+$quoteAddress = $quoteAddressFactory->create();
+$dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_quote', 'reserved_order_id');
+$shippingAddressManagement->assign($quote->getId(), $quoteAddress);

From 9d475b828a323d072619c3332fb3408ead9d7ca5 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Sat, 13 Apr 2019 18:49:38 +0300
Subject: [PATCH 1048/1055] magento/graphql-ce#540: Replace deprecated fixture
 1. Use POST for mutation query instead of GET

---
 .../Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index ccb9257701849..b41c7d0898f79 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -567,6 +567,6 @@ private function sendRequestWithToken(string $query): array
         $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
 
-        return $this->graphQlQuery($query, [], '', $headerMap);
+        return $this->graphQlMutation($query, [], '', $headerMap);
     }
 }

From 265d82e51adadf3d1c8ede0166c0aa82eac856f6 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 15 Apr 2019 12:31:55 -0500
Subject: [PATCH 1049/1055] GraphQL-425: [Place order] Cart grand total

---
 .../Resolver/{Totals.php => CartPrices.php}   |   7 +-
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |   2 +-
 .../GraphQl/Quote/Customer/CartTotalsTest.php | 112 ++++++++++--------
 .../GraphQl/Quote/Guest/CartTotalsTest.php    |  69 ++++++-----
 4 files changed, 102 insertions(+), 88 deletions(-)
 rename app/code/Magento/QuoteGraphQl/Model/Resolver/{Totals.php => CartPrices.php} (94%)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
similarity index 94%
rename from app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php
rename to app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
index 926f2b2de3cf2..7a9bdd926764c 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Totals.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
@@ -11,13 +11,14 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address\Total;
 use Magento\Quote\Model\Quote\TotalsCollector;
 
 /**
  * @inheritdoc
  */
-class Totals implements ResolverInterface
+class CartPrices implements ResolverInterface
 {
     /**
      * @var TotalsCollector
@@ -68,10 +69,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
      */
     private function getAppliedTaxes(Total $total, string $currency): array
     {
+        $appliedTaxesData = [];
         $appliedTaxes = $total->getAppliedTaxes();
 
         if (count($appliedTaxes) === 0) {
-            return [];
+            return $appliedTaxesData;
         }
 
         foreach ($appliedTaxes as $appliedTax) {
@@ -80,7 +82,6 @@ private function getAppliedTaxes(Total $total, string $currency): array
                 'amount' => ['value' => $appliedTax['amount'], 'currency' => $currency]
             ];
         }
-
         return $appliedTaxesData;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 85a0703a137e5..70690b1023062 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -173,7 +173,7 @@ type Cart {
     billing_address: CartAddress! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
     available_payment_methods: [AvailablePaymentMethod]  @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AvailablePaymentMethods") @doc(description: "Available payment methods")
     selected_payment_method: SelectedPaymentMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SelectedPaymentMethod")
-    prices: CartPrices @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Totals")
+    prices: CartPrices @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartPrices")
 }
 
 type CartAddress {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
index 4a25e9331d86e..bb8acfce629ff 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
@@ -7,10 +7,8 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -25,26 +23,14 @@ class CartTotalsTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
     }
 
@@ -60,9 +46,9 @@ protected function setUp()
      */
     public function testGetCartTotalsWithTaxApplied()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
-        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
-        $response = $this->sendRequestWithToken($query);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('prices', $response['cart']);
         $pricesResponse = $response['cart']['prices'];
@@ -88,9 +74,9 @@ public function testGetCartTotalsWithTaxApplied()
      */
     public function testGetTotalsWithNoTaxApplied()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
-        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
-        $response = $this->sendRequestWithToken($query);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         $pricesResponse = $response['cart']['prices'];
         self::assertEquals(20, $pricesResponse['grand_total']['value']);
@@ -111,9 +97,9 @@ public function testGetTotalsWithNoTaxApplied()
      */
     public function testGetCartTotalsWithNoAddressSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
-        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
-        $response = $this->sendRequestWithToken($query);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         $pricesResponse = $response['cart']['prices'];
         self::assertEquals(20, $pricesResponse['grand_total']['value']);
@@ -123,13 +109,57 @@ public function testGetCartTotalsWithNoAddressSet()
         self::assertEmpty($pricesResponse['applied_taxes']);
     }
 
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     */
+    public function testGetTotalsFromGuestCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     */
+    public function testGetTotalsFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+    }
+
     /**
      * Generates GraphQl query for retrieving cart totals
      *
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getCartTotalsGraphqlQuery(string $maskedQuoteId): string
+    private function getQuery(string $maskedQuoteId): string
     {
         return <<<QUERY
 {
@@ -165,30 +195,14 @@ private function getCartTotalsGraphqlQuery(string $maskedQuoteId): string
     }
 
     /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
-
-    /**
-     * Sends a GraphQL request with using a bearer token
-     *
-     * @param string $query
+     * @param string $username
+     * @param string $password
      * @return array
-     * @throws \Magento\Framework\Exception\AuthenticationException
      */
-    private function sendRequestWithToken(string $query): array
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
     {
-
-        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-
-        return $this->graphQlQuery($query, [], '', $headerMap);
+        return $headerMap;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
index 9fec6fdfd2697..ee2d6a2b31de0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
@@ -7,9 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -19,26 +17,17 @@
 class CartTotalsTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var QuoteFactory
+     * @inheritdoc
      */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
@@ -52,8 +41,8 @@ protected function setUp()
      */
     public function testGetCartTotalsWithTaxApplied()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
-        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('prices', $response['cart']);
@@ -79,8 +68,8 @@ public function testGetCartTotalsWithTaxApplied()
      */
     public function testGetTotalsWithNoTaxApplied()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
-        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         $pricesResponse = $response['cart']['prices'];
@@ -102,8 +91,8 @@ public function testGetTotalsWithNoTaxApplied()
      */
     public function testGetCartTotalsWithNoAddressSet()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_quote');
-        $query = $this->getCartTotalsGraphqlQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
         $response = $this->graphQlQuery($query);
 
         $pricesResponse = $response['cart']['prices'];
@@ -114,13 +103,35 @@ public function testGetCartTotalsWithNoAddressSet()
         self::assertEmpty($pricesResponse['applied_taxes']);
     }
 
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/apply_tax_for_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     */
+    public function testGetSelectedShippingMethodFromCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlQuery($query);
+    }
+
     /**
      * Generates GraphQl query for retrieving cart totals
      *
      * @param string $maskedQuoteId
      * @return string
      */
-    private function getCartTotalsGraphqlQuery(string $maskedQuoteId): string
+    private function getQuery(string $maskedQuoteId): string
     {
         return <<<QUERY
 {
@@ -154,16 +165,4 @@ private function getCartTotalsGraphqlQuery(string $maskedQuoteId): string
 }
 QUERY;
     }
-
-    /**
-     * @param string $reversedQuoteId
-     * @return string
-     */
-    private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
-    {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
-
-        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
-    }
 }

From 259ee45bcfc4f0db2b74d42518f62f4583d5a41b Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 15 Apr 2019 14:49:14 -0500
Subject: [PATCH 1050/1055] GraphQL-281: [Shipping methods] Support of UPS
 shipping method

---
 .../Ups/SetUpsShippingMethodsOnCartTest.php   | 373 ++----------------
 1 file changed, 28 insertions(+), 345 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index b41c7d0898f79..cfaf53e690c6c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -29,7 +29,7 @@
  * | XDM       | Worldwide Express Plus
  * | XPD       | Worldwide Expedited
  *
- * Current class does not cover these UPS shipping methods (depends on sandbox settings)
+ * Current class does not cover these UPS shipping methods (depends on address and sandbox settings)
  *
  * | Code      | Label
  * --------------------------------------
@@ -81,197 +81,26 @@ protected function setUp()
         $objectManager = Bootstrap::getObjectManager();
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-        $this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(GetQuoteShippingAddressIdByReservedQuoteId::class);
-    }
-
-    /**
-     * Set "Next Day Air Early AM" UPS shipping method
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-     */
-    public function testSetNextDayAirEarlyAmUpsShippingMethod()
-    {
-        $quoteReservedId = 'test_quote';
-        $methodCode = '1DM';
-        $methodLabel = 'Next Day Air Early AM';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
-
-        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-
-        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-
-        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-
-        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-
-        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(
-            self::CARRIER_LABEL . ' - ' . $methodLabel,
-            $shippingAddress['selected_shipping_method']['label']
-        );
-    }
-
-    /**
-     * Set "Next Day Air" UPS shipping method
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-     */
-    public function testSetNextDayAirUpsShippingMethod()
-    {
-        $quoteReservedId = 'test_quote';
-        $methodCode = '1DA';
-        $methodLabel = 'Next Day Air';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
-
-        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-
-        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-
-        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-
-        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-
-        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(
-            self::CARRIER_LABEL . ' - ' . $methodLabel,
-            $shippingAddress['selected_shipping_method']['label']
+        $this->getQuoteShippingAddressIdByReservedQuoteId = $objectManager->get(
+            GetQuoteShippingAddressIdByReservedQuoteId::class
         );
     }
 
     /**
-     * Set "2nd Day Air" UPS shipping method
-     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
      * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-     */
-    public function testSet2ndDayAirUpsShippingMethod()
-    {
-        $quoteReservedId = 'test_quote';
-        $methodCode = '2DA';
-        $methodLabel = '2nd Day Air';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
-
-        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-
-        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-
-        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-
-        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-
-        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(
-            self::CARRIER_LABEL . ' - ' . $methodLabel,
-            $shippingAddress['selected_shipping_method']['label']
-        );
-    }
-
-    /**
-     * Set "3 Day Select" UPS shipping method
      *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-     */
-    public function testSet3DaySelectUpsShippingMethod()
-    {
-        $quoteReservedId = 'test_quote';
-        $methodCode = '3DS';
-        $methodLabel = '3 Day Select';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
-
-        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-
-        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-
-        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-
-        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-
-        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(
-            self::CARRIER_LABEL . ' - ' . $methodLabel,
-            $shippingAddress['selected_shipping_method']['label']
-        );
-    }
-
-    /**
-     * Set "Ground" UPS shipping method
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
+     * @dataProvider dataProviderShippingMethods
+     * @param string $methodCode
+     * @param string $methodLabel
      */
-    public function testSetGroundUpsShippingMethod()
+    public function testSetUpsShippingMethod(string $methodCode, string $methodLabel)
     {
         $quoteReservedId = 'test_quote';
-        $methodCode = 'GND';
-        $methodLabel = 'Ground';
-
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
@@ -300,150 +129,34 @@ public function testSetGroundUpsShippingMethod()
     }
 
     /**
-     * Set "Canada Standard" UPS shipping method
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
+     * @return array
      */
-    public function testSetCanadaStandardUpsShippingMethod()
+    public function dataProviderShippingMethods(): array
     {
-        $quoteReservedId = 'test_quote';
-        $methodCode = 'STD';
-        $methodLabel = 'Canada Standard';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
-
-        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-
-        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-
-        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-
-        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-
-        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(
-            self::CARRIER_LABEL . ' - ' . $methodLabel,
-            $shippingAddress['selected_shipping_method']['label']
-        );
+        return [
+            'Next Day Air Early AM' => ['1DM', 'Next Day Air Early AM'],
+            'Next Day Air' => ['1DA', 'Next Day Air'],
+            '2nd Day Air' => ['2DA', '2nd Day Air'],
+            '3 Day Select' => ['3DS', '3 Day Select'],
+            'Ground' => ['GND', 'Ground'],
+        ];
     }
 
     /**
-     * Set "Worldwide Express" UPS shipping method
-     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
      * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-     */
-    public function testSetWorldwideExpressUpsShippingMethod()
-    {
-        $quoteReservedId = 'test_quote';
-        $methodCode = 'XPR';
-        $methodLabel = 'Worldwide Express';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
-
-        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-
-        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-
-        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-
-        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-
-        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(
-            self::CARRIER_LABEL . ' - ' . $methodLabel,
-            $shippingAddress['selected_shipping_method']['label']
-        );
-    }
-
-    /**
-     * Set "Worldwide Express Saver" UPS shipping method
      *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
-     */
-    public function testSetWorldwideExpressSaverUpsShippingMethod()
-    {
-        $quoteReservedId = 'test_quote';
-        $methodCode = 'WXS';
-        $methodLabel = 'Worldwide Express Saver';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
-
-        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-
-        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-
-        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-
-        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-
-        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(
-            self::CARRIER_LABEL . ' - ' . $methodLabel,
-            $shippingAddress['selected_shipping_method']['label']
-        );
-    }
-
-    /**
-     * Set "Worldwide Express Plus" UPS shipping method
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
+     * @dataProvider dataProviderShippingMethodsBasedOnCanadaAddress
+     * @param string $methodCode
+     * @param string $methodLabel
      */
-    public function testSetWorldwideExpressPlusUpsShippingMethod()
+    public function testSetUpsShippingMethodBasedOnCanadaAddress(string $methodCode, string $methodLabel)
     {
         $quoteReservedId = 'test_quote';
-        $methodCode = 'XDM';
-        $methodLabel = 'Worldwide Express Plus';
-
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
         $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
 
@@ -472,46 +185,16 @@ public function testSetWorldwideExpressPlusUpsShippingMethod()
     }
 
     /**
-     * Set "Worldwide Expedited" UPS shipping method
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_canada_address.php
-     * @magentoApiDataFixture Magento/GraphQl/Ups/_files/enable_ups_shipping_method.php
+     * @return array
      */
-    public function testSetWorldwideExpeditedUpsShippingMethod()
+    public function dataProviderShippingMethodsBasedOnCanadaAddress(): array
     {
-        $quoteReservedId = 'test_quote';
-        $methodCode = 'XPD';
-        $methodLabel = 'Worldwide Expedited';
-
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($quoteReservedId);
-        $shippingAddressId = $this->getQuoteShippingAddressIdByReservedQuoteId->execute($quoteReservedId);
-
-        $query = $this->getQuery($maskedQuoteId, $shippingAddressId, self::CARRIER_CODE, $methodCode);
-        $response = $this->sendRequestWithToken($query);
-
-        self::assertArrayHasKey('setShippingMethodsOnCart', $response);
-        self::assertArrayHasKey('cart', $response['setShippingMethodsOnCart']);
-        self::assertArrayHasKey('shipping_addresses', $response['setShippingMethodsOnCart']['cart']);
-        self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-
-        $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
-        self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
-
-        self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(self::CARRIER_CODE, $shippingAddress['selected_shipping_method']['carrier_code']);
-
-        self::assertArrayHasKey('method_code', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodCode, $shippingAddress['selected_shipping_method']['method_code']);
-
-        self::assertArrayHasKey('label', $shippingAddress['selected_shipping_method']);
-        self::assertEquals(
-            self::CARRIER_LABEL . ' - ' . $methodLabel,
-            $shippingAddress['selected_shipping_method']['label']
-        );
+        return [
+            'Canada Standard' => ['STD', 'Canada Standard'],
+            'Worldwide Express' => ['XPR', 'Worldwide Express'],
+            'Worldwide Express Saver' => ['WXS', 'Worldwide Express Saver'],
+            'Worldwide Express Plus' => ['XDM', 'Worldwide Express Plus'],
+        ];
     }
 
     /**

From c81353d878168776e4bec5b164e9bdaab1e899c8 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 15 Apr 2019 16:21:33 -0500
Subject: [PATCH 1051/1055] GraphQL-564: [Checkout coverage]
 setGuestEmailOnCart mutation

---
 .../GraphQl/Quote/Guest/PlaceOrderTest.php     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
index 31f60afc1331f..30ad69eada29d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
@@ -69,7 +69,7 @@ public function testPlaceOrder()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
 
         $query = $this->getQuery($maskedQuoteId);
-        $response = $this->graphQlQuery($query);
+        $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order_id', $response['placeOrder']['order']);
@@ -94,7 +94,7 @@ public function testPlaceOrderWithNoEmail()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessage("Guest email for cart is missing. Please enter");
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -111,7 +111,7 @@ public function testPlaceOrderWithNoItemsInCart()
             'Unable to place order: A server error stopped your order from being placed. ' .
             'Please try to place your order again'
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -129,7 +129,7 @@ public function testPlaceOrderWithNoShippingAddress()
         self::expectExceptionMessage(
             'Unable to place order: Some addresses can\'t be used due to the configurations for specific countries'
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -148,7 +148,7 @@ public function testPlaceOrderWithNoShippingMethod()
         self::expectExceptionMessage(
             'Unable to place order: The shipping method is missing. Select the shipping method and try again'
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -169,7 +169,7 @@ public function testPlaceOrderWithNoBillingAddress()
         self::expectExceptionMessageRegExp(
             '/Unable to place order: Please check the billing address information*/'
         );
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -189,7 +189,7 @@ public function testPlaceOrderWithNoPaymentMethod()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessage('Unable to place order: Enter a valid payment method and try again');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -210,7 +210,7 @@ public function testPlaceOrderWithOutOfStockProduct()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessage('Unable to place order: Some of the products are out of stock');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**
@@ -233,7 +233,7 @@ public function testPlaceOrderOfCustomerCart()
         $query = $this->getQuery($maskedQuoteId);
 
         self::expectExceptionMessageRegExp('/The current user cannot perform operations on cart*/');
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
     /**

From f2d3539ff6e5a24f7619f30d3e8ce88e777ad51c Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Tue, 16 Apr 2019 08:41:48 +0300
Subject: [PATCH 1052/1055] magento/graphql-ce#540: Replace deprecated fixture
 1. Add "Worldwide Expedited" to test

---
 .../Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
index cfaf53e690c6c..fb0c205c86a2c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
@@ -194,6 +194,7 @@ public function dataProviderShippingMethodsBasedOnCanadaAddress(): array
             'Worldwide Express' => ['XPR', 'Worldwide Express'],
             'Worldwide Express Saver' => ['WXS', 'Worldwide Express Saver'],
             'Worldwide Express Plus' => ['XDM', 'Worldwide Express Plus'],
+            'Worldwide Expedited' => ['XPD', 'Worldwide Expedited'],
         ];
     }
 

From 5b85e5d8dceeda030cfe44497798de59ef2cb8ec Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Apr 2019 12:31:18 -0500
Subject: [PATCH 1053/1055] GraphQL-571: [Checkout Coverage] Place order for
 guest

---
 .../Model/Resolver/SetGuestEmailOnCart.php    |  1 -
 .../Customer/SetBillingAddressOnCartTest.php  | 36 ++++----
 .../Customer/SetGuestEmailOnCartTest.php      | 35 ++++++--
 .../Guest/SetBillingAddressOnCartTest.php     | 36 ++++----
 .../Quote/Guest/SetGuestEmailOnCartTest.php   | 88 ++++++++++++++-----
 5 files changed, 128 insertions(+), 68 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
index 29dc0e759242f..202b4f84d70f7 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
@@ -82,7 +82,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         return [
             'cart' => [
                 'model' => $cart,
-                'guest_email' => $guestEmail
             ],
         ];
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 553408880baa0..6b15f947a2477 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -493,6 +493,24 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
         $this->graphQlMutation($query);
     }
 
+    /**
+     * @return array
+     */
+    public function dataProviderSetWithoutRequiredParameters(): array
+    {
+        return [
+            'missed_billing_address' => [
+                'cart_id: "cart_id_value"',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
+                . ' was not provided.',
+            ],
+            'missed_cart_id' => [
+                'billing_address: {}',
+                'Required parameter "cart_id" is missing'
+            ]
+        ];
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
@@ -536,24 +554,6 @@ public function testSetNewBillingAddressWithRedundantStreetLine()
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
-    /**
-     * @return array
-     */
-    public function dataProviderSetWithoutRequiredParameters(): array
-    {
-        return [
-            'missed_billing_address' => [
-                'cart_id: "cart_id_value"',
-                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
-                . ' was not provided.',
-            ],
-            'missed_cart_id' => [
-                'billing_address: {}',
-                'Required parameter "cart_id" is missing'
-            ]
-        ];
-    }
-
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
index 4dca82118c1ef..57b734eaa027f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
@@ -35,17 +35,36 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage The request is not allowed for logged in customers
      */
     public function testSetGuestEmailOnCartForLoggedInCustomer()
     {
-        $reservedOrderId = 'test_order_1';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $email = 'some@user.com';
+
+        $query = $this->getQuery($maskedQuoteId, $email);
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage The request is not allowed for logged in customers
+     */
+    public function testSetGuestEmailOnGuestCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $email = 'some@user.com';
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
 
-        $query = $this->getSetGuestEmailOnCartMutation($maskedQuoteId, $email);
-        $this->expectExceptionMessage('The request is not allowed for logged in customers');
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        $query = $this->getQuery($maskedQuoteId, $email);
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -55,12 +74,12 @@ public function testSetGuestEmailOnCartForLoggedInCustomer()
      * @param string $email
      * @return string
      */
-    private function getSetGuestEmailOnCartMutation(string $maskedQuoteId, string $email): string
+    private function getQuery(string $maskedQuoteId, string $email): string
     {
         return <<<QUERY
 mutation {
   setGuestEmailOnCart(input: {
-    cart_id:"$maskedQuoteId"
+    cart_id: "$maskedQuoteId"
     email: "$email"
   }) {
     cart {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 5b0e4cfdb6c52..d2d53220f0042 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -313,6 +313,24 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
         $this->graphQlMutation($query);
     }
 
+    /**
+     * @return array
+     */
+    public function dataProviderSetWithoutRequiredParameters(): array
+    {
+        return [
+            'missed_billing_address' => [
+                'cart_id: "cart_id_value"',
+                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
+                . ' was not provided.',
+            ],
+            'missed_cart_id' => [
+                'billing_address: {}',
+                'Required parameter "cart_id" is missing'
+            ]
+        ];
+    }
+
     /**
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
@@ -356,24 +374,6 @@ public function testSetNewBillingAddressRedundantStreetLine()
         $this->graphQlMutation($query);
     }
 
-    /**
-     * @return array
-     */
-    public function dataProviderSetWithoutRequiredParameters(): array
-    {
-        return [
-            'missed_billing_address' => [
-                'cart_id: "cart_id_value"',
-                'Field SetBillingAddressOnCartInput.billing_address of required type BillingAddressInput!'
-                . ' was not provided.',
-            ],
-            'missed_cart_id' => [
-                'billing_address: {}',
-                'Required parameter "cart_id" is missing'
-            ]
-        ];
-    }
-
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
index f95679b2eb5e1..5aefa510d7451 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
@@ -28,16 +28,15 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Quote/_files/empty_quote.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      */
     public function testSetGuestEmailOnCart()
     {
-        $reservedOrderId = 'reserved_order_id';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $email = 'some@user.com';
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
 
-        $query = $this->getSetGuestEmailOnCartMutation($maskedQuoteId, $email);
-        $response = $this->graphQlQuery($query);
+        $query = $this->getQuery($maskedQuoteId, $email);
+        $response = $this->graphQlMutation($query);
 
         $this->assertArrayHasKey('setGuestEmailOnCart', $response);
         $this->assertArrayHasKey('cart', $response['setGuestEmailOnCart']);
@@ -45,37 +44,80 @@ public function testSetGuestEmailOnCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Quote/_files/empty_quote.php
-     * @dataProvider incorrectInputDataProvider
-     * @param string|null $maskedQuoteId
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     */
+    public function testSetGuestEmailOnCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $email = 'some@user.com';
+
+        $query = $this->getQuery($maskedQuoteId, $email);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$maskedQuoteId\""
+        );
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     *
+     * @dataProvider incorrectEmailDataProvider
+     * @param string $maskedQuoteId
      * @param string $email
      * @param string $exceptionMessage
      */
-    public function testSetGuestEmailOnCartWithIncorrectInputData(
-        ?string $maskedQuoteId,
+    public function testSetGuestEmailOnCartWithIncorrectEmail(
+        string $maskedQuoteId,
         string $email,
         string $exceptionMessage
     ) {
-        if (null === $maskedQuoteId) { // Generate ID in case if no provided by data provider
-            $reservedOrderId = 'reserved_order_id';
-            $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
-        }
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($maskedQuoteId);
 
-        $query = $this->getSetGuestEmailOnCartMutation($maskedQuoteId, $email);
+        $query = $this->getQuery($maskedQuoteId, $email);
         $this->expectExceptionMessage($exceptionMessage);
-        $this->graphQlQuery($query);
+        $this->graphQlMutation($query);
     }
 
-    public function incorrectInputDataProvider(): array
+    /**
+     * @return array
+     */
+    public function incorrectEmailDataProvider(): array
     {
         return [
-            'wrong_email' => [null, 'some', 'Invalid email format'],
-            'no_email' => [null, '', 'Required parameter "email" is missing'],
-            'wrong_quote_id' =>  ['xxx', 'some@user.com', 'Could not find a cart with ID "xxx"'],
-            'no_quote_id' =>  ['', 'some@user.com', 'Required parameter "cart_id" is missing']
+            'wrong_email' => ['test_quote', 'some', 'Invalid email format'],
+            'no_email' => ['test_quote', '', 'Required parameter "email" is missing'],
         ];
     }
 
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testSetGuestEmailOnNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $email = 'some@user.com';
+
+        $query = $this->getQuery($maskedQuoteId, $email);
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameter "cart_id" is missing
+     */
+    public function testSetGuestEmailWithEmptyCartId()
+    {
+        $maskedQuoteId = '';
+        $email = 'some@user.com';
+
+        $query = $this->getQuery($maskedQuoteId, $email);
+        $this->graphQlMutation($query);
+    }
+
     /**
      * Returns GraphQl mutation query for setting email address for a guest
      *
@@ -83,12 +125,12 @@ public function incorrectInputDataProvider(): array
      * @param string $email
      * @return string
      */
-    private function getSetGuestEmailOnCartMutation(string $maskedQuoteId, string $email): string
+    private function getQuery(string $maskedQuoteId, string $email): string
     {
         return <<<QUERY
 mutation {
   setGuestEmailOnCart(input: {
-    cart_id:"$maskedQuoteId"
+    cart_id: "$maskedQuoteId"
     email: "$email"
   }) {
     cart {

From 58fa5d4b28d0622321b59924cd0fe21aff06c8b9 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Apr 2019 14:59:28 -0500
Subject: [PATCH 1054/1055] GraphQL-571: [Checkout Coverage] Place order for
 guest

---
 .../{GuestEmail.php => CartEmail.php}         |   2 +-
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |   2 +-
 .../Quote/Customer/GetCartEmailTest.php       | 125 ++++++++++++++++++
 .../Quote/Guest/CartGuestEmailTest.php        |  52 --------
 .../GraphQl/Quote/Guest/GetCartEmailTest.php  |  88 ++++++++++++
 .../Quote/_files/guest/set_guest_email.php    |   2 +-
 6 files changed, 216 insertions(+), 55 deletions(-)
 rename app/code/Magento/QuoteGraphQl/Model/Resolver/{GuestEmail.php => CartEmail.php} (96%)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartEmailTest.php
 delete mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartGuestEmailTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartEmailTest.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/GuestEmail.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartEmail.php
similarity index 96%
rename from app/code/Magento/QuoteGraphQl/Model/Resolver/GuestEmail.php
rename to app/code/Magento/QuoteGraphQl/Model/Resolver/CartEmail.php
index 76493c4cebe55..8d0cb114d8315 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/GuestEmail.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartEmail.php
@@ -17,7 +17,7 @@
 /**
  * @inheritdoc
  */
-class GuestEmail implements ResolverInterface
+class CartEmail implements ResolverInterface
 {
     /**
      * @var GetCartForUser
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 22a5bb6cce392..711e6cbc7f5f6 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -175,7 +175,7 @@ type PlaceOrderOutput {
 type Cart {
     items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
     applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon")
-    guest_email: String @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\GuestEmail")
+    email: String @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartEmail")
     shipping_addresses: [CartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddresses")
     billing_address: CartAddress! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
     available_payment_methods: [AvailablePaymentMethod]  @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AvailablePaymentMethods") @doc(description: "Available payment methods")
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartEmailTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartEmailTest.php
new file mode 100644
index 0000000000000..951fe08db5e3d
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartEmailTest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for getting email from cart
+ */
+class GetCartEmailTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     */
+    public function testGetCartEmail()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        $this->assertArrayHasKey('cart', $response);
+        $this->assertArrayHasKey('email', $response['cart']);
+        $this->assertEquals('customer@example.com', $response['cart']['email']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetCartEmailFromNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     */
+    public function testGetEmailFromGuestCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
+        );
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     */
+    public function testGetEmailFromAnotherCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
+        );
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer3@search.example.com'));
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+{
+  cart(cart_id:"$maskedQuoteId") {    
+    email
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartGuestEmailTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartGuestEmailTest.php
deleted file mode 100644
index 751029e6b87a3..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartGuestEmailTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Quote\Guest;
-
-use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\TestCase\GraphQlAbstract;
-
-/**
- * Test for getting guest email from cart
- */
-class CartGuestEmailTest extends GraphQlAbstract
-{
-    /**
-     * @var GetMaskedQuoteIdByReservedOrderId
-     */
-    private $getMaskedQuoteIdByReservedOrderId;
-
-    protected function setUp()
-    {
-        $objectManager = Bootstrap::getObjectManager();
-        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-     */
-    public function testGetCartGuestEmail()
-    {
-        $email = 'store@example.com';
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
-            'test_order_with_virtual_product_without_address'
-        );
-
-        $query = <<<QUERY
-{
-  cart(cart_id:"$maskedQuoteId") {    
-    guest_email
-  }
-}
-QUERY;
-
-        $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('cart', $response);
-        $this->assertEquals($email, $response['cart']['guest_email']);
-    }
-}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartEmailTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartEmailTest.php
new file mode 100644
index 0000000000000..8c6ecd075049f
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartEmailTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for getting email from cart
+ */
+class GetCartEmailTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     */
+    public function testGetCartEmail()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey('cart', $response);
+        $this->assertArrayHasKey('email', $response['cart']);
+        $this->assertEquals('guest@example.com', $response['cart']['email']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Could not find a cart with ID "non_existent_masked_id"
+     */
+    public function testGetCartEmailFromNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     */
+    public function testGetCartEmailFromCustomerCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId);
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"{$maskedQuoteId}\""
+        );
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getQuery(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+{
+  cart(cart_id:"$maskedQuoteId") {    
+    email
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php
index 4e214f4310044..c8084b2552395 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/guest/set_guest_email.php
@@ -20,5 +20,5 @@
 $quote = $quoteFactory->create();
 $quoteResource->load($quote, 'test_quote', 'reserved_order_id');
 
-$quote->setCustomerEmail('customer@example.com');
+$quote->setCustomerEmail('guest@example.com');
 $cartRepository->save($quote);

From 44b99de26f3a8c9afbca458e3f7bf9a313cee56b Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Apr 2019 15:11:01 -0500
Subject: [PATCH 1055/1055] GraphQL-571: [Checkout Coverage] Place order for
 guest

---
 .../Model/Resolver/SetGuestEmailOnCart.php      | 17 ++++++++++++-----
 .../Quote/Customer/SetGuestEmailOnCartTest.php  |  2 +-
 .../Quote/Guest/SetGuestEmailOnCartTest.php     | 12 +++++-------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
index 202b4f84d70f7..d621057348b54 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetGuestEmailOnCart.php
@@ -32,16 +32,24 @@ class SetGuestEmailOnCart implements ResolverInterface
      */
     private $getCartForUser;
 
+    /**
+     * @var EmailAddressValidator
+     */
+    private $emailValidator;
+
     /**
      * @param GetCartForUser $getCartForUser
      * @param CartRepositoryInterface $cartRepository
+     * @param EmailAddressValidator $emailValidator
      */
     public function __construct(
         GetCartForUser $getCartForUser,
-        CartRepositoryInterface $cartRepository
+        CartRepositoryInterface $cartRepository,
+        EmailAddressValidator $emailValidator
     ) {
         $this->getCartForUser = $getCartForUser;
         $this->cartRepository = $cartRepository;
+        $this->emailValidator = $emailValidator;
     }
 
     /**
@@ -58,11 +66,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "email" is missing'));
         }
 
-        $guestEmail = $args['input']['email'];
-
-        if (!\Zend_Validate::is($guestEmail, EmailAddressValidator::class)) {
+        if (false === $this->emailValidator->isValid($args['input']['email'])) {
             throw new GraphQlInputException(__('Invalid email format'));
         }
+        $email = $args['input']['email'];
 
         $currentUserId = $context->getUserId();
 
@@ -71,7 +78,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
 
         $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
-        $cart->setCustomerEmail($guestEmail);
+        $cart->setCustomerEmail($email);
 
         try {
             $this->cartRepository->save($cart);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
index 57b734eaa027f..a4a84c2f8c740 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetGuestEmailOnCartTest.php
@@ -83,7 +83,7 @@ private function getQuery(string $maskedQuoteId, string $email): string
     email: "$email"
   }) {
     cart {
-      guest_email
+      email
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
index 5aefa510d7451..b877dccdeba37 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php
@@ -40,7 +40,7 @@ public function testSetGuestEmailOnCart()
 
         $this->assertArrayHasKey('setGuestEmailOnCart', $response);
         $this->assertArrayHasKey('cart', $response['setGuestEmailOnCart']);
-        $this->assertEquals($email, $response['setGuestEmailOnCart']['cart']['guest_email']);
+        $this->assertEquals($email, $response['setGuestEmailOnCart']['cart']['email']);
     }
 
     /**
@@ -65,16 +65,14 @@ public function testSetGuestEmailOnCustomerCart()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      *
      * @dataProvider incorrectEmailDataProvider
-     * @param string $maskedQuoteId
      * @param string $email
      * @param string $exceptionMessage
      */
     public function testSetGuestEmailOnCartWithIncorrectEmail(
-        string $maskedQuoteId,
         string $email,
         string $exceptionMessage
     ) {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $query = $this->getQuery($maskedQuoteId, $email);
         $this->expectExceptionMessage($exceptionMessage);
@@ -87,8 +85,8 @@ public function testSetGuestEmailOnCartWithIncorrectEmail(
     public function incorrectEmailDataProvider(): array
     {
         return [
-            'wrong_email' => ['test_quote', 'some', 'Invalid email format'],
-            'no_email' => ['test_quote', '', 'Required parameter "email" is missing'],
+            'wrong_email' => ['some', 'Invalid email format'],
+            'no_email' => ['', 'Required parameter "email" is missing'],
         ];
     }
 
@@ -134,7 +132,7 @@ private function getQuery(string $maskedQuoteId, string $email): string
     email: "$email"
   }) {
     cart {
-      guest_email
+      email
     }
   }
 }